--- a/Cface__CDefinitionScanner.st Fri Jul 04 12:05:15 2008 +0000
+++ b/Cface__CDefinitionScanner.st Thu Jul 10 07:31:14 2008 +0000
@@ -23,7 +23,7 @@
scannerDefinitionComment
- "<name> : [a-zA-Z_] \w* ;
+ "<name> : [a-zA-Z_.] \w* ;
<number> : \-? [0-9]+ [a-zA-Z]* ;
<whitespace> : \s+ ;
@@ -33,75 +33,75 @@
<comment> : \# [^\r\n]* ;
"
- "Modified: / 04-07-2008 / 12:38:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 09-07-2008 / 21:26:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionScanner class methodsFor:'generated-initialization'!
initializeKeywordMap
keywordMap := Dictionary new.
- #( #(35 'argument' 13)
- #(35 'array' 27)
- #(35 'char' 5)
- #(35 'const' 29)
- #(35 'double' 15)
- #(35 'enum' 19)
- #(35 'field' 17)
- #(35 'float' 23)
- #(35 'function' 11)
- #(35 'int' 6)
- #(35 'long' 4)
- #(35 'return' 8)
- #(35 'short' 3)
- #(35 'signed' 1)
- #(35 'struct' 30)
- #(35 'typedef' 21)
- #(35 'union' 24)
- #(35 'unsigned' 2)
- #(35 'value' 20)
- #(35 'void' 26)
- #(35 'wchar_t' 25)
- #(32 'argument' 13)
- #(32 'array' 27)
- #(32 'char' 5)
- #(32 'const' 29)
- #(32 'double' 15)
- #(32 'enum' 19)
- #(32 'field' 17)
- #(32 'float' 23)
- #(32 'function' 11)
- #(32 'int' 6)
- #(32 'long' 4)
- #(32 'return' 8)
- #(32 'short' 3)
- #(32 'signed' 1)
- #(32 'struct' 30)
- #(32 'typedef' 21)
- #(32 'union' 24)
- #(32 'unsigned' 2)
- #(32 'value' 20)
- #(32 'void' 26)
- #(32 'wchar_t' 25) )
+ #( #(36 'argument' 13)
+ #(36 'array' 26)
+ #(36 'char' 5)
+ #(36 'const' 28)
+ #(36 'double' 16)
+ #(36 'enum' 20)
+ #(36 'field' 19)
+ #(36 'float' 15)
+ #(36 'function' 11)
+ #(36 'int' 6)
+ #(36 'long' 4)
+ #(36 'return' 8)
+ #(36 'short' 3)
+ #(36 'signed' 1)
+ #(36 'struct' 32)
+ #(36 'typedef' 22)
+ #(36 'union' 29)
+ #(36 'unsigned' 2)
+ #(36 'value' 21)
+ #(36 'void' 24)
+ #(36 'wchar_t' 27)
+ #(33 'argument' 13)
+ #(33 'array' 26)
+ #(33 'char' 5)
+ #(33 'const' 28)
+ #(33 'double' 16)
+ #(33 'enum' 20)
+ #(33 'field' 19)
+ #(33 'float' 15)
+ #(33 'function' 11)
+ #(33 'int' 6)
+ #(33 'long' 4)
+ #(33 'return' 8)
+ #(33 'short' 3)
+ #(33 'signed' 1)
+ #(33 'struct' 32)
+ #(33 'typedef' 22)
+ #(33 'union' 29)
+ #(33 'unsigned' 2)
+ #(33 'value' 21)
+ #(33 'void' 24)
+ #(33 'wchar_t' 27) )
do:[:each |
(keywordMap at:each first ifAbsentPut:[ Dictionary new ]) at:(each at:2)
put:each last
].
^ keywordMap
- "Modified: / 04-07-2008 / 12:38:46 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 09-07-2008 / 21:25:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionScanner methodsFor:'generated-scanner'!
scan1
[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ])
] whileTrue.
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -110,16 +110,16 @@
].
^ self reportLastMatch
- "Modified: / 04-07-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 09-07-2008 / 21:26:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
scan2
[
- self recordMatch:#( 33 35 ).
+ self recordMatch:#( 34 36 ).
self step.
(currentCharacter isLetter) ifTrue:[
[
- self recordMatch:#( 33 35 ).
+ self recordMatch:#( 34 36 ).
self step.
(currentCharacter isLetter)
] whileTrue.
@@ -127,7 +127,7 @@
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -140,7 +140,7 @@
] whileTrue.
((currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ]) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -149,7 +149,7 @@
].
^ self reportLastMatch
- "Modified: / 04-07-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 09-07-2008 / 21:26:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
scan3
@@ -1101,7 +1101,7 @@
^ self reportLastMatch
].
(currentCharacter == $d) ifTrue:[
- self recordMatch:#( 10 36 ).
+ self recordMatch:#( 10 37 ).
self step.
(currentCharacter <= (Character tab)
or:[
@@ -1149,13 +1149,13 @@
^ self recordAndReportMatch:#( 14 ).
].
(currentCharacter == $-) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetter
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1167,17 +1167,28 @@
].
^ self reportLastMatch
].
+ (currentCharacter == $.) ifTrue:[
+ [
+ self recordMatch:#( 33 ).
+ self step.
+ (currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ])
+ ] whileTrue.
+ ^ self reportLastMatch
+ ].
(currentCharacter == $/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
] whileTrue.
^ self reportLastMatch
].
+ (currentCharacter == $@) ifTrue:[
+ ^ self recordAndReportMatch:#( 18 ).
+ ].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1193,7 +1204,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1201,7 +1212,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1217,7 +1228,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1225,7 +1236,7 @@
^ self reportLastMatch
].
(currentCharacter == $u) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1241,7 +1252,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1249,14 +1260,14 @@
^ self reportLastMatch
].
(currentCharacter == $m) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
^ self scan1
].
(currentCharacter between:$. and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1264,7 +1275,7 @@
^ self reportLastMatch
].
(currentCharacter == $-) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -1279,7 +1290,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1287,7 +1298,7 @@
^ self reportLastMatch
].
(currentCharacter == $f) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1305,7 +1316,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1313,7 +1324,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -1328,7 +1339,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1336,7 +1347,7 @@
^ self reportLastMatch
].
(currentCharacter == $r) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1354,7 +1365,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1362,7 +1373,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1380,7 +1391,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1388,7 +1399,7 @@
^ self reportLastMatch
].
(currentCharacter == $i) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -1403,7 +1414,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1411,7 +1422,7 @@
^ self reportLastMatch
].
(currentCharacter == $g) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -1426,7 +1437,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1434,13 +1445,13 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 22 35 ).
+ self recordMatch:#( 23 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1472,7 +1483,7 @@
^ self reportLastMatch
].
(currentCharacter == $f) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1491,7 +1502,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1499,7 +1510,7 @@
^ self reportLastMatch
].
(currentCharacter == $r) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1515,7 +1526,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1523,7 +1534,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1539,7 +1550,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1547,14 +1558,14 @@
^ self reportLastMatch
].
(currentCharacter == $m) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
^ self scan1
].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1571,7 +1582,7 @@
^ self reportLastMatch
].
(currentCharacter == $u) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1587,7 +1598,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1595,7 +1606,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1611,7 +1622,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1619,7 +1630,7 @@
^ self reportLastMatch
].
(currentCharacter == $c) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1635,7 +1646,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1643,7 +1654,7 @@
^ self reportLastMatch
].
(currentCharacter == $t) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1659,7 +1670,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1667,7 +1678,7 @@
^ self reportLastMatch
].
(currentCharacter == $i) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1683,7 +1694,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1691,7 +1702,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1707,7 +1718,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1715,14 +1726,14 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
^ self scan1
].
(currentCharacter between:$. and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1730,7 +1741,7 @@
^ self reportLastMatch
].
(currentCharacter == $-) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -1745,7 +1756,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1753,7 +1764,7 @@
^ self reportLastMatch
].
(currentCharacter == $t) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -1765,7 +1776,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1773,7 +1784,7 @@
^ self reportLastMatch
].
(currentCharacter == $y) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -1788,7 +1799,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1796,7 +1807,7 @@
^ self reportLastMatch
].
(currentCharacter == $p) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1814,7 +1825,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1822,13 +1833,13 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 7 35 ).
+ self recordMatch:#( 7 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1862,7 +1873,7 @@
^ self reportLastMatch
].
(currentCharacter == $p) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1878,7 +1889,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1886,7 +1897,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1902,7 +1913,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1910,7 +1921,7 @@
^ self reportLastMatch
].
(currentCharacter == $i) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1926,7 +1937,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1934,7 +1945,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1950,7 +1961,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1958,7 +1969,7 @@
^ self reportLastMatch
].
(currentCharacter == $t) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -1974,7 +1985,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1982,7 +1993,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -1998,7 +2009,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2006,14 +2017,14 @@
^ self reportLastMatch
].
(currentCharacter == $r) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
^ self scan1
].
(currentCharacter between:$. and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2021,7 +2032,7 @@
^ self reportLastMatch
].
(currentCharacter == $-) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2036,7 +2047,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2044,7 +2055,7 @@
^ self reportLastMatch
].
(currentCharacter == $t) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2062,7 +2073,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2070,13 +2081,13 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 31 35 ).
+ self recordMatch:#( 30 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2104,7 +2115,7 @@
^ self reportLastMatch
].
(currentCharacter == $s) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2120,7 +2131,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2128,7 +2139,7 @@
^ self reportLastMatch
].
(currentCharacter == $t) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2144,7 +2155,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2152,7 +2163,7 @@
^ self reportLastMatch
].
(currentCharacter == $r) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2168,7 +2179,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2176,7 +2187,7 @@
^ self reportLastMatch
].
(currentCharacter == $u) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2192,7 +2203,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2200,7 +2211,7 @@
^ self reportLastMatch
].
(currentCharacter == $c) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2216,7 +2227,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2224,14 +2235,14 @@
^ self reportLastMatch
].
(currentCharacter == $t) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
^ self scan1
].
(currentCharacter between:$. and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2239,7 +2250,7 @@
^ self reportLastMatch
].
(currentCharacter == $-) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2254,7 +2265,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2262,7 +2273,7 @@
^ self reportLastMatch
].
(currentCharacter == $f) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2280,7 +2291,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2288,7 +2299,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2303,7 +2314,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2311,7 +2322,7 @@
^ self reportLastMatch
].
(currentCharacter == $r) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2329,7 +2340,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2337,7 +2348,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2355,7 +2366,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2363,7 +2374,7 @@
^ self reportLastMatch
].
(currentCharacter == $i) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2378,7 +2389,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2386,7 +2397,7 @@
^ self reportLastMatch
].
(currentCharacter == $g) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2401,7 +2412,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2409,13 +2420,13 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 28 35 ).
+ self recordMatch:#( 31 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2451,7 +2462,7 @@
^ self reportLastMatch
].
(currentCharacter == $t) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2464,7 +2475,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2472,7 +2483,7 @@
^ self reportLastMatch
].
(currentCharacter == $y) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2488,7 +2499,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2496,7 +2507,7 @@
^ self reportLastMatch
].
(currentCharacter == $p) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2512,7 +2523,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2520,7 +2531,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2536,7 +2547,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2544,7 +2555,7 @@
^ self reportLastMatch
].
(currentCharacter == $d) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2560,7 +2571,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2568,7 +2579,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2584,7 +2595,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2592,14 +2603,14 @@
^ self reportLastMatch
].
(currentCharacter == $f) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
^ self scan1
].
(currentCharacter between:$. and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2607,7 +2618,7 @@
^ self reportLastMatch
].
(currentCharacter == $-) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2622,7 +2633,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2630,7 +2641,7 @@
^ self reportLastMatch
].
(currentCharacter == $f) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2648,7 +2659,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2656,7 +2667,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2671,7 +2682,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2679,7 +2690,7 @@
^ self reportLastMatch
].
(currentCharacter == $r) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2697,7 +2708,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2705,7 +2716,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2723,7 +2734,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2731,7 +2742,7 @@
^ self reportLastMatch
].
(currentCharacter == $i) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2746,7 +2757,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2754,7 +2765,7 @@
^ self reportLastMatch
].
(currentCharacter == $g) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2769,7 +2780,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2777,13 +2788,13 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 16 35 ).
+ self recordMatch:#( 17 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2821,7 +2832,7 @@
^ self reportLastMatch
].
(currentCharacter == $u) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2837,7 +2848,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2845,7 +2856,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2861,7 +2872,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2869,7 +2880,7 @@
^ self reportLastMatch
].
(currentCharacter == $i) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2885,7 +2896,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2893,7 +2904,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
((currentCharacter between:$0 and:$9)
or:[
@@ -2909,7 +2920,7 @@
ifTrue:[ ^ self scan1 ].
(currentCharacter between:$- and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2917,14 +2928,14 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 32 35 ).
+ self recordMatch:#( 33 36 ).
self step.
(currentCharacter isLetterOrDigit or:[ currentCharacter == $_ ]) ifTrue:[
^ self scan1
].
(currentCharacter between:$. and:$/) ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2932,7 +2943,7 @@
^ self reportLastMatch
].
(currentCharacter == $-) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2947,7 +2958,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2955,7 +2966,7 @@
^ self reportLastMatch
].
(currentCharacter == $f) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -2973,7 +2984,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2981,7 +2992,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -2996,7 +3007,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3004,7 +3015,7 @@
^ self reportLastMatch
].
(currentCharacter == $r) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -3022,7 +3033,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3030,7 +3041,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isXMLDigit
or:[
@@ -3048,7 +3059,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3056,7 +3067,7 @@
^ self reportLastMatch
].
(currentCharacter == $i) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -3071,7 +3082,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3079,7 +3090,7 @@
^ self reportLastMatch
].
(currentCharacter == $g) ifTrue:[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
((currentCharacter between:$- and:$9)
or:[
@@ -3094,7 +3105,7 @@
])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3102,13 +3113,13 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 18 35 ).
+ self recordMatch:#( 25 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
- self recordMatch:#( 35 ).
+ self recordMatch:#( 36 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3143,21 +3154,21 @@
].
^ self reportLastMatch
- "Modified: / 04-07-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 09-07-2008 / 21:26:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionScanner methodsFor:'generated-tokens'!
emptySymbolTokenId
- ^62
+ ^63
- "Modified: / 04-07-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 09-07-2008 / 21:26:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
errorTokenId
- ^63
+ ^64
- "Modified: / 04-07-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 09-07-2008 / 21:26:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionScanner class methodsFor:'documentation'!