From 50d844e91589a8f51cade42b732bcd1de889987b Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Tue, 27 Oct 2009 17:33:44 -0400
Subject: Support more symbols in tokenizer.

---
 tests/dimension/Makefile.am     |  2 +-
 tests/dimension/braces.pov      |  8 --------
 tests/dimension/punctuation.pov |  9 +++++++++
 tests/dimension/tokenizer.sh    | 29 ++++++++++++++++++++++++-----
 4 files changed, 34 insertions(+), 14 deletions(-)
 delete mode 100644 tests/dimension/braces.pov
 create mode 100644 tests/dimension/punctuation.pov

(limited to 'tests')

diff --git a/tests/dimension/Makefile.am b/tests/dimension/Makefile.am
index f5ec097..7bacab5 100644
--- a/tests/dimension/Makefile.am
+++ b/tests/dimension/Makefile.am
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT = top_builddir=$(top_builddir)
 tokenizer.sh:
 	cp $(srcdir)/tokenizer.sh .
 
-EXTRA_DIST = tokenizer.sh braces.pov
+EXTRA_DIST = tokenizer.sh punctuation.pov
diff --git a/tests/dimension/braces.pov b/tests/dimension/braces.pov
deleted file mode 100644
index 295a69a..0000000
--- a/tests/dimension/braces.pov
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  {
-  }
-}
-}
-  }
-  {
-{
diff --git a/tests/dimension/punctuation.pov b/tests/dimension/punctuation.pov
new file mode 100644
index 0000000..db9911f
--- /dev/null
+++ b/tests/dimension/punctuation.pov
@@ -0,0 +1,9 @@
+{
+  (
+    [
+      <
+        + - * / ,
+      >
+    ]
+  )
+}
diff --git a/tests/dimension/tokenizer.sh b/tests/dimension/tokenizer.sh
index b6de05a..d965741 100755
--- a/tests/dimension/tokenizer.sh
+++ b/tests/dimension/tokenizer.sh
@@ -1,10 +1,29 @@
 #!/bin/sh
 
-braces=$(${top_builddir}/dimension/dimension --tokenize ${srcdir}/braces.pov)
-braces_exp='({ { } } } } { {)'
+#########################################################################
+# Copyright (C) 2009 Tavian Barnes <tavianator@gmail.com>               #
+#                                                                       #
+# This file is part of The Dimension Test Suite.                        #
+#                                                                       #
+# The Dimension Test Suite is free software; you can redistribute it    #
+# and/or modify it under the terms of the GNU General Public License as #
+# published by the Free Software Foundation; either version 3 of the    #
+# License, or (at your option) any later version.                       #
+#                                                                       #
+# The Dimension Test Suite is distributed in the hope that it will be   #
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty   #
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  #
+# General Public License for more details.                              #
+#                                                                       #
+# You should have received a copy of the GNU General Public License     #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>. #
+#########################################################################
 
-if [ "$braces" != "$braces_exp" ]; then
-  echo "braces.pov tokenized as \"$braces\"" >&2
-  echo " -- expected \"$braces_exp\"" >&2
+punctuation=$(${top_builddir}/dimension/dimension --tokenize ${srcdir}/punctuation.pov)
+punctuation_exp='({ \( [ < + - * / , > ] \) })'
+
+if [ "$punctuation" != "$punctuation_exp" ]; then
+  echo "punctuation.pov tokenized as \"$punctuation\"" >&2
+  echo " -- expected \"$punctuation_exp\"" >&2
   exit 1;
 fi
-- 
cgit v1.2.3