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

equal deleted inserted replaced

-:54b3bc9e3987
+:20598d7ce9fa
 asCompilerNode
 	^ PPCAndNode new
 		name: self name;
 		child: parser;
 		yourself
+! !
+!PPCharSetPredicate methodsFor:'*petitcompiler'!
+= anObject
+	self == anObject ifTrue: [ ^ true ].
+	self class == anObject class ifFalse: [ ^ false ].
+	^ classification = anObject classification
 ! !
 !PPCharSetPredicate methodsFor:'*petitcompiler'!
 block
 	self class == anotherPredicate class ifFalse: [ ^ false ].
 	^ classification  = anotherPredicate classification.
 ! !
+!PPCharSetPredicate methodsFor:'*petitcompiler'!
+hash
+	^ classification hash
+! !
 !PPChoiceParser methodsFor:'*petitcompiler'!
 asCompilerNode
 	^ PPCChoiceNode new
 		name: self name;
 ! !
 !PPContext methodsFor:'*petitcompiler'!
+atWs
+	^ false
+! !
+!PPContext methodsFor:'*petitcompiler'!
 comment
 	^ self globalAt: #comment ifAbsent: [ nil ].
 ! !
 !PPContext methodsFor:'*petitcompiler'!
 	^ self position: position
 ! !
 !PPContext methodsFor:'*petitcompiler'!
+methodInvoked: whatever
+	"nothing to do"
+! !
+!PPContext methodsFor:'*petitcompiler'!
 peek: anInteger
 	^ stream peek: anInteger
+! !
+!PPContext methodsFor:'*petitcompiler'!
+setWs
+	"nothing to do"
 ! !
 !PPContext methodsFor:'*petitcompiler'!
 whitespace
 position: anInteger
 	position := anInteger
 ! !
+!PPJavaWhitespaceParser methodsFor:'*petitcompiler'!
+= anotherParser
+	anotherParser == self ifTrue: [ ^ true ].
+anotherParser class = self class ifFalse: [ ^ false ].
+^ anotherParser name = self name
+! !
+!PPJavaWhitespaceParser methodsFor:'*petitcompiler'!
+hash
+	^ self name hash
+! !
 !PPLiteralObjectParser methodsFor:'*petitcompiler'!
 asCompilerNode
 	^ PPCCharacterNode new
 		character: literal;
 ! !
 !PPParser methodsFor:'*petitcompiler'!
 compile
-	^ self compile: #PPGeneratedParser
+	^ self compile: PPCArguments default
 ! !
 !PPParser methodsFor:'*petitcompiler'!
-compile: name
+compile: arguments
-	^ self compile: name parameters: #()
+	self assert: (arguments isKindOf: PPCArguments).
-! !
+	^ PPCConfiguration default
-!PPParser methodsFor:'*petitcompiler'!
+		arguments: arguments;
+		compile: self
-compile: name andParse: input
+! !
-	^ (self compile: name) parse: input
-! !
+!PPParser methodsFor:'*petitcompiler'!
-!PPParser methodsFor:'*petitcompiler'!
+compile: arguments andParse: input
+	^ (self compile: arguments) parse: input
-compile: name parameters: params
+! !
-	^ (PPCCompiler new parameters: params; compile: self as: name) new
-! !
+!PPParser methodsFor:'*petitcompiler'!
-!PPParser methodsFor:'*petitcompiler'!
+compileAs: name
+	| arguments |
-compileWith: aPetitCompiler
+	arguments := PPCArguments default.
-	| compiled |
+	arguments name: name.
-	self children do: [ :child |
-		compiled := child compileWith: aPetitCompiler.
+	^ self compile: arguments
-		self replace: child with: compiled bridge.
+! !
-	].
-	^ aPetitCompiler compileBridgeTo: self
+!PPParser methodsFor:'*petitcompiler'!
-! !
+compileWithConfiguration: configuration
-!PPParser methodsFor:'*petitcompiler'!
+	^ configuration compile: self
-compileWithParameters: params
-	^ self compile: #PPGeneratedParser parameters: params
 ! !
 !PPParser methodsFor:'*petitcompiler'!
 firstSetSuchThat: block
 !PPParser methodsFor:'*petitcompiler'!
 isTokenParser
 	^ false
+! !
+!PPParser methodsFor:'*petitcompiler'!
+javaToken
+	| ws |
+	ws := PPJavaWhitespaceParser new.
+	^ ((ws, ((PPTokenParser on: self) tokenClass: PPJavaToken; yourself), ws) ==> #second)
+		propertyAt: #'trimmingToken' put: true;
+		yourself
 ! !
 !PPParser methodsFor:'*petitcompiler'!
 optimize
 !PPSmalltalkGrammar methodsFor:'*petitcompiler'!
 comment
 	^ $" asParser, $" asParser negate star, $" asParser.
-! !
-!PPSmalltalkGrammar methodsFor:'*petitcompiler'!
-updateContext: aPPContext
-	super updateContext: aPPContext.
-"
-	aPPContext globalAt: #comment ifAbsentPut: [ self comment ].
-	aPPContext globalAt: #whitespace ifAbsentPut: [  PPSmalltalkWhitespaceParser new ].
-"
 ! !
 !PPSmalltalkGrammar methodsFor:'*petitcompiler'!
 whitespace
 	^ token comments: comments
 ! !
 !PPSmalltalkTokenParser methodsFor:'*petitcompiler'!
-updateContext: aPPContext
-	aPPContext globalAt: #whitespace ifAbsentPut: PPSmalltalkWhitespaceParser new
-! !
-!PPSmalltalkTokenParser methodsFor:'*petitcompiler'!
 whitespace
 	^ PPSmalltalkWhitespaceParser new
 ! !
 !PPSmalltalkWhitespaceParser methodsFor:'*petitcompiler'!
 	^ 'TOKEN[', parser displayName, ']'
 ! !
 !PPTokenParser methodsFor:'*petitcompiler'!
-firstSets: aFirstDictionary into: aSet
-	"Or keep empty, if token is a terminal"
-	^ super firstSets: aFirstDictionary  into: aSet
-! !
-!PPTokenParser methodsFor:'*petitcompiler'!
 isFirstSetTerminal
 	^ false
 ! !
 !PPTokenParser methodsFor:'*petitcompiler'!
 ! !
 !PPTokenParser methodsFor:'*petitcompiler'!
 startsWith: aCharacter
-	self first do: [:first | (first startsWith: aCharacter) ifTrue: [ ^ true ] ].
+	^ self first anySatisfy: [ :first | first startsWith: aCharacter ]
-	^ false
 ! !
 !PPTokenParser methodsFor:'*petitcompiler'!
 whitespace
 		child: parser;
 		name: self name;
 		yourself
 ! !
-!PPTrimmingParser methodsFor:'*petitcompiler'!
-compileWith: aPetitCompiler
-	^ aPetitCompiler compileTrim: self.
-! !
-!PPTrimmingParser methodsFor:'*petitcompiler'!
-firstSets: aFirstDictionary into: aSet
-	super firstSets: aFirstDictionary into: aSet
-! !
 !UndefinedObject methodsFor:'*petitcompiler'!
 asInteger
 	^ 256
 ! !

changeset 438	20598d7ce9fa
parent 422	116d2b2af905
child 452	9f4558b3be66