--- a/PPScriptingTest.st	Tue Mar 04 15:34:22 2014 +0100
+++ b/PPScriptingTest.st	Tue Mar 04 15:34:23 2014 +0100
@@ -1,6 +1,6 @@
 "{ Package: 'stx:goodies/petitparser' }"
 
-PPAbstractParseTest subclass:#PPScriptingTest
+PPAbstractParserTest subclass:#PPScriptingTest
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -20,7 +20,7 @@
         add := PPUnresolvedParser new.
         mul := PPUnresolvedParser new.
         prim := PPUnresolvedParser new.
-        dec := ($0 ppMinus: $9) ==> [ :token | token codePoint - $0 codePoint ].
+        dec := ($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) ])
@@ -28,8 +28,6 @@
         prim def: (($( asParser , add , $) asParser) ==> [ :nodes | nodes at: 2 ])
                 / dec.
         ^ add end
-
-    "Modified: / 19-12-2010 / 18:13:51 / Jan Kurs <kurs.jan@post.cz>"
 !
 
 expressionParser
@@ -39,7 +37,7 @@
         add := PPUnresolvedParser new.
         mul := PPUnresolvedParser new.
         prim := PPUnresolvedParser new.
-        dec := ($0 ppMinus: $9).
+        dec := ($0 to: $9) asParser.
         add def: (mul , $+ asParser , add)
                 / mul.
         mul def: (prim , $* asParser , mul)
@@ -47,8 +45,6 @@
         prim def: ($( asParser , add , $) asParser)
                 / dec.
         ^ add end
-
-    "Modified: / 19-12-2010 / 18:14:18 / Jan Kurs <kurs.jan@post.cz>"
 !
 
 straightLineParser
@@ -61,11 +57,11 @@
         mulExp := PPUnresolvedParser new.
         primExp := PPUnresolvedParser new.
         
-        lower := $a ppMinus: $z.
-        upper := $A ppMinus: $Z.
+        lower := ($a to: $z) asParser.
+        upper := ($A to: $Z) asParser.
         char := lower / upper.
-        nonzero := $1 ppMinus: $9.
-        dec := $0 ppMinus: $9.
+        nonzero := ($1 to: $9) asParser.
+        dec := ($0 to: $9) asParser.
         id := char, ( char / dec ) star.
         num := $0 asParser / ( nonzero, dec star).
 
@@ -80,8 +76,6 @@
                 / num
                 / ( $( asParser, stmList, $, asParser, exp, $) asParser ).
         ^ goal
-
-    "Modified: / 19-12-2010 / 18:15:14 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
 !PPScriptingTest methodsFor:'tests'!
@@ -117,13 +111,14 @@
 !PPScriptingTest class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPScriptingTest.st,v 1.3 2012-05-04 22:00:57 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPScriptingTest.st,v 1.4 2014-03-04 14:34:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPScriptingTest.st,v 1.3 2012-05-04 22:00:57 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPScriptingTest.st,v 1.4 2014-03-04 14:34:23 cg Exp $'
 !
 
 version_SVN
-    ^ '§Id: PPScriptingTest.st 5 2010-12-19 17:38:27Z kursjan §'
+    ^ '$Id: PPScriptingTest.st,v 1.4 2014-03-04 14:34:23 cg Exp $'
 ! !
+