--- a/tools/JavaScannerBase.st Fri Aug 16 19:52:36 2013 +0200
+++ b/tools/JavaScannerBase.st Fri Sep 06 02:45:44 2013 +0200
@@ -14,8 +14,8 @@
Object subclass:#JavaScannerBase
instanceVariableNames:'typeArray actionArray source lineNr tokenType tokenStartPosition
tokenEndPosition tokenLineNr numberRadix numberScale hereChar
- peekChar peekChar2 requestor saveComments currentComments
- tokenValue scaledMantissaValue parserFlags'
+ peekChar peekChar2 requestor saveComments tokenValue
+ scaledMantissaValue parserFlags comments'
classVariableNames:'Warnings'
poolDictionaries:''
category:'Languages-Java-Parser'
@@ -44,7 +44,6 @@
"
! !
-
!JavaScannerBase class methodsFor:'initialization'!
initialize
@@ -93,7 +92,6 @@
"/
! !
-
!JavaScannerBase class methodsFor:'instance creation'!
for:aStringOrStream
@@ -113,7 +111,6 @@
"Created: / 26.5.1999 / 12:02:16 / stefan"
! !
-
!JavaScannerBase class methodsFor:'Signal constants'!
emptySourceNotificationSignal
@@ -140,7 +137,6 @@
"Created: / 16.5.1998 / 15:55:14 / cg"
! !
-
!JavaScannerBase class methodsFor:'defaults'!
warnings
@@ -160,7 +156,6 @@
"Modified: 23.5.1997 / 12:03:05 / cg"
! !
-
!JavaScannerBase class methodsFor:'private accessing'!
actionArray
@@ -175,7 +170,6 @@
^ TypeArray
! !
-
!JavaScannerBase class methodsFor:'utility scanning'!
scanNumberFrom:aStream
@@ -215,7 +209,6 @@
"Modified: / 18.6.1998 / 23:10:39 / cg"
! !
-
!JavaScannerBase methodsFor:'Compatibility - ST80'!
endOfLastToken
@@ -273,7 +266,6 @@
"Modified: 20.6.1997 / 18:22:58 / cg"
! !
-
!JavaScannerBase methodsFor:'accessing'!
actionArray
@@ -291,8 +283,8 @@
|ret|
- ret := currentComments ? #().
- currentComments := nil.
+ ret := comments ? #().
+ comments := nil.
^ ret
"Created: 20.4.1996 / 20:07:01 / cg"
@@ -382,7 +374,6 @@
typeArray := something.
! !
-
!JavaScannerBase methodsFor:'error handling'!
correctableError:message position:pos1 to:pos2
@@ -541,7 +532,6 @@
^ 'Warning:'
! !
-
!JavaScannerBase methodsFor:'general scanning'!
scanPositionsFor:aTokenString inString:aSourceString
@@ -583,7 +573,6 @@
"
! !
-
!JavaScannerBase methodsFor:'initialization'!
initialize
@@ -615,7 +604,7 @@
tokenStartPosition := 1.
tokenLineNr := lineNr := 1.
- currentComments := nil.
+ comments := nil.
aStringOrStream isStream ifFalse:[
source := ReadStream on:aStringOrStream
@@ -626,15 +615,14 @@
"Modified: / 26.5.1999 / 12:02:16 / stefan"
! !
-
!JavaScannerBase methodsFor:'private'!
addComment:comment
saveComments ifTrue:[
- currentComments isNil ifTrue:[
- currentComments := OrderedCollection with:comment
+ comments isNil ifTrue:[
+ comments := OrderedCollection with:comment
] ifFalse:[
- currentComments add:comment
+ comments add:comment
]
].
!
@@ -658,7 +646,6 @@
requestor := anObject
! !
-
!JavaScannerBase methodsFor:'reading next token'!
atEnd
@@ -779,7 +766,6 @@
self subclassResponsibility
! !
-
!JavaScannerBase methodsFor:'reading next token - private'!
nextMantissa:radix
@@ -806,11 +792,10 @@
"Modified: / 5.3.1998 / 02:54:11 / cg"
! !
-
!JavaScannerBase class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libjava/tools/JavaScannerBase.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/tools/JavaScannerBase.st,v 1.3 2013-09-06 00:45:28 vrany Exp $'
!
version_HG