hg/stx-libcomp: comparison Scanner.st

equal deleted inserted replaced

-:74ddc944c27f
+:e8331ba8ad5d
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 hereby transferred.
 "
 Object subclass:#Scanner
 instanceVariableNames:'source
-token tokenType tokenPosition tokenValue
+			      token tokenType tokenPosition tokenValue
-tokenName tokenLineNr tokenRadix
+			      tokenName tokenLineNr tokenRadix
-thisChar peekChar
+			      thisChar peekChar
-requestor exitBlock
+			      requestor exitBlock
-errorFlag
+			      errorFlag
-ignoreErrors ignoreWarnings
+			      ignoreErrors ignoreWarnings
-saveComments currentComments
+			      saveComments currentComments
-warnSTXSpecialComment
+			      warnSTXSpecialComment
-outStream outCol'
+			      outStream outCol'
-classVariableNames:'TypeArray ActionArray Warnings WarnSTXSpecials'
+	  classVariableNames:'TypeArray ActionArray Warnings WarnSTXSpecials'
-poolDictionaries:''
+	    poolDictionaries:''
-category:'System-Compiler'
+		    category:'System-Compiler'
 !
 Scanner comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
-All Rights Reserved
+	     All Rights Reserved
-$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.12 1994-08-23 23:05:01 claus Exp $
+$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.13 1994-10-10 00:57:45 claus Exp $
 '!
 !Scanner class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.12 1994-08-23 23:05:01 claus Exp $
+$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.13 1994-10-10 00:57:45 claus Exp $
 "
 !
 documentation
 "
 !Scanner class methodsFor:'defaults'!
 warnings:aBoolean
 "this allows turning on/off warnings; the default is on.
 You can turn off warnings in your 'private.rc' file with
-Compiler warnings:false
+	 Compiler warnings:false
 "
 Warnings := aBoolean
 !
 warnSTXSpecials:aBoolean
 "this allows turning on/off warnings about stx specials.
 If you get bored by those warnings, turn them off by adding
 a line as:
-Compiler warnSTXSpecials:false
+	Compiler warnSTXSpecials:false
 in your 'private.rc' file"
 WarnSTXSpecials := aBoolean
 ! !
 ActionArray := Array new:256.
 TypeArray := Array new:256.
 block := [:s :char | s nextNumber].
 ($0 asciiValue) to:($9 asciiValue) do:[:index |
-ActionArray at:index put:block
+	ActionArray at:index put:block
 ].
 block := [:s :char | s nextIdentifier].
 ($a asciiValue) to:($z asciiValue) do:[:index |
-ActionArray at:index put:block
+	ActionArray at:index put:block
 ].
 ($A asciiValue) to:($Z asciiValue) do:[:index |
-ActionArray at:index put:block
+	ActionArray at:index put:block
 ].
 block := [:s :char | s nextSpecial].
 #( $& $- $+ $= $* $/ $\ $< $> $~ $@ $, $? ) do:[:binop |
-TypeArray at:(binop asciiValue) put:#special.
+	TypeArray at:(binop asciiValue) put:#special.
-ActionArray at:(binop asciiValue) put:block
+	ActionArray at:(binop asciiValue) put:block
 ].
 block := [:s :char | s nextToken:char].
 #( $; $. $( $) $[ $] $!! $^ $| $_ ) do:[:ch |
-ActionArray at:(ch asciiValue) put:block
+	ActionArray at:(ch asciiValue) put:block
 ].
 "kludge: action is characterToken, but type is special"
 TypeArray at:($| asciiValue) put:#special.
 if this is the first time, setup character- and action tables"
 errorFlag := false.
 tokenLineNr := 1.
 aStringOrStream isStream ifFalse:[
-source := ReadStream on:aStringOrStream
+	source := ReadStream on:aStringOrStream
 ] ifTrue:[
-source := aStringOrStream.
+	source := aStringOrStream.
 ].
 currentComments := nil.
 saveComments := false.
 ignoreErrors := false.
 ignoreWarnings := Warnings not.
 warnSTXSpecialComment := WarnSTXSpecials.
 ActionArray isNil ifTrue:[
-self class setupActions
+	self class setupActions
 ]
 !
 initialize
 "prepare a scan"
 backupPosition
 "if reading from a stream, at the end we might have read
 one token too many"
 (tokenType == #EOF) ifFalse:[
-source position:tokenPosition
+	source position:tokenPosition
 ]
 !
 beginComment
 ^ self
 !
 endComment:comment
 saveComments ifTrue:[
-currentComments isNil ifTrue:[
+	currentComments isNil ifTrue:[
-currentComments := OrderedCollection with:comment
+	    currentComments := OrderedCollection with:comment
-] ifFalse:[
+	] ifFalse:[
-currentComments add:comment
+	    currentComments add:comment
-]
+	]
 ].
 ! !
 !Scanner methodsFor:'error handling'!
 showErrorMessage:aMessage position:pos
 "show an errormessage on the Transcript"
 ignoreErrors ifFalse:[
-Smalltalk silentLoading == true ifFalse:[
+	Smalltalk silentLoading == true ifFalse:[
-Transcript showCr:(pos printString , ' ' , aMessage)
+	    Transcript showCr:(pos printString , ' ' , aMessage)
-]
+	]
 ]
 !
 notifyError:aMessage position:position to:endPos
 "notify requestor of an error - if there is no requestor
 put it on the transcript.
 Return the result passed back by the requestor."
 requestor isNil ifTrue:[
-self showErrorMessage:aMessage position:position.
+	self showErrorMessage:aMessage position:position.
-^ false
+	^ false
 ].
 ^ requestor error:aMessage position:position to:endPos
 !
 "notify requestor of an warning - if there is no requestor
 put it on the transcript.
 Return the result passed back by the requestor."
 requestor isNil ifTrue:[
-ignoreWarnings ifFalse:[
+	ignoreWarnings ifFalse:[
-self showErrorMessage:aMessage position:position.
+	    self showErrorMessage:aMessage position:position.
-].
+	].
-^ false
+	^ false
 ].
 ^ requestor warning:aMessage position:position to:endPos
 !
 syntaxError:aMessage position:position to:endPos
 "
 self initializeFor:(ReadStream on:aSourceString).
 positions := OrderedCollection new.
 [(t := self nextToken) ~~ #EOF] whileTrue:[
-searchType == t ifTrue:[
+	searchType == t ifTrue:[
-(searchName isNil or:[tokenName = searchName]) ifTrue:[
+	    (searchName isNil or:[tokenName = searchName]) ifTrue:[
-(searchValue isNil or:[tokenValue = searchValue]) ifTrue:[
+		(searchValue isNil or:[tokenValue = searchValue]) ifTrue:[
-positions add:tokenPosition.
+		    positions add:tokenPosition.
-]
+		]
-]
+	    ]
-]
+	]
 ].
 ^ positions
 "
 comment := ''.
 self beginComment.
 outStream notNil ifTrue:[
-outStream nextPut:Character doubleQuote.
+	outStream nextPut:Character doubleQuote.
-outCol := outCol + 1
+	outCol := outCol + 1
 ].
 startPos := source position.
 source next.
 thisChar := source peek.
 Since this is non-standard, use it in very rare cases only.
 (maybe the upcoming ansi-standard adds something similar - in this case, I will
 change it without notice)"
 thisChar == $/ ifTrue:[
-[thisChar notNil and:[thisChar ~~ Character cr]] whileTrue:[
+	[thisChar notNil and:[thisChar ~~ Character cr]] whileTrue:[
-saveComments ifTrue:[
+	    saveComments ifTrue:[
-comment := comment copyWith:thisChar
+		comment := comment copyWith:thisChar
-].
+	    ].
-outStream notNil ifTrue:[
+	    outStream notNil ifTrue:[
-outStream nextPut:thisChar.
+		outStream nextPut:thisChar.
-outCol := outCol + 1
+		outCol := outCol + 1
-].
+	    ].
-thisChar := source nextPeek.
+	    thisChar := source nextPeek.
-].
+	].
-tokenLineNr := tokenLineNr + 1.
+	tokenLineNr := tokenLineNr + 1.
-ignoreWarnings ifFalse:[
+	ignoreWarnings ifFalse:[
-warnSTXSpecialComment ifTrue:[
+	    warnSTXSpecialComment ifTrue:[
-self warning:'end-of-line comments are a nonstandard feature of ST/X'
+		self warning:'end-of-line comments are a nonstandard feature of ST/X'
-position:startPos to:(source position).
+		     position:startPos to:(source position).
-"
+		"
-only warn once
+		 only warn once
-"
+		"
-warnSTXSpecialComment := false
+		warnSTXSpecialComment := false
-]
+	    ]
-].
+	].
-outStream notNil ifTrue:[
+	outStream notNil ifTrue:[
-outStream cr.
+	    outStream cr.
-outCol := 1
+	    outCol := 1
-].
+	].
 ] ifFalse:[
-[thisChar notNil and:[thisChar ~~ (Character doubleQuote)]] whileTrue:[
+	[thisChar notNil and:[thisChar ~~ (Character doubleQuote)]] whileTrue:[
-thisChar == (Character cr) ifTrue:[
+	    thisChar == (Character cr) ifTrue:[
-tokenLineNr := tokenLineNr + 1.
+		tokenLineNr := tokenLineNr + 1.
-].
+	    ].
-saveComments ifTrue:[
+	    saveComments ifTrue:[
-comment := comment copyWith:thisChar
+		comment := comment copyWith:thisChar
-].
+	    ].
-outStream notNil ifTrue:[
+	    outStream notNil ifTrue:[
-outStream nextPut:thisChar.
+		outStream nextPut:thisChar.
-outCol := outCol + 1
+		outCol := outCol + 1
-].
+	    ].
-thisChar := source nextPeek
+	    thisChar := source nextPeek
-].
+	].
-thisChar isNil ifTrue:[
+	thisChar isNil ifTrue:[
-self warning:'unclosed comment' position:startPos to:(source position)
+	    self warning:'unclosed comment' position:startPos to:(source position)
-] ifFalse:[
+	] ifFalse:[
-outStream notNil ifTrue:[
+	    outStream notNil ifTrue:[
-outStream nextPut:(Character doubleQuote).
+		outStream nextPut:(Character doubleQuote).
-outCol := outCol + 1
+		outCol := outCol + 1
-].
+	    ].
-]
+	]
 ].
 saveComments ifTrue:[
-currentComments isNil ifTrue:[
+	currentComments isNil ifTrue:[
-currentComments := OrderedCollection with:comment
+	    currentComments := OrderedCollection with:comment
-] ifFalse:[
+	] ifFalse:[
-currentComments add:comment
+	    currentComments add:comment
-]
+	]
 ].
 "skip final dQuote or cr"
 source next.
 "return the next token from the source-stream"
 |skipping actionBlock|
 peekChar notNil ifTrue:[
-thisChar := peekChar.
+	thisChar := peekChar.
-peekChar := nil
+	peekChar := nil
 ] ifFalse:[
-skipping := true.
+	skipping := true.
-[skipping] whileTrue:[
+	[skipping] whileTrue:[
-outStream notNil ifTrue:[
+	    outStream notNil ifTrue:[
-[(thisChar := source peek) == Character space] whileTrue:[
+		[(thisChar := source peek) == Character space] whileTrue:[
-source next.
+		    source next.
-outStream space.
+		    outStream space.
-outCol := outCol + 1.
+		    outCol := outCol + 1.
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-thisChar := source skipSeparatorsExceptCR.
+		thisChar := source skipSeparatorsExceptCR.
-].
+	    ].
-thisChar == (Character cr) ifTrue:[
+	    thisChar == (Character cr) ifTrue:[
-tokenLineNr := tokenLineNr + 1.
+		tokenLineNr := tokenLineNr + 1.
-source next.
+		source next.
-outStream notNil ifTrue:[
+		outStream notNil ifTrue:[
-outStream cr.
+		    outStream cr.
-outCol := 1
+		    outCol := 1
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-thisChar == (Character doubleQuote) ifTrue:[
+		thisChar == (Character doubleQuote) ifTrue:[
-"start of a comment"
+		    "start of a comment"
-self skipComment.
+		    self skipComment.
-thisChar := source peek.
+		    thisChar := source peek.
-] ifFalse:[
+		] ifFalse:[
-skipping := false
+		    skipping := false
-]
+		]
-]
+	    ]
-].
+	].
-thisChar isNil ifTrue:[
+	thisChar isNil ifTrue:[
-tokenType := #EOF.
+	    tokenType := #EOF.
-^ tokenType
+	    ^ tokenType
-]
+	]
 ].
 tokenPosition := source position.
 actionBlock := ActionArray at:(thisChar asciiValue).
 actionBlock notNil ifTrue:[
-^ actionBlock value:self value:thisChar
+	^ actionBlock value:self value:thisChar
 ].
 self syntaxError:('invalid character: ''' , thisChar asString , ''' ',
-'(' , thisChar asciiValue printString , ')')
+		      '(' , thisChar asciiValue printString , ')')
-position:tokenPosition to:tokenPosition.
+	    position:tokenPosition to:tokenPosition.
 tokenType := #Error.
 ^ #Error
 !
 nextToken:aCharacter
 nextColonOrAssign
 "colon has been read - look for = to make it an assign"
 (source nextPeek == $=) ifTrue:[
-source next.
+	source next.
-tokenType := $_
+	tokenType := $_
 ] ifFalse:[
-tokenType := $:
+	tokenType := $:
 ].
 ^ tokenType
 !
 nextSpecial
 |firstChar secondChar thirdChar string p|
 firstChar := source next.
 secondChar := source peek.
 (firstChar == $-) ifTrue:[
-secondChar isDigit ifTrue:[
+	secondChar isDigit ifTrue:[
-self nextNumber.
+	    self nextNumber.
-tokenValue := tokenValue negated.
+	    tokenValue := tokenValue negated.
-^ tokenType
+	    ^ tokenType
-]
+	]
 ].
 string := firstChar asString.
 secondChar notNil ifTrue:[
-((TypeArray at:(secondChar asciiValue)) == #special) ifTrue:[
+	((TypeArray at:(secondChar asciiValue)) == #special) ifTrue:[
-(secondChar == $-) ifTrue:[
+	    (secondChar == $-) ifTrue:[
-"special- look if minus belongs to number following"
+		"special- look if minus belongs to number following"
-p := source position.
+		p := source position.
-source next.
+		source next.
-thirdChar := source peek.
+		thirdChar := source peek.
-source position:p.
+		source position:p.
-thirdChar isDigit ifTrue:[
+		thirdChar isDigit ifTrue:[
-tokenName := string.
+		    tokenName := string.
-tokenType := #BinaryOperator.
+		    tokenType := #BinaryOperator.
-^ tokenType
+		    ^ tokenType
-]
+		]
-].
+	    ].
-source next.
+	    source next.
-string := string copyWith:secondChar
+	    string := string copyWith:secondChar
-].
+	].
 ].
 tokenName := string.
 tokenType := #BinaryOperator.
 ^ tokenType
 !
 |nextChar|
 source next.
 nextChar := source next.
 nextChar notNil ifTrue:[
-tokenValue := nextChar.
+	tokenValue := nextChar.
-tokenType := #Character
+	tokenType := #Character
 ] ifFalse:[
-tokenType := #EOF
+	tokenType := #EOF
 ].
 ^ tokenType
 !
 nextMantissa:radix
 value := 0.
 factor := 1.0 / radix.
 nextChar := source peek.
 [(nextChar notNil and:[nextChar isDigitRadix:radix])] whileTrue:[
-value := value + (nextChar digitValue * factor).
+	value := value + (nextChar digitValue * factor).
-factor := factor / radix.
+	factor := factor / radix.
-nextChar := source nextPeek
+	nextChar := source nextPeek
 ].
 ^ value
 !
 nextNumber
 tokenRadix := 10.
 value := Integer readFrom:source radix:tokenRadix.
 nextChar := source peek.
 (nextChar == $r) ifTrue:[
-tokenRadix := value.
+	tokenRadix := value.
-source next.
+	source next.
-s := 1.
+	s := 1.
-source peek == $- ifTrue:[
+	source peek == $- ifTrue:[
-source next.
+	    source next.
-s := -1
+	    s := -1
-].
+	].
-value := Integer readFrom:source radix:tokenRadix.
+	value := Integer readFrom:source radix:tokenRadix.
-value := value * s.
+	value := value * s.
-nextChar := source peek
+	nextChar := source peek
 ].
 (nextChar == $.) ifTrue:[
-nextChar := source nextPeek.
+	nextChar := source nextPeek.
-(nextChar notNil and:[nextChar isDigitRadix:tokenRadix]) ifTrue:[
+	(nextChar notNil and:[nextChar isDigitRadix:tokenRadix]) ifTrue:[
-value := value asFloat + (self nextMantissa:tokenRadix).
+	    value := value asFloat + (self nextMantissa:tokenRadix).
-nextChar := source peek
+	    nextChar := source peek
-] ifFalse:[
+	] ifFalse:[
-nextChar == (Character cr) ifTrue:[
+	    nextChar == (Character cr) ifTrue:[
-tokenLineNr := tokenLineNr + 1.
+		tokenLineNr := tokenLineNr + 1.
-].
+	    ].
-peekChar := $.
+	    peekChar := $.
-]
+	]
 ].
 ((nextChar == $e) or:[nextChar == $E]) ifTrue:[
-nextChar := source nextPeek.
+	nextChar := source nextPeek.
-(nextChar notNil and:[(nextChar isDigitRadix:tokenRadix) or:['+-' includes:nextChar]]) ifTrue:[
+	(nextChar notNil and:[(nextChar isDigitRadix:tokenRadix) or:['+-' includes:nextChar]]) ifTrue:[
-s := 1.
+	    s := 1.
-(nextChar == $+) ifTrue:[
+	    (nextChar == $+) ifTrue:[
-nextChar := source nextPeek
+		nextChar := source nextPeek
-] ifFalse:[
+	    ] ifFalse:[
-(nextChar == $-) ifTrue:[
+		(nextChar == $-) ifTrue:[
-nextChar := source nextPeek.
+		    nextChar := source nextPeek.
-s := s negated
+		    s := s negated
-]
+		]
-].
+	    ].
-value := value asFloat
+	    value := value asFloat
-* (10.0 raisedToInteger:((Integer readFrom:source radix:tokenRadix) * s))
+		     * (10.0 raisedToInteger:((Integer readFrom:source radix:tokenRadix) * s))
-]
+	]
 ].
 tokenValue := value.
 (value isMemberOf:Float) ifTrue:[
-tokenType := #Float
+	tokenType := #Float
 ] ifFalse:[
-tokenType := #Integer
+	tokenType := #Integer
 ].
 ^ tokenType
 !
 nextId
 nextChar := source peek.
 string := String new:10.
 index := 0.
 max := 10.
 [true] whileTrue:[
-(nextChar notNil and:[nextChar isAlphaNumeric]) ifFalse:[
+	(nextChar notNil and:[nextChar isLetterOrDigit]) ifFalse:[
-^ string copyTo:index
+	    ^ string copyTo:index
-].
+	].
-(index == max) ifTrue:[
+	(index == max) ifTrue:[
-oldString := string.
+	    oldString := string.
-string := String new:(max * 2).
+	    string := String new:(max * 2).
-string replaceFrom:1 to:max with:oldString.
+	    string replaceFrom:1 to:max with:oldString.
-max := max * 2
+	    max := max * 2
-].
+	].
-index := index + 1.
+	index := index + 1.
-string at:index put:nextChar.
+	string at:index put:nextChar.
-nextChar := source nextPeek
+	nextChar := source nextPeek
 ]
 !
 nextIdentifier
 |nextChar string firstChar|
 string := source nextWord "self nextId".
 nextChar := source peek.
 (nextChar == $:) ifTrue:[
-source next.
+	source next.
-(source peek == $=) ifFalse:[
+	(source peek == $=) ifFalse:[
-tokenName := string copyWith:nextChar.
+	    tokenName := string copyWith:nextChar.
-tokenType := #Keyword.
+	    tokenType := #Keyword.
-^ self
+	    ^ self
-].
+	].
-peekChar := $_
+	peekChar := $_
 ].
 tokenName := string.
 firstChar := string at:1.
 (firstChar == $s) ifTrue:[
-(string = 'self') ifTrue:[tokenType := #Self. ^self].
+	(string = 'self') ifTrue:[tokenType := #Self. ^self].
-(string = 'super') ifTrue:[tokenType := #Super. ^self]
+	(string = 'super') ifTrue:[tokenType := #Super. ^self]
 ].
 (firstChar == $n) ifTrue:[
-(string = 'nil') ifTrue:[tokenType := #Nil. ^self]
+	(string = 'nil') ifTrue:[tokenType := #Nil. ^self]
 ].
 (firstChar == $t) ifTrue:[
-(string = 'true') ifTrue:[tokenType := #True. ^self].
+	(string = 'true') ifTrue:[tokenType := #True. ^self].
-(string = 'thisContext') ifTrue:[tokenType := #ThisContext. ^self]
+	(string = 'thisContext') ifTrue:[tokenType := #ThisContext. ^self]
 ].
 (firstChar == $f) ifTrue:[
-(string = 'false') ifTrue:[tokenType := #False. ^self]
+	(string = 'false') ifTrue:[tokenType := #False. ^self]
 ].
 tokenType := #Identifier.
 ^ tokenType
 !
 nextChar := source nextPeek.
 string := String new:500.
 len := 500.
 index := 1.
 (nextChar == ${) ifTrue:[
-nextChar := source nextPeek.
+	nextChar := source nextPeek.
-inPrimitive := true.
+	inPrimitive := true.
-[inPrimitive] whileTrue:[
+	[inPrimitive] whileTrue:[
-[nextChar == $%] whileFalse:[
+	    [nextChar == $%] whileFalse:[
-string at:index put:nextChar.
+		string at:index put:nextChar.
-(index == len) ifTrue:[
+		(index == len) ifTrue:[
-string := string , (String new:len).
+		    string := string , (String new:len).
-len := len * 2
+		    len := len * 2
-].
+		].
-index := index + 1.
+		index := index + 1.
-nextChar := source next
+		nextChar := source next
-].
+	    ].
-(source peek == $}) ifTrue:[
+	    (source peek == $}) ifTrue:[
-inPrimitive := false
+		inPrimitive := false
-] ifFalse:[
+	    ] ifFalse:[
-string at:index put:nextChar.
+		string at:index put:nextChar.
-(index == len) ifTrue:[
+		(index == len) ifTrue:[
-string := string , (String new:len).
+		    string := string , (String new:len).
-len := len * 2
+		    len := len * 2
-].
+		].
-index := index + 1.
+		index := index + 1.
-nextChar := source next
+		nextChar := source next
-]
+	    ]
-].
+	].
-source next.
+	source next.
-tokenValue := string copyTo:(index - 1).
+	tokenValue := string copyTo:(index - 1).
-tokenType := #Primitive.
+	tokenType := #Primitive.
-tokenLineNr := tokenLineNr + (tokenValue occurrencesOf:(Character cr)).
+	tokenLineNr := tokenLineNr + (tokenValue occurrencesOf:(Character cr)).
-^ tokenType
+	^ tokenType
 ].
 "a % alone is a binary operator"
 tokenName := '%'.
 tokenType := #BinaryOperator.
 ^ tokenType.
 "
 self syntaxError:('invalid character: ''' , nextChar asString , '''')
-position:tokenPosition to:(tokenPosition + 1).
+	    position:tokenPosition to:(tokenPosition + 1).
 ^ #Error
 "
 !
 nextHash
 |nextChar string|
 nextChar := source nextPeek.
 nextChar notNil ifTrue:[
-nextChar isAlphaNumeric ifTrue:[
+	nextChar isLetterOrDigit ifTrue:[
-string := ''.
+	    string := ''.
-[nextChar notNil and:[nextChar isAlphaNumeric]] whileTrue:[
+	    [nextChar notNil and:[nextChar isLetterOrDigit]] whileTrue:[
-string := string , (source nextWord "self nextId").
+		string := string , (source nextWord "self nextId").
-nextChar := source peek.
+		nextChar := source peek.
-(nextChar == $:) ifFalse:[
+		(nextChar == $:) ifFalse:[
-tokenValue := string asSymbol.
+		    tokenValue := string asSymbol.
-tokenType := #Symbol.
+		    tokenType := #Symbol.
-^ tokenType
+		    ^ tokenType
-].
+		].
-string := string copyWith:nextChar.
+		string := string copyWith:nextChar.
-nextChar := source nextPeek
+		nextChar := source nextPeek
-].
+	    ].
-tokenValue := string asSymbol.
+	    tokenValue := string asSymbol.
-tokenType := #Symbol.
+	    tokenType := #Symbol.
-^ tokenType
+	    ^ tokenType
-].
+	].
-(nextChar == $( ) ifTrue:[
+	(nextChar == $( ) ifTrue:[
-source next.
+	    source next.
-tokenType := #HashLeftParen.
+	    tokenType := #HashLeftParen.
-^ tokenType
+	    ^ tokenType
-].
+	].
-(nextChar == $[ ) ifTrue:[
+	(nextChar == $[ ) ifTrue:[
-"it seems that ST-80 supports Constant ByteArrays as #[...]
+	    "it seems that ST-80 supports Constant ByteArrays as #[...]
-(seen in a PD program)"
+	     (seen in a PD program)"
-source next.
+	    source next.
-tokenType := #HashLeftBrack.
+	    tokenType := #HashLeftBrack.
-^ tokenType
+	    ^ tokenType
-].
+	].
-(nextChar == $' ) ifTrue:[
+	(nextChar == $' ) ifTrue:[
-"it seems that ST-80 supports arbitrary symbols as #'...'
+	    "it seems that ST-80 supports arbitrary symbols as #'...'
-(seen in a PD program)"
+	     (seen in a PD program)"
-self nextString.
+	    self nextString.
-tokenValue := tokenValue asSymbol.
+	    tokenValue := tokenValue asSymbol.
-tokenType := #Symbol.
+	    tokenType := #Symbol.
-^ tokenType
+	    ^ tokenType
-].
+	].
-((TypeArray at:(nextChar asciiValue)) == #special) ifTrue:[
+	((TypeArray at:(nextChar asciiValue)) == #special) ifTrue:[
-string := source next asString.
+	    string := source next asString.
-nextChar := source peek.
+	    nextChar := source peek.
-nextChar notNil ifTrue:[
+	    nextChar notNil ifTrue:[
-((TypeArray at:(nextChar asciiValue)) == #special) ifTrue:[
+		((TypeArray at:(nextChar asciiValue)) == #special) ifTrue:[
-source next.
+		    source next.
-string := string copyWith:nextChar
+		    string := string copyWith:nextChar
-]
+		]
-].
+	    ].
-tokenValue := string asSymbol.
+	    tokenValue := string asSymbol.
-tokenType := #Symbol.
+	    tokenType := #Symbol.
-^ tokenType
+	    ^ tokenType
-]
+	]
 ].
 "this allows hash to be used as binop -
 I dont know, if this is correct ..."
 tokenName := '#'.
-tokenType := BinaryOperator.
+tokenType := #BinaryOperator.
 ^ tokenType
 "
 self syntaxError:'unexpected end-of-input in Symbol'
-position:tokenPosition to:(tokenPosition + 1).
+	    position:tokenPosition to:(tokenPosition + 1).
 ^ #Error
 "
 !
 nextString
 source next.
 nextChar := source next.
 inString := true.
 [inString] whileTrue:[
-nextChar isNil ifTrue:[
+	nextChar isNil ifTrue:[
-self syntaxError:'unexpected end-of-input in String'
+	    self syntaxError:'unexpected end-of-input in String'
-position:pos to:(source position - 1).
+		    position:pos to:(source position - 1).
-tokenType := #EOF.
+	    tokenType := #EOF.
-^ tokenType
+	    ^ tokenType
-].
+	].
-(nextChar == Character cr) ifTrue:[
+	(nextChar == Character cr) ifTrue:[
-tokenLineNr := tokenLineNr + 1
+	    tokenLineNr := tokenLineNr + 1
-].
+	].
-(nextChar == Character quote) ifTrue:[
+	(nextChar == Character quote) ifTrue:[
-(source peek == Character quote) ifTrue:[
+	    (source peek == Character quote) ifTrue:[
-source next
+		source next
-] ifFalse:[
+	    ] ifFalse:[
-inString := false
+		inString := false
-]
+	    ]
-].
+	].
-inString ifTrue:[
+	inString ifTrue:[
-string at:index put:nextChar.
+	    string at:index put:nextChar.
-(index == len) ifTrue:[
+	    (index == len) ifTrue:[
-string := string , (String new:len).
+		string := string , (String new:len).
-len := len * 2
+		len := len * 2
-].
+	    ].
-index := index + 1.
+	    index := index + 1.
-nextChar := source next
+	    nextChar := source next
-]
+	]
 ].
 tokenValue := string copyTo:(index - 1).
 tokenType := #String.
 ^ tokenType
 ! !

changeset 45	e8331ba8ad5d
parent 41	62214c6ca833
child 49	02660b790c3e