--- a/compiler/extensions.st Mon Nov 24 00:09:23 2014 +0000
+++ b/compiler/extensions.st Wed Apr 15 11:28:09 2015 +0100
@@ -112,12 +112,6 @@
!PPContext methodsFor:'*petitcompiler'!
-lastTokenResult
- ^ scanner lastResult
-! !
-
-!PPContext methodsFor:'*petitcompiler'!
-
lwRemember
^ self position
! !
@@ -130,24 +124,6 @@
!PPContext methodsFor:'*petitcompiler'!
-matchToken: id
- ^ scanner matchToken: id
-! !
-
-!PPContext methodsFor:'*petitcompiler'!
-
-nextToken
- scanner next
-! !
-
-!PPContext methodsFor:'*petitcompiler'!
-
-nextToken: id
- ^ scanner next: id
-! !
-
-!PPContext methodsFor:'*petitcompiler'!
-
peek: anInteger
^ stream peek: anInteger
! !
@@ -237,12 +213,6 @@
^ aPetitCompiler compileCharacter: literal.
! !
-!PPLiteralObjectParser methodsFor:'*petitcompiler'!
-
-firstCharParser
- ^ self
-! !
-
!PPLiteralParser methodsFor:'*petitcompiler'!
id
@@ -264,12 +234,6 @@
^ aPetitCompiler compileLiteral: literal.
! !
-!PPLiteralSequenceParser methodsFor:'*petitcompiler'!
-
-firstCharParser
- ^ literal first asParser
-! !
-
!PPNotParser methodsFor:'*petitcompiler'!
asCompilerNode
@@ -285,12 +249,6 @@
^ aPetitCompiler compileNot: self
! !
-!PPNotParser methodsFor:'*petitcompiler'!
-
-firstCharParser
- ^ parser firstCharParser not
-! !
-
!PPOptionalParser methodsFor:'*petitcompiler'!
asCompilerNode
@@ -331,14 +289,6 @@
!PPParser methodsFor:'*petitcompiler'!
-cached
- "Faster way of memoizing --- it ignores context information, therefore it is not suitable for context-sensitive rules"
-
- ^ PPCachingParser on: self
-! !
-
-!PPParser methodsFor:'*petitcompiler'!
-
compile
^ self compile: #PPGeneratedParser
! !
@@ -380,21 +330,6 @@
!PPParser methodsFor:'*petitcompiler'!
-first
- first ifNil: [
- first := self firstSet
- ].
- ^ first
-! !
-
-!PPParser methodsFor:'*petitcompiler'!
-
-first: firstSet
- first := firstSet
-! !
-
-!PPParser methodsFor:'*petitcompiler'!
-
firstSetSuchThat: block
^ self firstSetSuchThat: block into: (OrderedCollection new) openSet: IdentitySet new.
! !
@@ -520,15 +455,6 @@
^ super compileWith: aPetitCompiler.
! !
-!PPPossessiveRepeatingParser methodsFor:'*petitcompiler'!
-
-optimized
- ^ (PPFastPossessiveRepeatingParser on: parser)
- setMin: min;
- setMax: max;
- yourself
-! !
-
!PPPredicateObjectParser methodsFor:'*petitcompiler'!
asCompilerNode
@@ -549,12 +475,6 @@
!PPPredicateObjectParser methodsFor:'*petitcompiler'!
-firstCharParser
- ^ self
-! !
-
-!PPPredicateObjectParser methodsFor:'*petitcompiler'!
-
firstCharSet
^ predicate
! !
@@ -577,17 +497,6 @@
!PPSequenceParser methodsFor:'*petitcompiler'!
-checkFirst: context
- first isEmpty ifTrue: [ ^ true ].
-
- first do: [ :elem |
- (context matchToken: elem id) ifTrue: [ ^ true ].
- ].
- ^ false
-! !
-
-!PPSequenceParser methodsFor:'*petitcompiler'!
-
compileWith: aPetitCompiler
^ aPetitCompiler compileSequence: self.
! !
@@ -607,12 +516,6 @@
^ aCollection
! !
-!PPSequenceParser methodsFor:'*petitcompiler'!
-
-optimized
- ^ PPFastSequenceParser withAll: parsers
-! !
-
!PPSmalltalkGrammar methodsFor:'*petitcompiler'!
comment
@@ -635,21 +538,6 @@
^ #space asParser plus
! !
-!PPSmalltalkGrammar methodsFor:'*petitcompiler'!
-
-whitespaceOld
- ^ #space asParser plus
-! !
-
-!PPSmalltalkGrammar methodsFor:'*petitcompiler'!
-
-whitespaceX
- whitespace ifNil: [
- whitespace := PPSmalltalkWhitespaceParser new
- ].
- ^ whitespace
-! !
-
!PPSmalltalkTokenParser methodsFor:'*petitcompiler'!
compileWith: aPetitCompiler
@@ -710,12 +598,6 @@
!PPSmalltalkWhitespaceParser methodsFor:'*petitcompiler'!
-firstCharParser
- ^ PPFailingParser new
-! !
-
-!PPSmalltalkWhitespaceParser methodsFor:'*petitcompiler'!
-
firstCharSet
^ PPCharSetPredicate on: [:e | false ]
! !
@@ -771,15 +653,6 @@
!PPTokenParser methodsFor:'*petitcompiler'!
-id
- id ifNil: [
- id := ('TOK[', parser id, ']') asSymbol
- ].
- ^ id
-! !
-
-!PPTokenParser methodsFor:'*petitcompiler'!
-
isFirstSetTerminal
^ false
! !
@@ -792,30 +665,12 @@
!PPTokenParser methodsFor:'*petitcompiler'!
-isUnique
- unique ifNil: [
- unique := parser firstSet size = 1 and: [ (parser firstSet anyOne isKindOf: PPLiteralParser) ]
- ].
- ^ unique
-! !
-
-!PPTokenParser methodsFor:'*petitcompiler'!
-
optimize
^ self transform: [ :each | each optimized ]
! !
!PPTokenParser methodsFor:'*petitcompiler'!
-parseOnX: aPPContext
- (aPPContext matchToken: self id) ifTrue: [
- ^ aPPContext nextToken: self id.
- ].
- ^ PPFailure message: self id, ' not found' context: aPPContext.
-! !
-
-!PPTokenParser methodsFor:'*petitcompiler'!
-
parser
^ parser
! !