tests/PPScriptingTest.st
changeset 380 8fe3cb4e607f
parent 379 451b5ae38b72
child 382 1825151d6455
--- a/tests/PPScriptingTest.st	Fri Oct 03 03:11:33 2014 +0100
+++ b/tests/PPScriptingTest.st	Sun Oct 05 00:05:20 2014 +0100
@@ -20,7 +20,7 @@
         add := PPUnresolvedParser new.
         mul := PPUnresolvedParser new.
         prim := PPUnresolvedParser new.
-        dec := ($0 to: $9) asParser ==> [ :token | token codePoint - $0 codePoint ].
+        dec := (Interval from: $0 to: $9) asParser ==> [ :token | token codePoint - $0 codePoint ].
         add def: ((mul , $+ asParser , add) ==> [ :nodes | (nodes at: 1) + (nodes at: 3) ])
                 / mul.
         mul def: ((prim , $* asParser , mul) ==> [ :nodes | (nodes at: 1) * (nodes at: 3) ])
@@ -29,7 +29,7 @@
                 / dec.
         ^ add end
 
-    "Modified: / 03-10-2014 / 02:54:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-10-2014 / 00:02:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 expressionParser
@@ -39,7 +39,7 @@
         add := PPUnresolvedParser new.
         mul := PPUnresolvedParser new.
         prim := PPUnresolvedParser new.
-        dec := ($0 to: $9) asParser.
+        dec := (Interval from: $0 to: $9) asParser.
         add def: (mul , $+ asParser , add)
                 / mul.
         mul def: (prim , $* asParser , mul)
@@ -48,7 +48,7 @@
                 / dec.
         ^ add end
 
-    "Modified: / 03-10-2014 / 02:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-10-2014 / 00:03:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 straightLineParser
@@ -61,11 +61,11 @@
         mulExp := PPUnresolvedParser new.
         primExp := PPUnresolvedParser new.
         
-        lower := ($a to: $z) asParser.
-        upper := ($A to: $Z) asParser.
+        lower := (Interval from: $a to: $z) asParser.
+        upper := (Interval from: $A to: $Z) asParser.
         char := lower / upper.
-        nonzero := ($1 to: $9) asParser.
-        dec := ($0 to: $9) asParser.
+        nonzero := (Interval from: $1 to: $9) asParser.
+        dec := (Interval from: $0 to: $9) asParser.
         id := char, ( char / dec ) star.
         num := $0 asParser / ( nonzero, dec star).
 
@@ -81,7 +81,7 @@
                 / ( $( asParser, stmList, $, asParser, exp, $) asParser ).
         ^ goal
 
-    "Modified: / 03-10-2014 / 02:56:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-10-2014 / 00:03:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !PPScriptingTest methodsFor:'tests'!