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

equal deleted inserted replaced

-:1e45d3c96ec5
+:b5316ef15274
 "{ NameSpace: Smalltalk }"
 Object subclass:#PPCScannerCodeGenerator
 	instanceVariableNames:'codeGen fsa backlinkStates backlinkTransitions arguments openSet
-		joinPoints incommingTransitions methodCache id'
+		incommingTransitions methodCache id resultStrategy fsaCache'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'PetitCompiler-Scanner'
 !
 ^ arguments
 !
 arguments: anObject
 arguments := anObject
+!
+codeGen
+^ codeGen
+!
+compiler
+^ self codeGen
 ! !
 !PPCScannerCodeGenerator methodsFor:'analysis'!
 analyzeBacklinks
 backlinkTransitions do: [ :t |
 (self backlinksTo: (t destination)) add: t.
 ].
 !
-analyzeJoinPoints
+analyzeDistinctRetvals
-| joinTransitions |
+(fsa hasDistinctRetvals) ifTrue: [
-joinTransitions := fsa joinTransitions.
+resultStrategy := PPCDistinctResultStrategy new
-joinTransitions := joinTransitions reject: [ :t | self isBacklinkDestination: t destination ].
+codeGen: codeGen;
-joinPoints := IdentityDictionary new.
+yourself
+] ifFalse: [
-joinTransitions do: [ :t |
+resultStrategy := PPCUniversalResultStrategy new
-(joinPoints at: t destination ifAbsentPut: [ IdentitySet new ]) add: t.
+codeGen: codeGen;
-]
+tokens: fsa retvals asArray;
+yourself
+]
 !
 analyzeTransitions
 | transitions |
 transitions := fsa allTransitions.
 backlinksTo: state
 ^ backlinkStates at: state ifAbsentPut: [ OrderedCollection new ]
 !
-closedJoinPoints
-| closed |
-closed := IdentitySet new.
-joinPoints keysAndValuesDo: [ :key :value |
-value isEmpty ifTrue: [ closed add: key ].
-].
-^ closed
-!
 containsBacklink: state
 state transitions do: [ :t |
 (self isBacklink:  t) ifTrue: [ ^ true ]
 ].
 isBacklinkDestination: state
 ^ (self backlinksTo: state)  isEmpty not
 !
-isJoinPoint: state
+startsSimpleLoop: state
-"Please note that joinPoints are removed as the compilaction proceeds"
+|   |
-^ joinPoints keys includes: state
-!
+"
+This accepts more or less something like $a star
-joinTransitionsTo: joinPoint "state"
+for now.. might extend later
-^ joinPoints at: joinPoint ifAbsent: [ #() ]
+"
+((self incommingTransitionsFor: state) size == 2) ifFalse: [ ^ false ].
+^ (state transitions select: [ :t | t destination == state ]) size == 1
+! !
+!PPCScannerCodeGenerator methodsFor:'caching'!
+cache: anFsa method: method
+fsaCache at: anFsa put: method
+!
+cachedValueForIsomorphicFsa: anFsa
+| key |
+key := fsaCache keys detect: [ :e | e isIsomorphicTo: anFsa ].
+^ fsaCache at: key
+!
+isomorphicIsCached: anFsa
+^ fsaCache keys anySatisfy: [ :e | e isIsomorphicTo: anFsa ]
 ! !
 !PPCScannerCodeGenerator methodsFor:'code generation'!
 generate
+| method |
 self assert: fsa isDeterministic.
 self assert: fsa isWithoutEpsilons.
 self assert: fsa checkConsistency.
+(self isomorphicIsCached: fsa) ifTrue: [
+^ self cachedValueForIsomorphicFsa: fsa
+].
 self analyzeBacklinks.
-self analyzeJoinPoints.
 self analyzeTransitions.
+self analyzeDistinctRetvals.
 openSet := IdentitySet new.
 codeGen startMethod: (codeGen idFor: fsa).
 codeGen codeComment: (Character codePoint: 13) asString, fsa asString.
+resultStrategy reset.
 self generateFor: fsa startState.
-codeGen stopMethod.
+method := codeGen stopMethod.
+self cache: fsa method: method.
-^ self compileScannerClass new
+^ method.
 !
 generate: aPEGFsa
 fsa := aPEGFsa.
-fsa compact.
+self assert: fsa isDeterministic.
+self assert: fsa isWithoutPriorities.
+fsa minimize.
 fsa checkSanity.
 ^ self generate
 !
+generateAndCompile
+self generate.
+^ self compile
+!
+generateAndCompile: aPEGFsa
+fsa := aPEGFsa.
+fsa minimize.
+fsa checkSanity.
+^ self generateAndCompile
+!
 generateFinalFor: state
-state isFinal ifFalse: [  ^ self ].
+^ self generateFinalFor: state offset: 0
+!
-codeGen codeRecordMatch: state retval priority: state priority.
+generateFinalFor: state offset: offset
+state retvalsAndInfosDo: [:retval :info |
+info isFinal ifTrue: [
+info isFsaFailure ifTrue: [
+resultStrategy recordFailure: retval offset: offset
+] ifFalse: [
+resultStrategy recordMatch: retval offset: offset
+]
+].
+]
 !
 generateFor: state
-"	(self isJoinPoint: state) ifTrue: [
-^ codeGen codeComment: 'join point generation postponed...'
-].
-"
 codeGen cachedValue: (codeGen idFor: state) ifPresent: [ :method |
 "if state is already cached, it has multiple incomming links.
 	 In such a case, it is compiled as a method, thus return immediatelly"
 ^ codeGen codeAbsoluteReturn:  method call
 ].
-self generateStartMethod: state.
+(self startsSimpleLoop: state) ifTrue: [
-"	(self isBacklinkDestination: state) ifTrue: [
+^ self generateSimpleLoopFor: state
-codeGen codeStartBlock.
+].
-].
-"
+^ self generateStandardFor: state
-self generateFinalFor: state.
-self generateNextFor: state.
-self generateTransitionsFor: state.
-"	(self isBacklinkDestination: state) ifTrue: [
-codeGen codeEndBlockWhileTrue.
-].
-"
-self generateStopMethod: state.
 !
 generateForSingleTransition: t from: state.
 (self isJoinPoint: t destination) ifTrue: [ self removeJoinTransition: t ].
-codeGen codeAssertPeek: (t characterSet) orReturn: state priority.
+codeGen codeAssertPeek: t ifFalse: [
+resultStrategy returnResult: state
+].
 "	(self isBacklink: t) ifTrue: [
 codeGen add: 'true'
 ] ifFalse: [
 self generateFor: t destination.
 ]
 "
 self generateFor: t destination
 !
 generateForTransition: t from: state
-(self isJoinPoint: t destination) ifTrue: [ self removeJoinTransition: t   ].
 "	(self isBacklink: t) ifTrue: [
 codeGen codeAssertPeek: (t characterSet) ifTrue: [
 codeGen add: 'true'
 ]
 ] ifFalse: [
 codeGen codeAssertPeek: (t characterSet) ifTrue: [.
 self generateFor: t destination.
 ].
 ].
 "
-codeGen codeAssertPeek: (t characterSet) ifTrue: [.
+codeGen codeAssertPeek: t ifTrue: [.
 self generateFor: t destination.
 ].
 codeGen codeIfFalse.
 !
 state transitions isEmpty ifTrue: [  ^ self ].
 codeGen codeNextChar.
 !
 generateReturnFor: state
-codeGen codeNlReturnResult: state priority.
+codeGen codeNl.
+resultStrategy returnResult: state.
+!
+generateSimpleLoopFor: state
+| selfTransition |
+selfTransition := state transitions detect: [ :t | t destination == state ].
+codeGen codeStartBlock.
+codeGen codeNextChar.
+codeGen codeNl.
+codeGen codeAssertPeek: selfTransition.
+codeGen codeEndBlockWhileTrue.
+"Last transition did not passed the loop, therefore, we have to record succes with offset -1"
+self generateFinalFor: state offset: 1.
+self generateTransitions: (state transitions reject: [ :t | t == selfTransition  ]) for: state.
+!
+generateStandardFor: state
+self generateStartMethod: state.
+self generateFinalFor: state.
+self generateNextFor: state.
+self generateTransitionsFor: state.
+self generateStopMethod: state.
 !
 generateStartMethod: state.
 id := codeGen idFor: state.
 codeGen code: codeGen stopInline call.
 ].
 codeGen codeComment: 'STOP - Generated from state: ', state asString.
 !
-generateTransitionsFor: state
+generateTransitions: transitions for: state
-(state transitions size = 0) ifTrue: [
+(transitions size = 0) ifTrue: [
 self generateReturnFor: state.
 ^ self
 ].
-(state transitions size = 1) ifTrue: [
+"	(state transitions size = 1) ifTrue: [
 self generateForSingleTransition: state transitions anyOne from: state.
 ^ self
-].
+]."
 codeGen codeNl.
-state transitions do: [ :t |
+transitions do: [ :t |
 self generateForTransition: t from: state
 ].
 codeGen indent.
 self generateReturnFor: state.
 codeGen dedent.
 codeGen codeNl.
-state transitions size timesRepeat: [ codeGen addOnLine: ']' ].
+transitions size timesRepeat: [ codeGen addOnLine: ']' ].
 codeGen addOnLine: '.'.
 "	self closedJoinPoints isEmpty ifFalse: [
 | jp |
 jp := self closedJoinPoints anyOne.
 self removeJoinPoint: jp.
 self generateFor: jp.
 ]
 "
+!
+generateTransitionsFor: state
+^ self generateTransitions: state transitions for: state
+!
+setMaxNumericId
+codeGen addConstant: codeGen idGen numericIds size as: #MaxSymbolNumber
+!
+setTokens
+| tokens |
+tokens := Array new: codeGen idGen numericIdCache size.
+codeGen idGen numericIdCache keysAndValuesDo: [ :key :value |
+tokens at: value put: key
+].
+codeGen addConstant: tokens as: #Tokens
 ! !
 !PPCScannerCodeGenerator methodsFor:'compiling'!
+compile
+^ self compileScannerClass new
+!
 compileScannerClass
 | builder |
+self setMaxNumericId.
+self setTokens.
 builder := PPCClassBuilder new.
 builder compiledClassName: arguments scannerName.
 builder compiledSuperclass: PPCScanner.
 builder methodDictionary: codeGen methodDictionary.
 initialize
 super initialize.
 codeGen := PPCFSACodeGen new.
 arguments := PPCArguments default.
-! !
+fsaCache := IdentityDictionary new.
+! !
-!PPCScannerCodeGenerator methodsFor:'support'!
-removeJoinPoint: state
-self assert: (joinPoints at: state) size = 0.
-joinPoints removeKey: state
-!
-removeJoinTransition: t
-(self joinTransitionsTo: t destination) remove: t ifAbsent: [ self error: 'this should not happen' ].
-! !

changeset 515	b5316ef15274
parent 502	1e45d3c96ec5
child 516	3b81c9e53352
child 524	f6f68d32de73