Cface__CDefinitionScanner.st
changeset 9 03c7a764d2be
parent 6 ae25dce94003
child 14 1f730d82496e
--- a/Cface__CDefinitionScanner.st	Tue Sep 09 15:15:50 2008 +0000
+++ b/Cface__CDefinitionScanner.st	Tue Sep 09 21:17:04 2008 +0000
@@ -33,75 +33,75 @@
 <comment>       :       \# [^\r\n]* ;
 "
 
-    "Modified: / 10-07-2008 / 19:55:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !CDefinitionScanner class methodsFor:'generated-initialization'!
 
 initializeKeywordMap
     keywordMap := Dictionary new.
-    #( #(36 'argument' 13)
-     #(36 'array' 7)
-     #(36 'char' 15)
-     #(36 'const' 30)
-     #(36 'double' 24)
-     #(36 'enum' 20)
-     #(36 'field' 18)
-     #(36 'float' 27)
-     #(36 'function' 11)
-     #(36 'int' 16)
-     #(36 'long' 6)
-     #(36 'return' 2)
-     #(36 'short' 5)
-     #(36 'signed' 3)
-     #(36 'struct' 31)
-     #(36 'typedef' 22)
-     #(36 'union' 25)
-     #(36 'unsigned' 4)
-     #(36 'value' 8)
-     #(36 'void' 26)
-     #(36 'wchar_t' 28)
-     #(33 'argument' 13)
-     #(33 'array' 7)
-     #(33 'char' 15)
-     #(33 'const' 30)
-     #(33 'double' 24)
-     #(33 'enum' 20)
-     #(33 'field' 18)
-     #(33 'float' 27)
-     #(33 'function' 11)
-     #(33 'int' 16)
-     #(33 'long' 6)
-     #(33 'return' 2)
-     #(33 'short' 5)
-     #(33 'signed' 3)
-     #(33 'struct' 31)
-     #(33 'typedef' 22)
-     #(33 'union' 25)
-     #(33 'unsigned' 4)
-     #(33 'value' 8)
-     #(33 'void' 26)
-     #(33 'wchar_t' 28) ) 
+    #( #(34 'argument' 14)
+     #(34 'array' 8)
+     #(34 'char' 16)
+     #(34 'const' 31)
+     #(34 'double' 26)
+     #(34 'enum' 20)
+     #(34 'field' 18)
+     #(34 'float' 28)
+     #(34 'function' 12)
+     #(34 'int' 5)
+     #(34 'long' 3)
+     #(34 'return' 7)
+     #(34 'short' 6)
+     #(34 'signed' 4)
+     #(34 'struct' 32)
+     #(34 'typedef' 22)
+     #(34 'union' 24)
+     #(34 'unsigned' 1)
+     #(34 'value' 17)
+     #(34 'void' 27)
+     #(34 'wchar_t' 29)
+     #(37 'argument' 14)
+     #(37 'array' 8)
+     #(37 'char' 16)
+     #(37 'const' 31)
+     #(37 'double' 26)
+     #(37 'enum' 20)
+     #(37 'field' 18)
+     #(37 'float' 28)
+     #(37 'function' 12)
+     #(37 'int' 5)
+     #(37 'long' 3)
+     #(37 'return' 7)
+     #(37 'short' 6)
+     #(37 'signed' 4)
+     #(37 'struct' 32)
+     #(37 'typedef' 22)
+     #(37 'union' 24)
+     #(37 'unsigned' 1)
+     #(37 'value' 17)
+     #(37 'void' 27)
+     #(37 'wchar_t' 29) ) 
             do:[:each | 
                 (keywordMap at:each first ifAbsentPut:[ Dictionary new ]) at:(each at:2)
                     put:each last
             ].
     ^ keywordMap
 
-    "Modified: / 10-07-2008 / 19:55:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !CDefinitionScanner methodsFor:'generated-scanner'!
 
 scan1
     [
-        self recordMatch:#( 33 36 ).
+        self recordMatch:#( 34 37 ).
         self step.
         (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ])
     ] whileTrue.
     (currentCharacter between:$- and:$/) ifTrue:[
         [
-            self recordMatch:#( 36 ).
+            self recordMatch:#( 37 ).
             self step.
             (currentCharacter isLetterOrDigit 
                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -110,16 +110,16 @@
     ].
     ^ self reportLastMatch
 
-    "Modified: / 10-07-2008 / 19:55:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
 scan2
     [
-        self recordMatch:#( 34 36 ).
+        self recordMatch:#( 35 37 ).
         self step.
         (currentCharacter isLetter) ifTrue:[
             [
-                self recordMatch:#( 34 36 ).
+                self recordMatch:#( 35 37 ).
                 self step.
                 (currentCharacter isLetter)
             ] whileTrue.
@@ -127,7 +127,7 @@
                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                     ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -140,7 +140,7 @@
     ] whileTrue.
     ((currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ]) ifTrue:[
         [
-            self recordMatch:#( 36 ).
+            self recordMatch:#( 37 ).
             self step.
             (currentCharacter isLetterOrDigit 
                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -149,7 +149,7 @@
     ].
     ^ self reportLastMatch
 
-    "Modified: / 10-07-2008 / 19:55:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
 scan3
@@ -1101,7 +1101,7 @@
                                                     ^ self reportLastMatch
                                                 ].
                                         (currentCharacter == $d) ifTrue:[
-                                            self recordMatch:#( 10 37 ).
+                                            self recordMatch:#( 11 38 ).
                                             self step.
                                             (currentCharacter <= (Character tab) 
                                                 or:[
@@ -1143,19 +1143,19 @@
         ^ self reportLastMatch
     ].
     (currentCharacter == $() ifTrue:[
-        ^ self recordAndReportMatch:#( 12 ).
+        ^ self recordAndReportMatch:#( 13 ).
     ].
     (currentCharacter == $)) ifTrue:[
-        ^ self recordAndReportMatch:#( 14 ).
+        ^ self recordAndReportMatch:#( 15 ).
     ].
     (currentCharacter == $-) ifTrue:[
-        self recordMatch:#( 36 ).
+        self recordMatch:#( 37 ).
         self step.
         (currentCharacter isLetter 
             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                 ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1169,7 +1169,7 @@
     ].
     (currentCharacter == $.) ifTrue:[
         [
-            self recordMatch:#( 33 ).
+            self recordMatch:#( 34 ).
             self step.
             (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ])
         ] whileTrue.
@@ -1177,18 +1177,57 @@
     ].
     (currentCharacter == $/) ifTrue:[
         [
-            self recordMatch:#( 36 ).
+            self recordMatch:#( 37 ).
             self step.
             (currentCharacter isLetterOrDigit 
                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
         ] whileTrue.
         ^ self reportLastMatch
     ].
-    (currentCharacter == $@) ifTrue:[
-        ^ self recordAndReportMatch:#( 21 ).
+    (currentCharacter == $:) ifTrue:[
+        self step.
+        (currentCharacter == $o) ifTrue:[
+            self step.
+            (currentCharacter == $f) ifTrue:[
+                self step.
+                (currentCharacter == $f) ifTrue:[
+                    self step.
+                    (currentCharacter == $s) ifTrue:[
+                        self step.
+                        (currentCharacter == $e) ifTrue:[
+                            self step.
+                            (currentCharacter == $t) ifTrue:[
+                                ^ self recordAndReportMatch:#( 21 ).
+                            ].
+                            ^ self reportLastMatch
+                        ].
+                        ^ self reportLastMatch
+                    ].
+                    ^ self reportLastMatch
+                ].
+                ^ self reportLastMatch
+            ].
+            ^ self reportLastMatch
+        ].
+        (currentCharacter == $s) ifTrue:[
+            self step.
+            (currentCharacter == $i) ifTrue:[
+                self step.
+                (currentCharacter == $z) ifTrue:[
+                    self step.
+                    (currentCharacter == $e) ifTrue:[
+                        ^ self recordAndReportMatch:#( 30 ).
+                    ].
+                    ^ self reportLastMatch
+                ].
+                ^ self reportLastMatch
+            ].
+            ^ self reportLastMatch
+        ].
+        ^ self reportLastMatch
     ].
     (currentCharacter == $e) ifTrue:[
-        self recordMatch:#( 33 36 ).
+        self recordMatch:#( 34 37 ).
         self step.
         ((currentCharacter between:$0 and:$9) 
             or:[
@@ -1204,7 +1243,7 @@
                 ifTrue:[ ^ self scan1 ].
         (currentCharacter between:$- and:$/) ifTrue:[
             [
-                self recordMatch:#( 36 ).
+                self recordMatch:#( 37 ).
                 self step.
                 (currentCharacter isLetterOrDigit 
                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1212,7 +1251,7 @@
             ^ self reportLastMatch
         ].
         (currentCharacter == $n) ifTrue:[
-            self recordMatch:#( 33 36 ).
+            self recordMatch:#( 34 37 ).
             self step.
             (currentCharacter isXMLDigit 
                 or:[
@@ -1228,7 +1267,7 @@
                     ifTrue:[ ^ self scan1 ].
             (currentCharacter between:$- and:$/) ifTrue:[
                 [
-                    self recordMatch:#( 36 ).
+                    self recordMatch:#( 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit 
                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1236,7 +1275,7 @@
                 ^ self reportLastMatch
             ].
             (currentCharacter == $u) ifTrue:[
-                self recordMatch:#( 33 36 ).
+                self recordMatch:#( 34 37 ).
                 self step.
                 ((currentCharacter between:$0 and:$9) 
                     or:[
@@ -1252,7 +1291,7 @@
                         ifTrue:[ ^ self scan1 ].
                 (currentCharacter between:$- and:$/) ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1260,14 +1299,14 @@
                     ^ self reportLastMatch
                 ].
                 (currentCharacter == $m) ifTrue:[
-                    self recordMatch:#( 33 36 ).
+                    self recordMatch:#( 34 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
                         ^ self scan1
                     ].
                     (currentCharacter between:$. and:$/) ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1275,7 +1314,7 @@
                         ^ self reportLastMatch
                     ].
                     (currentCharacter == $-) ifTrue:[
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         ((currentCharacter between:$- and:$9) 
                             or:[
@@ -1290,7 +1329,7 @@
                             ]) 
                                 ifTrue:[
                                     [
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isLetterOrDigit 
                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1298,7 +1337,7 @@
                                     ^ self reportLastMatch
                                 ].
                         (currentCharacter == $f) ifTrue:[
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isXMLDigit 
                                 or:[
@@ -1316,7 +1355,7 @@
                                 ]) 
                                     ifTrue:[
                                         [
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             (currentCharacter isLetterOrDigit 
                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1324,7 +1363,7 @@
                                         ^ self reportLastMatch
                                     ].
                             (currentCharacter == $o) ifTrue:[
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 ((currentCharacter between:$- and:$9) 
                                     or:[
@@ -1339,7 +1378,7 @@
                                     ]) 
                                         ifTrue:[
                                             [
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 (currentCharacter isLetterOrDigit 
                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1347,7 +1386,7 @@
                                             ^ self reportLastMatch
                                         ].
                                 (currentCharacter == $r) ifTrue:[
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     (currentCharacter isXMLDigit 
                                         or:[
@@ -1365,7 +1404,7 @@
                                         ]) 
                                             ifTrue:[
                                                 [
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     (currentCharacter isLetterOrDigit 
                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1373,7 +1412,7 @@
                                                 ^ self reportLastMatch
                                             ].
                                     (currentCharacter == $e) ifTrue:[
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isXMLDigit 
                                             or:[
@@ -1391,7 +1430,7 @@
                                             ]) 
                                                 ifTrue:[
                                                     [
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1399,7 +1438,7 @@
                                                     ^ self reportLastMatch
                                                 ].
                                         (currentCharacter == $i) ifTrue:[
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             ((currentCharacter between:$- and:$9) 
                                                 or:[
@@ -1414,7 +1453,7 @@
                                                 ]) 
                                                     ifTrue:[
                                                         [
-                                                            self recordMatch:#( 36 ).
+                                                            self recordMatch:#( 37 ).
                                                             self step.
                                                             (currentCharacter isLetterOrDigit 
                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1422,7 +1461,7 @@
                                                         ^ self reportLastMatch
                                                     ].
                                             (currentCharacter == $g) ifTrue:[
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 ((currentCharacter between:$- and:$9) 
                                                     or:[
@@ -1437,7 +1476,7 @@
                                                     ]) 
                                                         ifTrue:[
                                                             [
-                                                                self recordMatch:#( 36 ).
+                                                                self recordMatch:#( 37 ).
                                                                 self step.
                                                                 (currentCharacter isLetterOrDigit 
                                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1445,13 +1484,13 @@
                                                             ^ self reportLastMatch
                                                         ].
                                                 (currentCharacter == $n) ifTrue:[
-                                                    self recordMatch:#( 23 36 ).
+                                                    self recordMatch:#( 23 37 ).
                                                     self step.
                                                     (currentCharacter isLetterOrDigit 
                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                                                             ifTrue:[
                                                                 [
-                                                                    self recordMatch:#( 36 ).
+                                                                    self recordMatch:#( 37 ).
                                                                     self step.
                                                                     (currentCharacter isLetterOrDigit 
                                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1483,7 +1522,7 @@
         ^ self reportLastMatch
     ].
     (currentCharacter == $f) ifTrue:[
-        self recordMatch:#( 33 36 ).
+        self recordMatch:#( 34 37 ).
         self step.
         (currentCharacter isXMLDigit 
             or:[
@@ -1502,7 +1541,7 @@
                 ifTrue:[ ^ self scan1 ].
         (currentCharacter between:$- and:$/) ifTrue:[
             [
-                self recordMatch:#( 36 ).
+                self recordMatch:#( 37 ).
                 self step.
                 (currentCharacter isLetterOrDigit 
                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1510,7 +1549,7 @@
             ^ self reportLastMatch
         ].
         (currentCharacter == $r) ifTrue:[
-            self recordMatch:#( 33 36 ).
+            self recordMatch:#( 34 37 ).
             self step.
             (currentCharacter isXMLDigit 
                 or:[
@@ -1526,7 +1565,7 @@
                     ifTrue:[ ^ self scan1 ].
             (currentCharacter between:$- and:$/) ifTrue:[
                 [
-                    self recordMatch:#( 36 ).
+                    self recordMatch:#( 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit 
                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1534,7 +1573,7 @@
                 ^ self reportLastMatch
             ].
             (currentCharacter == $o) ifTrue:[
-                self recordMatch:#( 33 36 ).
+                self recordMatch:#( 34 37 ).
                 self step.
                 ((currentCharacter between:$0 and:$9) 
                     or:[
@@ -1550,7 +1589,7 @@
                         ifTrue:[ ^ self scan1 ].
                 (currentCharacter between:$- and:$/) ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1558,14 +1597,14 @@
                     ^ self reportLastMatch
                 ].
                 (currentCharacter == $m) ifTrue:[
-                    self recordMatch:#( 33 36 ).
+                    self recordMatch:#( 34 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
                         ^ self scan1
                     ].
                     (currentCharacter between:$- and:$/) ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1573,7 +1612,7 @@
                         ^ self reportLastMatch
                     ].
                     (currentCharacter == $:) ifTrue:[
-                        ^ self recordAndReportMatch:#( 9 ).
+                        ^ self recordAndReportMatch:#( 10 ).
                     ].
                     ^ self reportLastMatch
                 ].
@@ -1582,7 +1621,7 @@
             ^ self reportLastMatch
         ].
         (currentCharacter == $u) ifTrue:[
-            self recordMatch:#( 33 36 ).
+            self recordMatch:#( 34 37 ).
             self step.
             ((currentCharacter between:$0 and:$9) 
                 or:[
@@ -1598,7 +1637,7 @@
                     ifTrue:[ ^ self scan1 ].
             (currentCharacter between:$- and:$/) ifTrue:[
                 [
-                    self recordMatch:#( 36 ).
+                    self recordMatch:#( 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit 
                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1606,7 +1645,7 @@
                 ^ self reportLastMatch
             ].
             (currentCharacter == $n) ifTrue:[
-                self recordMatch:#( 33 36 ).
+                self recordMatch:#( 34 37 ).
                 self step.
                 ((currentCharacter between:$0 and:$9) 
                     or:[
@@ -1622,7 +1661,7 @@
                         ifTrue:[ ^ self scan1 ].
                 (currentCharacter between:$- and:$/) ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1630,7 +1669,7 @@
                     ^ self reportLastMatch
                 ].
                 (currentCharacter == $c) ifTrue:[
-                    self recordMatch:#( 33 36 ).
+                    self recordMatch:#( 34 37 ).
                     self step.
                     ((currentCharacter between:$0 and:$9) 
                         or:[
@@ -1646,7 +1685,7 @@
                             ifTrue:[ ^ self scan1 ].
                     (currentCharacter between:$- and:$/) ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1654,7 +1693,7 @@
                         ^ self reportLastMatch
                     ].
                     (currentCharacter == $t) ifTrue:[
-                        self recordMatch:#( 33 36 ).
+                        self recordMatch:#( 34 37 ).
                         self step.
                         (currentCharacter isXMLDigit 
                             or:[
@@ -1670,7 +1709,7 @@
                                 ifTrue:[ ^ self scan1 ].
                         (currentCharacter between:$- and:$/) ifTrue:[
                             [
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 (currentCharacter isLetterOrDigit 
                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1678,7 +1717,7 @@
                             ^ self reportLastMatch
                         ].
                         (currentCharacter == $i) ifTrue:[
-                            self recordMatch:#( 33 36 ).
+                            self recordMatch:#( 34 37 ).
                             self step.
                             (currentCharacter isXMLDigit 
                                 or:[
@@ -1694,7 +1733,7 @@
                                     ifTrue:[ ^ self scan1 ].
                             (currentCharacter between:$- and:$/) ifTrue:[
                                 [
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     (currentCharacter isLetterOrDigit 
                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1702,7 +1741,7 @@
                                 ^ self reportLastMatch
                             ].
                             (currentCharacter == $o) ifTrue:[
-                                self recordMatch:#( 33 36 ).
+                                self recordMatch:#( 34 37 ).
                                 self step.
                                 ((currentCharacter between:$0 and:$9) 
                                     or:[
@@ -1718,7 +1757,7 @@
                                         ifTrue:[ ^ self scan1 ].
                                 (currentCharacter between:$- and:$/) ifTrue:[
                                     [
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isLetterOrDigit 
                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1726,14 +1765,14 @@
                                     ^ self reportLastMatch
                                 ].
                                 (currentCharacter == $n) ifTrue:[
-                                    self recordMatch:#( 33 36 ).
+                                    self recordMatch:#( 34 37 ).
                                     self step.
                                     (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
                                         ^ self scan1
                                     ].
                                     (currentCharacter between:$. and:$/) ifTrue:[
                                         [
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             (currentCharacter isLetterOrDigit 
                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1741,7 +1780,7 @@
                                         ^ self reportLastMatch
                                     ].
                                     (currentCharacter == $-) ifTrue:[
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         ((currentCharacter between:$- and:$9) 
                                             or:[
@@ -1756,7 +1795,7 @@
                                             ]) 
                                                 ifTrue:[
                                                     [
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1764,7 +1803,7 @@
                                                     ^ self reportLastMatch
                                                 ].
                                         (currentCharacter == $t) ifTrue:[
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             ((currentCharacter between:$- and:$9) 
                                                 or:[
@@ -1776,7 +1815,7 @@
                                                 ]) 
                                                     ifTrue:[
                                                         [
-                                                            self recordMatch:#( 36 ).
+                                                            self recordMatch:#( 37 ).
                                                             self step.
                                                             (currentCharacter isLetterOrDigit 
                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1784,7 +1823,7 @@
                                                         ^ self reportLastMatch
                                                     ].
                                             (currentCharacter == $y) ifTrue:[
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 ((currentCharacter between:$- and:$9) 
                                                     or:[
@@ -1799,7 +1838,7 @@
                                                     ]) 
                                                         ifTrue:[
                                                             [
-                                                                self recordMatch:#( 36 ).
+                                                                self recordMatch:#( 37 ).
                                                                 self step.
                                                                 (currentCharacter isLetterOrDigit 
                                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1807,7 +1846,7 @@
                                                             ^ self reportLastMatch
                                                         ].
                                                 (currentCharacter == $p) ifTrue:[
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     (currentCharacter isXMLDigit 
                                                         or:[
@@ -1825,7 +1864,7 @@
                                                         ]) 
                                                             ifTrue:[
                                                                 [
-                                                                    self recordMatch:#( 36 ).
+                                                                    self recordMatch:#( 37 ).
                                                                     self step.
                                                                     (currentCharacter isLetterOrDigit 
                                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1833,13 +1872,13 @@
                                                                 ^ self reportLastMatch
                                                             ].
                                                     (currentCharacter == $e) ifTrue:[
-                                                        self recordMatch:#( 1 36 ).
+                                                        self recordMatch:#( 2 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                                                                 ifTrue:[
                                                                     [
-                                                                        self recordMatch:#( 36 ).
+                                                                        self recordMatch:#( 37 ).
                                                                         self step.
                                                                         (currentCharacter isLetterOrDigit 
                                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1873,7 +1912,7 @@
         ^ self reportLastMatch
     ].
     (currentCharacter == $p) ifTrue:[
-        self recordMatch:#( 33 36 ).
+        self recordMatch:#( 34 37 ).
         self step.
         (currentCharacter isXMLDigit 
             or:[
@@ -1889,7 +1928,7 @@
                 ifTrue:[ ^ self scan1 ].
         (currentCharacter between:$- and:$/) ifTrue:[
             [
-                self recordMatch:#( 36 ).
+                self recordMatch:#( 37 ).
                 self step.
                 (currentCharacter isLetterOrDigit 
                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1897,7 +1936,7 @@
             ^ self reportLastMatch
         ].
         (currentCharacter == $o) ifTrue:[
-            self recordMatch:#( 33 36 ).
+            self recordMatch:#( 34 37 ).
             self step.
             (currentCharacter isXMLDigit 
                 or:[
@@ -1913,7 +1952,7 @@
                     ifTrue:[ ^ self scan1 ].
             (currentCharacter between:$- and:$/) ifTrue:[
                 [
-                    self recordMatch:#( 36 ).
+                    self recordMatch:#( 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit 
                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1921,7 +1960,7 @@
                 ^ self reportLastMatch
             ].
             (currentCharacter == $i) ifTrue:[
-                self recordMatch:#( 33 36 ).
+                self recordMatch:#( 34 37 ).
                 self step.
                 ((currentCharacter between:$0 and:$9) 
                     or:[
@@ -1937,7 +1976,7 @@
                         ifTrue:[ ^ self scan1 ].
                 (currentCharacter between:$- and:$/) ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1945,7 +1984,7 @@
                     ^ self reportLastMatch
                 ].
                 (currentCharacter == $n) ifTrue:[
-                    self recordMatch:#( 33 36 ).
+                    self recordMatch:#( 34 37 ).
                     self step.
                     ((currentCharacter between:$0 and:$9) 
                         or:[
@@ -1961,7 +2000,7 @@
                             ifTrue:[ ^ self scan1 ].
                     (currentCharacter between:$- and:$/) ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1969,7 +2008,7 @@
                         ^ self reportLastMatch
                     ].
                     (currentCharacter == $t) ifTrue:[
-                        self recordMatch:#( 33 36 ).
+                        self recordMatch:#( 34 37 ).
                         self step.
                         (currentCharacter isXMLDigit 
                             or:[
@@ -1985,7 +2024,7 @@
                                 ifTrue:[ ^ self scan1 ].
                         (currentCharacter between:$- and:$/) ifTrue:[
                             [
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 (currentCharacter isLetterOrDigit 
                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1993,7 +2032,7 @@
                             ^ self reportLastMatch
                         ].
                         (currentCharacter == $e) ifTrue:[
-                            self recordMatch:#( 33 36 ).
+                            self recordMatch:#( 34 37 ).
                             self step.
                             ((currentCharacter between:$0 and:$9) 
                                 or:[
@@ -2009,7 +2048,7 @@
                                     ifTrue:[ ^ self scan1 ].
                             (currentCharacter between:$- and:$/) ifTrue:[
                                 [
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     (currentCharacter isLetterOrDigit 
                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2017,14 +2056,14 @@
                                 ^ self reportLastMatch
                             ].
                             (currentCharacter == $r) ifTrue:[
-                                self recordMatch:#( 33 36 ).
+                                self recordMatch:#( 34 37 ).
                                 self step.
                                 (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
                                     ^ self scan1
                                 ].
                                 (currentCharacter between:$. and:$/) ifTrue:[
                                     [
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isLetterOrDigit 
                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2032,7 +2071,7 @@
                                     ^ self reportLastMatch
                                 ].
                                 (currentCharacter == $-) ifTrue:[
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     ((currentCharacter between:$- and:$9) 
                                         or:[
@@ -2047,7 +2086,7 @@
                                         ]) 
                                             ifTrue:[
                                                 [
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     (currentCharacter isLetterOrDigit 
                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2055,7 +2094,7 @@
                                                 ^ self reportLastMatch
                                             ].
                                     (currentCharacter == $t) ifTrue:[
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isXMLDigit 
                                             or:[
@@ -2073,7 +2112,7 @@
                                             ]) 
                                                 ifTrue:[
                                                     [
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2081,13 +2120,13 @@
                                                     ^ self reportLastMatch
                                                 ].
                                         (currentCharacter == $o) ifTrue:[
-                                            self recordMatch:#( 32 36 ).
+                                            self recordMatch:#( 33 37 ).
                                             self step.
                                             (currentCharacter isLetterOrDigit 
                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                                                     ifTrue:[
                                                         [
-                                                            self recordMatch:#( 36 ).
+                                                            self recordMatch:#( 37 ).
                                                             self step.
                                                             (currentCharacter isLetterOrDigit 
                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2115,7 +2154,7 @@
         ^ self reportLastMatch
     ].
     (currentCharacter == $s) ifTrue:[
-        self recordMatch:#( 33 36 ).
+        self recordMatch:#( 34 37 ).
         self step.
         ((currentCharacter between:$0 and:$9) 
             or:[
@@ -2131,7 +2170,7 @@
                 ifTrue:[ ^ self scan1 ].
         (currentCharacter between:$- and:$/) ifTrue:[
             [
-                self recordMatch:#( 36 ).
+                self recordMatch:#( 37 ).
                 self step.
                 (currentCharacter isLetterOrDigit 
                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2139,7 +2178,7 @@
             ^ self reportLastMatch
         ].
         (currentCharacter == $t) ifTrue:[
-            self recordMatch:#( 33 36 ).
+            self recordMatch:#( 34 37 ).
             self step.
             ((currentCharacter between:$0 and:$9) 
                 or:[
@@ -2155,7 +2194,7 @@
                     ifTrue:[ ^ self scan1 ].
             (currentCharacter between:$- and:$/) ifTrue:[
                 [
-                    self recordMatch:#( 36 ).
+                    self recordMatch:#( 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit 
                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2163,7 +2202,7 @@
                 ^ self reportLastMatch
             ].
             (currentCharacter == $r) ifTrue:[
-                self recordMatch:#( 33 36 ).
+                self recordMatch:#( 34 37 ).
                 self step.
                 (currentCharacter isXMLDigit 
                     or:[
@@ -2179,7 +2218,7 @@
                         ifTrue:[ ^ self scan1 ].
                 (currentCharacter between:$- and:$/) ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2187,7 +2226,7 @@
                     ^ self reportLastMatch
                 ].
                 (currentCharacter == $u) ifTrue:[
-                    self recordMatch:#( 33 36 ).
+                    self recordMatch:#( 34 37 ).
                     self step.
                     ((currentCharacter between:$0 and:$9) 
                         or:[
@@ -2203,7 +2242,7 @@
                             ifTrue:[ ^ self scan1 ].
                     (currentCharacter between:$- and:$/) ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2211,7 +2250,7 @@
                         ^ self reportLastMatch
                     ].
                     (currentCharacter == $c) ifTrue:[
-                        self recordMatch:#( 33 36 ).
+                        self recordMatch:#( 34 37 ).
                         self step.
                         ((currentCharacter between:$0 and:$9) 
                             or:[
@@ -2227,7 +2266,7 @@
                                 ifTrue:[ ^ self scan1 ].
                         (currentCharacter between:$- and:$/) ifTrue:[
                             [
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 (currentCharacter isLetterOrDigit 
                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2235,14 +2274,14 @@
                             ^ self reportLastMatch
                         ].
                         (currentCharacter == $t) ifTrue:[
-                            self recordMatch:#( 33 36 ).
+                            self recordMatch:#( 34 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
                                 ^ self scan1
                             ].
                             (currentCharacter between:$. and:$/) ifTrue:[
                                 [
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     (currentCharacter isLetterOrDigit 
                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2250,7 +2289,7 @@
                                 ^ self reportLastMatch
                             ].
                             (currentCharacter == $-) ifTrue:[
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 ((currentCharacter between:$- and:$9) 
                                     or:[
@@ -2265,7 +2304,7 @@
                                     ]) 
                                         ifTrue:[
                                             [
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 (currentCharacter isLetterOrDigit 
                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2273,7 +2312,7 @@
                                             ^ self reportLastMatch
                                         ].
                                 (currentCharacter == $f) ifTrue:[
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     (currentCharacter isXMLDigit 
                                         or:[
@@ -2291,7 +2330,7 @@
                                         ]) 
                                             ifTrue:[
                                                 [
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     (currentCharacter isLetterOrDigit 
                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2299,7 +2338,7 @@
                                                 ^ self reportLastMatch
                                             ].
                                     (currentCharacter == $o) ifTrue:[
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         ((currentCharacter between:$- and:$9) 
                                             or:[
@@ -2314,7 +2353,7 @@
                                             ]) 
                                                 ifTrue:[
                                                     [
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2322,7 +2361,7 @@
                                                     ^ self reportLastMatch
                                                 ].
                                         (currentCharacter == $r) ifTrue:[
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             (currentCharacter isXMLDigit 
                                                 or:[
@@ -2340,7 +2379,7 @@
                                                 ]) 
                                                     ifTrue:[
                                                         [
-                                                            self recordMatch:#( 36 ).
+                                                            self recordMatch:#( 37 ).
                                                             self step.
                                                             (currentCharacter isLetterOrDigit 
                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2348,7 +2387,7 @@
                                                         ^ self reportLastMatch
                                                     ].
                                             (currentCharacter == $e) ifTrue:[
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 (currentCharacter isXMLDigit 
                                                     or:[
@@ -2366,7 +2405,7 @@
                                                     ]) 
                                                         ifTrue:[
                                                             [
-                                                                self recordMatch:#( 36 ).
+                                                                self recordMatch:#( 37 ).
                                                                 self step.
                                                                 (currentCharacter isLetterOrDigit 
                                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2374,7 +2413,7 @@
                                                             ^ self reportLastMatch
                                                         ].
                                                 (currentCharacter == $i) ifTrue:[
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     ((currentCharacter between:$- and:$9) 
                                                         or:[
@@ -2389,7 +2428,7 @@
                                                         ]) 
                                                             ifTrue:[
                                                                 [
-                                                                    self recordMatch:#( 36 ).
+                                                                    self recordMatch:#( 37 ).
                                                                     self step.
                                                                     (currentCharacter isLetterOrDigit 
                                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2397,7 +2436,7 @@
                                                                 ^ self reportLastMatch
                                                             ].
                                                     (currentCharacter == $g) ifTrue:[
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         ((currentCharacter between:$- and:$9) 
                                                             or:[
@@ -2412,7 +2451,7 @@
                                                             ]) 
                                                                 ifTrue:[
                                                                     [
-                                                                        self recordMatch:#( 36 ).
+                                                                        self recordMatch:#( 37 ).
                                                                         self step.
                                                                         (currentCharacter isLetterOrDigit 
                                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2420,13 +2459,13 @@
                                                                     ^ self reportLastMatch
                                                                 ].
                                                         (currentCharacter == $n) ifTrue:[
-                                                            self recordMatch:#( 29 36 ).
+                                                            self recordMatch:#( 25 37 ).
                                                             self step.
                                                             (currentCharacter isLetterOrDigit 
                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                                                                     ifTrue:[
                                                                         [
-                                                                            self recordMatch:#( 36 ).
+                                                                            self recordMatch:#( 37 ).
                                                                             self step.
                                                                             (currentCharacter isLetterOrDigit 
                                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2462,7 +2501,7 @@
         ^ self reportLastMatch
     ].
     (currentCharacter == $t) ifTrue:[
-        self recordMatch:#( 33 36 ).
+        self recordMatch:#( 34 37 ).
         self step.
         ((currentCharacter between:$0 and:$9) 
             or:[
@@ -2475,7 +2514,7 @@
                 ifTrue:[ ^ self scan1 ].
         (currentCharacter between:$- and:$/) ifTrue:[
             [
-                self recordMatch:#( 36 ).
+                self recordMatch:#( 37 ).
                 self step.
                 (currentCharacter isLetterOrDigit 
                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2483,7 +2522,7 @@
             ^ self reportLastMatch
         ].
         (currentCharacter == $y) ifTrue:[
-            self recordMatch:#( 33 36 ).
+            self recordMatch:#( 34 37 ).
             self step.
             ((currentCharacter between:$0 and:$9) 
                 or:[
@@ -2499,7 +2538,7 @@
                     ifTrue:[ ^ self scan1 ].
             (currentCharacter between:$- and:$/) ifTrue:[
                 [
-                    self recordMatch:#( 36 ).
+                    self recordMatch:#( 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit 
                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2507,7 +2546,7 @@
                 ^ self reportLastMatch
             ].
             (currentCharacter == $p) ifTrue:[
-                self recordMatch:#( 33 36 ).
+                self recordMatch:#( 34 37 ).
                 self step.
                 (currentCharacter isXMLDigit 
                     or:[
@@ -2523,7 +2562,7 @@
                         ifTrue:[ ^ self scan1 ].
                 (currentCharacter between:$- and:$/) ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2531,7 +2570,7 @@
                     ^ self reportLastMatch
                 ].
                 (currentCharacter == $e) ifTrue:[
-                    self recordMatch:#( 33 36 ).
+                    self recordMatch:#( 34 37 ).
                     self step.
                     ((currentCharacter between:$0 and:$9) 
                         or:[
@@ -2547,7 +2586,7 @@
                             ifTrue:[ ^ self scan1 ].
                     (currentCharacter between:$- and:$/) ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2555,7 +2594,7 @@
                         ^ self reportLastMatch
                     ].
                     (currentCharacter == $d) ifTrue:[
-                        self recordMatch:#( 33 36 ).
+                        self recordMatch:#( 34 37 ).
                         self step.
                         (currentCharacter isXMLDigit 
                             or:[
@@ -2571,7 +2610,7 @@
                                 ifTrue:[ ^ self scan1 ].
                         (currentCharacter between:$- and:$/) ifTrue:[
                             [
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 (currentCharacter isLetterOrDigit 
                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2579,7 +2618,7 @@
                             ^ self reportLastMatch
                         ].
                         (currentCharacter == $e) ifTrue:[
-                            self recordMatch:#( 33 36 ).
+                            self recordMatch:#( 34 37 ).
                             self step.
                             ((currentCharacter between:$0 and:$9) 
                                 or:[
@@ -2595,7 +2634,7 @@
                                     ifTrue:[ ^ self scan1 ].
                             (currentCharacter between:$- and:$/) ifTrue:[
                                 [
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     (currentCharacter isLetterOrDigit 
                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2603,14 +2642,14 @@
                                 ^ self reportLastMatch
                             ].
                             (currentCharacter == $f) ifTrue:[
-                                self recordMatch:#( 33 36 ).
+                                self recordMatch:#( 34 37 ).
                                 self step.
                                 (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
                                     ^ self scan1
                                 ].
                                 (currentCharacter between:$. and:$/) ifTrue:[
                                     [
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isLetterOrDigit 
                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2618,7 +2657,7 @@
                                     ^ self reportLastMatch
                                 ].
                                 (currentCharacter == $-) ifTrue:[
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     ((currentCharacter between:$- and:$9) 
                                         or:[
@@ -2633,7 +2672,7 @@
                                         ]) 
                                             ifTrue:[
                                                 [
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     (currentCharacter isLetterOrDigit 
                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2641,7 +2680,7 @@
                                                 ^ self reportLastMatch
                                             ].
                                     (currentCharacter == $f) ifTrue:[
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isXMLDigit 
                                             or:[
@@ -2659,7 +2698,7 @@
                                             ]) 
                                                 ifTrue:[
                                                     [
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2667,7 +2706,7 @@
                                                     ^ self reportLastMatch
                                                 ].
                                         (currentCharacter == $o) ifTrue:[
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             ((currentCharacter between:$- and:$9) 
                                                 or:[
@@ -2682,7 +2721,7 @@
                                                 ]) 
                                                     ifTrue:[
                                                         [
-                                                            self recordMatch:#( 36 ).
+                                                            self recordMatch:#( 37 ).
                                                             self step.
                                                             (currentCharacter isLetterOrDigit 
                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2690,7 +2729,7 @@
                                                         ^ self reportLastMatch
                                                     ].
                                             (currentCharacter == $r) ifTrue:[
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 (currentCharacter isXMLDigit 
                                                     or:[
@@ -2708,7 +2747,7 @@
                                                     ]) 
                                                         ifTrue:[
                                                             [
-                                                                self recordMatch:#( 36 ).
+                                                                self recordMatch:#( 37 ).
                                                                 self step.
                                                                 (currentCharacter isLetterOrDigit 
                                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2716,7 +2755,7 @@
                                                             ^ self reportLastMatch
                                                         ].
                                                 (currentCharacter == $e) ifTrue:[
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     (currentCharacter isXMLDigit 
                                                         or:[
@@ -2734,7 +2773,7 @@
                                                         ]) 
                                                             ifTrue:[
                                                                 [
-                                                                    self recordMatch:#( 36 ).
+                                                                    self recordMatch:#( 37 ).
                                                                     self step.
                                                                     (currentCharacter isLetterOrDigit 
                                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2742,7 +2781,7 @@
                                                                 ^ self reportLastMatch
                                                             ].
                                                     (currentCharacter == $i) ifTrue:[
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         ((currentCharacter between:$- and:$9) 
                                                             or:[
@@ -2757,7 +2796,7 @@
                                                             ]) 
                                                                 ifTrue:[
                                                                     [
-                                                                        self recordMatch:#( 36 ).
+                                                                        self recordMatch:#( 37 ).
                                                                         self step.
                                                                         (currentCharacter isLetterOrDigit 
                                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2765,7 +2804,7 @@
                                                                     ^ self reportLastMatch
                                                                 ].
                                                         (currentCharacter == $g) ifTrue:[
-                                                            self recordMatch:#( 36 ).
+                                                            self recordMatch:#( 37 ).
                                                             self step.
                                                             ((currentCharacter between:$- and:$9) 
                                                                 or:[
@@ -2780,7 +2819,7 @@
                                                                 ]) 
                                                                     ifTrue:[
                                                                         [
-                                                                            self recordMatch:#( 36 ).
+                                                                            self recordMatch:#( 37 ).
                                                                             self step.
                                                                             (currentCharacter isLetterOrDigit 
                                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2788,13 +2827,13 @@
                                                                         ^ self reportLastMatch
                                                                     ].
                                                             (currentCharacter == $n) ifTrue:[
-                                                                self recordMatch:#( 17 36 ).
+                                                                self recordMatch:#( 9 37 ).
                                                                 self step.
                                                                 (currentCharacter isLetterOrDigit 
                                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                                                                         ifTrue:[
                                                                             [
-                                                                                self recordMatch:#( 36 ).
+                                                                                self recordMatch:#( 37 ).
                                                                                 self step.
                                                                                 (currentCharacter isLetterOrDigit 
                                                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2832,7 +2871,7 @@
         ^ self reportLastMatch
     ].
     (currentCharacter == $u) ifTrue:[
-        self recordMatch:#( 33 36 ).
+        self recordMatch:#( 34 37 ).
         self step.
         ((currentCharacter between:$0 and:$9) 
             or:[
@@ -2848,7 +2887,7 @@
                 ifTrue:[ ^ self scan1 ].
         (currentCharacter between:$- and:$/) ifTrue:[
             [
-                self recordMatch:#( 36 ).
+                self recordMatch:#( 37 ).
                 self step.
                 (currentCharacter isLetterOrDigit 
                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2856,7 +2895,7 @@
             ^ self reportLastMatch
         ].
         (currentCharacter == $n) ifTrue:[
-            self recordMatch:#( 33 36 ).
+            self recordMatch:#( 34 37 ).
             self step.
             (currentCharacter isXMLDigit 
                 or:[
@@ -2872,7 +2911,7 @@
                     ifTrue:[ ^ self scan1 ].
             (currentCharacter between:$- and:$/) ifTrue:[
                 [
-                    self recordMatch:#( 36 ).
+                    self recordMatch:#( 37 ).
                     self step.
                     (currentCharacter isLetterOrDigit 
                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2880,7 +2919,7 @@
                 ^ self reportLastMatch
             ].
             (currentCharacter == $i) ifTrue:[
-                self recordMatch:#( 33 36 ).
+                self recordMatch:#( 34 37 ).
                 self step.
                 (currentCharacter isXMLDigit 
                     or:[
@@ -2896,7 +2935,7 @@
                         ifTrue:[ ^ self scan1 ].
                 (currentCharacter between:$- and:$/) ifTrue:[
                     [
-                        self recordMatch:#( 36 ).
+                        self recordMatch:#( 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit 
                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2904,7 +2943,7 @@
                     ^ self reportLastMatch
                 ].
                 (currentCharacter == $o) ifTrue:[
-                    self recordMatch:#( 33 36 ).
+                    self recordMatch:#( 34 37 ).
                     self step.
                     ((currentCharacter between:$0 and:$9) 
                         or:[
@@ -2920,7 +2959,7 @@
                             ifTrue:[ ^ self scan1 ].
                     (currentCharacter between:$- and:$/) ifTrue:[
                         [
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             (currentCharacter isLetterOrDigit 
                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2928,14 +2967,14 @@
                         ^ self reportLastMatch
                     ].
                     (currentCharacter == $n) ifTrue:[
-                        self recordMatch:#( 33 36 ).
+                        self recordMatch:#( 34 37 ).
                         self step.
                         (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
                             ^ self scan1
                         ].
                         (currentCharacter between:$. and:$/) ifTrue:[
                             [
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 (currentCharacter isLetterOrDigit 
                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2943,7 +2982,7 @@
                             ^ self reportLastMatch
                         ].
                         (currentCharacter == $-) ifTrue:[
-                            self recordMatch:#( 36 ).
+                            self recordMatch:#( 37 ).
                             self step.
                             ((currentCharacter between:$- and:$9) 
                                 or:[
@@ -2958,7 +2997,7 @@
                                 ]) 
                                     ifTrue:[
                                         [
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             (currentCharacter isLetterOrDigit 
                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2966,7 +3005,7 @@
                                         ^ self reportLastMatch
                                     ].
                             (currentCharacter == $f) ifTrue:[
-                                self recordMatch:#( 36 ).
+                                self recordMatch:#( 37 ).
                                 self step.
                                 (currentCharacter isXMLDigit 
                                     or:[
@@ -2984,7 +3023,7 @@
                                     ]) 
                                         ifTrue:[
                                             [
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 (currentCharacter isLetterOrDigit 
                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2992,7 +3031,7 @@
                                             ^ self reportLastMatch
                                         ].
                                 (currentCharacter == $o) ifTrue:[
-                                    self recordMatch:#( 36 ).
+                                    self recordMatch:#( 37 ).
                                     self step.
                                     ((currentCharacter between:$- and:$9) 
                                         or:[
@@ -3007,7 +3046,7 @@
                                         ]) 
                                             ifTrue:[
                                                 [
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     (currentCharacter isLetterOrDigit 
                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3015,7 +3054,7 @@
                                                 ^ self reportLastMatch
                                             ].
                                     (currentCharacter == $r) ifTrue:[
-                                        self recordMatch:#( 36 ).
+                                        self recordMatch:#( 37 ).
                                         self step.
                                         (currentCharacter isXMLDigit 
                                             or:[
@@ -3033,7 +3072,7 @@
                                             ]) 
                                                 ifTrue:[
                                                     [
-                                                        self recordMatch:#( 36 ).
+                                                        self recordMatch:#( 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3041,7 +3080,7 @@
                                                     ^ self reportLastMatch
                                                 ].
                                         (currentCharacter == $e) ifTrue:[
-                                            self recordMatch:#( 36 ).
+                                            self recordMatch:#( 37 ).
                                             self step.
                                             (currentCharacter isXMLDigit 
                                                 or:[
@@ -3059,7 +3098,7 @@
                                                 ]) 
                                                     ifTrue:[
                                                         [
-                                                            self recordMatch:#( 36 ).
+                                                            self recordMatch:#( 37 ).
                                                             self step.
                                                             (currentCharacter isLetterOrDigit 
                                                                 or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3067,7 +3106,7 @@
                                                         ^ self reportLastMatch
                                                     ].
                                             (currentCharacter == $i) ifTrue:[
-                                                self recordMatch:#( 36 ).
+                                                self recordMatch:#( 37 ).
                                                 self step.
                                                 ((currentCharacter between:$- and:$9) 
                                                     or:[
@@ -3082,7 +3121,7 @@
                                                     ]) 
                                                         ifTrue:[
                                                             [
-                                                                self recordMatch:#( 36 ).
+                                                                self recordMatch:#( 37 ).
                                                                 self step.
                                                                 (currentCharacter isLetterOrDigit 
                                                                     or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3090,7 +3129,7 @@
                                                             ^ self reportLastMatch
                                                         ].
                                                 (currentCharacter == $g) ifTrue:[
-                                                    self recordMatch:#( 36 ).
+                                                    self recordMatch:#( 37 ).
                                                     self step.
                                                     ((currentCharacter between:$- and:$9) 
                                                         or:[
@@ -3105,7 +3144,7 @@
                                                         ]) 
                                                             ifTrue:[
                                                                 [
-                                                                    self recordMatch:#( 36 ).
+                                                                    self recordMatch:#( 37 ).
                                                                     self step.
                                                                     (currentCharacter isLetterOrDigit 
                                                                         or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3113,13 +3152,13 @@
                                                                 ^ self reportLastMatch
                                                             ].
                                                     (currentCharacter == $n) ifTrue:[
-                                                        self recordMatch:#( 19 36 ).
+                                                        self recordMatch:#( 19 37 ).
                                                         self step.
                                                         (currentCharacter isLetterOrDigit 
                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ]) 
                                                                 ifTrue:[
                                                                     [
-                                                                        self recordMatch:#( 36 ).
+                                                                        self recordMatch:#( 37 ).
                                                                         self step.
                                                                         (currentCharacter isLetterOrDigit 
                                                                             or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3154,21 +3193,21 @@
     ].
     ^ self reportLastMatch
 
-    "Modified: / 10-07-2008 / 19:55:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !CDefinitionScanner methodsFor:'generated-tokens'!
 
 emptySymbolTokenId
-	^63
+	^64
 
-    "Modified: / 10-07-2008 / 19:55:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
 errorTokenId
-	^64
+	^65
 
-    "Modified: / 10-07-2008 / 19:55:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !CDefinitionScanner class methodsFor:'documentation'!