hg/stx-goodies-petitparser: comparison compiler/PPCScanner.st

equal deleted inserted replaced

-:b5316ef15274
+:f6f68d32de73
 "{ Package: 'stx:goodies/petitparser/compiler' }"
 "{ NameSpace: Smalltalk }"
 Object subclass:#PPCScanner
-	instanceVariableNames:'match matchPosition matches tokens stream currentChar
+	instanceVariableNames:'match matchPosition matches tokens currentChar maxSymbolNumber
-		maxSymbolNumber position'
+		position context'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'PetitCompiler-Scanner'
 !
 "returns the start position before the scan method..."
 ^ position
 !
 stream
-^ stream
+^ context
 !
 stream: anObject
-stream := anObject
+context := anObject
 ! !
 !PPCScanner methodsFor:'initialization'!
 initialize
 !
 reset
 matchPosition := nil. "This flag says that multimode run the last time"
-position := stream position.
+position := context position.
 "	matches := Array new: maxSymbolNumber."
 !
 reset: tokenList
 "Method should not be used, it is here for debugging and testing purposes"
 "	matches := IdentityDictionary new.	"
 match := nil.
 matchPosition := -1.						"this is a flag that the distnict mode was running"
 "	matches := nil."
-position := stream position.
+position := context position.
 ! !
 !PPCScanner methodsFor:'results'!
 ] ].
 ! !
 !PPCScanner methodsFor:'results - distinct'!
+recordDistinctFailure
+match := nil.
+matchPosition := position.
+^ false
+!
+recordDistinctFailure: matchValue
+match := matchValue.
+matchPosition := context position.
+^ false
+!
 recordDistinctMatch: matchValue
 match := matchValue.
-matchPosition := stream position.
+matchPosition := context position.
+^ true
 !
 recordDistinctMatch: matchValue offset: offset
 match := matchValue.
 currentChar isNil ifFalse: [
-matchPosition := stream position - offset.
+matchPosition := context position - offset.
 ] ifTrue: [
-matchPosition := stream position.
+matchPosition := context position.
-]
+].
+^ true
 !
 returnDistinct
 ^ match isNotNil
 ! !
 recordFailure: index offset: offset
 matches at: index put: -1.
 !
 recordMatch: index
-	matches at: index put: stream position.
+	matches at: index put: context position.
 !
 recordMatch: index offset: offset
 currentChar isNil ifFalse: [
-matches at: index put: stream position - offset.
+matches at: index put: context position - offset.
 ] ifTrue: [
-matches at: index put: stream position.
+matches at: index put: context position.
 ].
 !
 return
 ^ matches
 ! !
 !PPCScanner methodsFor:'scanning'!
-next
+back
-self error: 'deprecated?'.
+currentChar isNil ifFalse: [
-stream next
+context skip: -1
+]
 !
 peek
+self flag: 'inline this, do not call peek!!'.
 ^ currentChar
 !
 peekBetween: start and: stop
 (currentChar == nil) ifTrue: [ ^ false ].
 ^ (start <= currentChar codePoint) and: [ currentChar codePoint <= stop ]
 !
 step
-currentChar := stream next
+currentChar := context next
 ! !
 !PPCScanner methodsFor:'testing'!
 isSingleMatch

changeset 524	f6f68d32de73
parent 515	b5316ef15274
child 525	751532c8f3db