--- a/Make.proto Mon Aug 17 12:13:16 2015 +0100
+++ b/Make.proto Mon Aug 17 12:56:02 2015 +0100
@@ -21,7 +21,7 @@
INCLUDE_TOP=$(TOP)/..
# subdirectories where targets are to be made:
-SUBDIRS= analyzer tests
+SUBDIRS= analyzer tests parsers/smalltalk parsers/java compiler
# subdirectories where Makefiles are to be made:
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/monticello -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libscm/mercurial/monticello
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2
# if you need any additional defines for embedded C code,
@@ -74,7 +74,8 @@
Class tryLocalSourceFirst: true. \
Smalltalk packagePath add:'$(TOP)/..' . \
Smalltalk loadPackage:'stx:goodies/petitparser'. \
- (Smalltalk at: #'stx_goodies_petitparser') exportAsMczTo: 'mc'."
+ (Smalltalk at: #'stx_goodies_petitparser') monticelloExportTo: 'mc'.\
+ Smalltalk exit:0"
--- a/PPParser.st Mon Aug 17 12:13:16 2015 +0100
+++ b/PPParser.st Mon Aug 17 12:56:02 2015 +0100
@@ -171,6 +171,32 @@
initialize
! !
+!PPParser methodsFor:'inspecting'!
+
+inspector2TabTree
+ <inspector2Tab>
+
+ ^ (self newInspector2Tab)
+ label:'Tree';
+ priority:50;
+ view: [
+ | list view |
+
+ list := PluggableHierarchicalList new.
+ list childBlock: [ :parent | parent children ].
+ list labelBlock: [ :child | child printString ].
+ list root: self.
+ view := ScrollableView for:HierarchicalListView.
+ view useDefaultIcons: false.
+ view list: list.
+ view
+ ];
+ yourself
+
+ "Modified: / 22-05-2015 / 17:05:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 31-07-2015 / 09:34:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!PPParser methodsFor:'operations'!
, aParser
@@ -654,6 +680,11 @@
^ '$Header: /cvs/stx/stx/goodies/petitparser/PPParser.st,v 1.7 2014-03-04 23:58:41 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id: PPParser.st,v 1.7 2014-03-04 23:58:41 cg Exp $'
! !
--- a/bc.mak Mon Aug 17 12:13:16 2015 +0100
+++ b/bc.mak Mon Aug 17 12:56:02 2015 +0100
@@ -35,7 +35,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\monticello -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libscm\mercurial\monticello
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
--- a/bmake.bat Mon Aug 17 12:13:16 2015 +0100
+++ b/bmake.bat Mon Aug 17 12:56:02 2015 +0100
@@ -21,4 +21,25 @@
@call bmake %1 %2 || exit /b "%errorlevel%"
@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
+@echo "***********************************"
+@pushd parsers\smalltalk
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/java
+@echo "***********************************"
+@pushd parsers\java
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+
--- a/compiler/Make.proto Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/Make.proto Mon Aug 17 12:56:02 2015 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/goodies/petitparser/analyzer -I$(INCLUDE_TOP)/stx/goodies/petitparser/parsers/java -I$(INCLUDE_TOP)/stx/goodies/petitparser/parsers/smalltalk -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/goodies/petitparser/analyzer -I$(INCLUDE_TOP)/stx/goodies/petitparser/parsers/java -I$(INCLUDE_TOP)/stx/goodies/petitparser/parsers/smalltalk -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libwidg2
# if you need any additional defines for embedded C code,
--- a/compiler/PEGFsa.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PEGFsa.st Mon Aug 17 12:56:02 2015 +0100
@@ -166,7 +166,7 @@
^ openSet
!
-epsilonDestinationsFrom: state openSet: openSet.
+epsilonDestinationsFrom: state openSet: openSet
(openSet includes: state) ifTrue: [
^ self
].
--- a/compiler/PEGFsaState.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PEGFsaState.st Mon Aug 17 12:56:02 2015 +0100
@@ -467,7 +467,7 @@
self joinInfo: state into: newState.
!
-joinTransitions: state into: newState.
+joinTransitions: state into: newState
newState isMultivalue ifTrue: [
newState transitions addAll: (self transitions collect: #copy).
newState transitions addAll: (state transitions collect: #copy).
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/compiler/PPCASTUtilitiesTests.st Mon Aug 17 12:56:02 2015 +0100
@@ -0,0 +1,117 @@
+"{ Package: 'stx:goodies/petitparser/compiler' }"
+
+"{ NameSpace: Smalltalk }"
+
+TestCase subclass:#PPCASTUtilitiesTests
+ instanceVariableNames:''
+ classVariableNames:'SomeClassVariable'
+ poolDictionaries:''
+ category:'PetitCompiler-Tests-Support'
+!
+
+!PPCASTUtilitiesTests methodsFor:'methods under test'!
+
+methodSimple1
+ ^ 1
+
+ "Created: / 27-07-2015 / 13:27:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithArguments: arg1
+ (arg1 + 4) yourself isOdd ifTrue:[
+ ^ true
+ ].
+ ^ false not.
+
+ "Created: / 27-07-2015 / 13:35:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithClassReference
+ ^ PPCASTUtilities new
+
+ "Created: / 27-07-2015 / 13:28:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithClassVariableReference
+ ^ SomeClassVariable
+
+ "Created: / 27-07-2015 / 14:02:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithInstanceVariableReference
+ ^ testSelector
+
+ "Created: / 27-07-2015 / 13:29:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithSelfSend1
+ ^ self methodSimple1
+
+ "Created: / 27-07-2015 / 13:28:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithSelfSend2
+ ^ self methodWithSelfSend1
+
+ "Created: / 27-07-2015 / 13:34:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithSelfSend3
+ ^ self methodWithInstanceVariableReference
+
+ "Created: / 27-07-2015 / 14:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithSuperSend
+ ^ super yourself
+
+ "Created: / 27-07-2015 / 14:02:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodWithTemporaries
+ | tmp1 |
+
+ tmp1 := 3.
+ (tmp1 + 4) yourself isOdd ifTrue:[
+ | tmp2 |
+
+ tmp2 := tmp1 + 1.
+ ^ tmp1 + tmp2.
+ ].
+ ^ tmp1
+
+ "Created: / 27-07-2015 / 13:33:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!PPCASTUtilitiesTests methodsFor:'tests'!
+
+test_checkNodeIsFunctional_1
+ self shouldnt: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodSimple1) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self shouldnt: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithSelfSend1) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self shouldnt: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithSelfSend2) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self shouldnt: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithClassReference) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self shouldnt: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithTemporaries) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self shouldnt: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithArguments:) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+
+ "Created: / 27-07-2015 / 14:00:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_checkNodeIsFunctional_2
+ self should: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithInstanceVariableReference) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self should: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithClassVariableReference) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self should: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithSelfSend3) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+ self should: [ PPCASTUtilities new checkNodeIsFunctional: (self class >> #methodWithSuperSend) parseTree inClass: self class ]
+ raise: PPCCompilationError.
+
+ "Created: / 27-07-2015 / 14:00:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
--- a/compiler/PPCClassBuilder.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCClassBuilder.st Mon Aug 17 12:56:02 2015 +0100
@@ -124,6 +124,8 @@
compiledClass compileSilently: method source classified: method category.
]
]
+
+ "Modified: / 24-07-2015 / 19:45:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
installVariables
--- a/compiler/PPCCodeBlock.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCCodeBlock.st Mon Aug 17 12:56:02 2015 +0100
@@ -131,30 +131,6 @@
!PPCCodeBlock methodsFor:'printing and storing'!
-codeOn: aStream
- "Dumps generated code on given stream"
-
- temporaries notEmpty ifTrue:[
- ((Smalltalk respondsTo:#isSmalltalkX) and:[ Smalltalk isSmalltalkX ]) ifTrue:[
- indentation * 4 timesRepeat: [ aStream nextPut: Character space ].
- ] ifFalse:[
- indentation timesRepeat: [ aStream nextPut: Character tab ].
- ].
- aStream nextPut: $|.
- temporaries do:[:e | aStream space; nextPutAll: e ].
- aStream space.
- aStream nextPut: $|.
- self nl.
- "In Smalltalk/X, there should be a blank line after temporaries"
- ((Smalltalk respondsTo:#isSmalltalkX) and:[ Smalltalk isSmalltalkX ]) ifTrue:[
- self nl.
- ].
- ].
- aStream nextPutAll: buffer contents
-
- "Created: / 01-06-2015 / 21:26:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
sourceOn:aStream
"Dumps generated code on given stream"
--- a/compiler/PPCCodeGenerator.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCCodeGenerator.st Mon Aug 17 12:56:02 2015 +0100
@@ -244,23 +244,6 @@
]
"Created: / 27-07-2015 / 14:50:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-withAllVariableNodesOf: anRBProgramNode do: aBlock
- "Enumerate all chilren of `anRBProgramNode` (including itself)
- and evaluate `aBlock` for each variable node.
- This is a replacement for Smalltalk/X's RBProgramNode>>variableNodesDo:
- which is not present in Pharo"
-
- anRBProgramNode isVariable ifTrue:[
- aBlock value: anRBProgramNode.
- ^ self.
- ].
- anRBProgramNode children do:[:each |
- self withAllVariableNodesOf: each do: aBlock
- ].
-
- "Created: / 18-06-2015 / 22:02:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!PPCCodeGenerator methodsFor:'support'!
--- a/compiler/PPCInliningVisitor.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCInliningVisitor.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Visitors'
!
+
!PPCInliningVisitor methodsFor:'initialization'!
initialize
@@ -137,3 +138,10 @@
^ node
! !
+!PPCInliningVisitor class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCLiteralNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCLiteralNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Nodes'
!
+
!PPCLiteralNode methodsFor:'comparing'!
recognizedSentencesPrim
@@ -28,3 +29,10 @@
^ visitor visitLiteralNode: self
! !
+!PPCLiteralNode class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCMappedActionNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCMappedActionNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Nodes'
!
+
!PPCMappedActionNode methodsFor:'visiting'!
accept: visitor
@@ -17,3 +18,10 @@
"Created: / 02-06-2015 / 17:27:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!PPCMappedActionNode class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Nodes'
!
+
!PPCNode class methodsFor:'as yet unclassified'!
new
@@ -475,6 +476,32 @@
shouldExpandToLevel: 6
! !
+!PPCNode methodsFor:'inspecting'!
+
+inspector2TabTree
+ <inspector2Tab>
+
+ ^ (self newInspector2Tab)
+ label:'Tree';
+ priority:50;
+ view: [
+ | list view |
+
+ list := PluggableHierarchicalList new.
+ list childBlock: [ :parent | parent children ].
+ list labelBlock: [ :child | child printString ].
+ list root: self.
+ view := ScrollableView for:HierarchicalListView.
+ view useDefaultIcons: false.
+ view list: list.
+ view
+ ];
+ yourself
+
+ "Modified: / 22-05-2015 / 17:05:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 18-06-2015 / 06:04:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!PPCNode methodsFor:'printing'!
printHashOn: aStream
@@ -578,3 +605,10 @@
visitor visitNode: self
! !
+!PPCNode class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCScannerCodeGenerator.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCScannerCodeGenerator.st Mon Aug 17 12:56:02 2015 +0100
@@ -207,7 +207,7 @@
^ self generateStandardFor: state
!
-generateForSingleTransition: t from: state.
+generateForSingleTransition: t from: state
(self isJoinPoint: t destination) ifTrue: [ self removeJoinTransition: t ].
@@ -234,7 +234,7 @@
].
].
"
- codeGen codeAssertPeek: t ifTrue: [.
+ codeGen codeAssertPeek: t ifTrue: [
self generateFor: t destination.
].
codeGen codeIfFalse.
@@ -275,7 +275,7 @@
self generateStopMethod: state.
!
-generateStartMethod: state.
+generateStartMethod: state
id := codeGen idFor: state.
codeGen codeComment: 'START - Generated from state: ', state asString.
--- a/compiler/PPCSequenceNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCSequenceNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Nodes'
!
+
!PPCSequenceNode methodsFor:'accessing'!
defaultName
@@ -185,3 +186,10 @@
^ visitor visitSequenceNode: self
! !
+!PPCSequenceNode class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCSpecializingVisitor.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCSpecializingVisitor.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Visitors'
!
+
!PPCSpecializingVisitor methodsFor:'visiting'!
visitActionNode: node
@@ -211,3 +212,10 @@
"Modified: / 21-05-2015 / 14:41:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!PPCSpecializingVisitor class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCStarCharSetPredicateNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCStarCharSetPredicateNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Nodes'
!
+
!PPCStarCharSetPredicateNode methodsFor:'accessing'!
extendClassification: classification
@@ -46,3 +47,10 @@
^ visitor visitStarCharSetPredicateNode: self
! !
+!PPCStarCharSetPredicateNode class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCTokenizingCodeGenerator.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCTokenizingCodeGenerator.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Visitors'
!
+
!PPCTokenizingCodeGenerator methodsFor:'accessing'!
guards
@@ -222,3 +223,10 @@
self error: 'should not happen!!'
! !
+!PPCTokenizingCodeGenerator class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCTokenizingConfiguration.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCTokenizingConfiguration.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Core'
!
+
!PPCTokenizingConfiguration methodsFor:'compiling'!
buildClass: compiler
@@ -90,3 +91,10 @@
self remember: #tokenize
! !
+!PPCTokenizingConfiguration class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCTokenizingVisitor.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/PPCTokenizingVisitor.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Visitors'
!
+
!PPCTokenizingVisitor methodsFor:'hooks'!
afterAccept: node retval: parserNode
@@ -132,3 +133,10 @@
yourself.
! !
+!PPCTokenizingVisitor class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/abbrev.stc Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/abbrev.stc Mon Aug 17 12:56:02 2015 +0100
@@ -124,3 +124,4 @@
PPCMappedActionNode PPCMappedActionNode stx:goodies/petitparser/compiler 'PetitCompiler-Nodes' 0
PPCTokenStarMessagePredicateNode PPCTokenStarMessagePredicateNode stx:goodies/petitparser/compiler 'PetitCompiler-Nodes' 0
PPCTokenStarSeparatorNode PPCTokenStarSeparatorNode stx:goodies/petitparser/compiler 'PetitCompiler-Nodes' 0
+PPCASTUtilitiesTests PPCASTUtilitiesTests stx:goodies/petitparser/compiler 'PetitCompiler-Tests-Support' 1
--- a/compiler/bc.mak Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/bc.mak Mon Aug 17 12:56:02 2015 +0100
@@ -35,7 +35,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\goodies\petitparser\analyzer -I$(INCLUDE_TOP)\stx\goodies\petitparser\parsers\java -I$(INCLUDE_TOP)\stx\goodies\petitparser\parsers\smalltalk -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libview
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\goodies\petitparser\analyzer -I$(INCLUDE_TOP)\stx\goodies\petitparser\parsers\java -I$(INCLUDE_TOP)\stx\goodies\petitparser\parsers\smalltalk -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
--- a/compiler/benchmarks/PPCBenchmark.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/benchmarks/PPCBenchmark.st Mon Aug 17 12:56:02 2015 +0100
@@ -696,6 +696,13 @@
teardownSmalltalkGrammarTokenized
parser class removeFromSystem.
+"
+ size := input inject: 0 into: [:r :e | r + e size ].
+ Transcript crShow: 'Compiled Grammar time: ', time asString.
+ Transcript crShow: 'Time per character: ', (time / size * 1000.0) asString, ' microseconds'.
+"
+
+ "Created: / 11-05-2015 / 16:33:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
teardownSmalltalkNoopParserCompiled
--- a/compiler/benchmarks/PPCSmalltalkNoopParser.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/benchmarks/PPCSmalltalkNoopParser.st Mon Aug 17 12:56:02 2015 +0100
@@ -12,21 +12,21 @@
!PPCSmalltalkNoopParser methodsFor:'accessing'!
startExpression
- "Make the sequence node has a method node as its parent and that the source is set."
+ "Make the sequence node has a method node as its parent and that the source is set."
- ^ ([ :stream | stream collection ] asParser and , super startExpression) map: [ :source :node |
- (RBMethodNode selector: #doIt body: node)
- source: source.
- (node statements size = 1 and: [ node temporaries isEmpty ])
- ifTrue: [ node statements first ]
- ifFalse: [ node ] ]
+ ^ ([ :stream | stream collection ] asParser and , super startExpression) map: [ :source :node |
+ (RBMethodNode selector: #doIt body: node)
+ source: source.
+ (node statements size = 1 and: [ node temporaries isEmpty ])
+ ifTrue: [ node statements first ]
+ ifFalse: [ node ] ]
!
startMethod
- "Make sure the method node has the source code properly set."
-
- ^ ([ :stream | stream collection ] asParser and , super startMethod)
- map: [ :source :node | node source: source ]
+ "Make sure the method node has the source code properly set."
+
+ ^ ([ :stream | stream collection ] asParser and , super startMethod)
+ map: [ :source :node | node source: source ]
! !
!PPCSmalltalkNoopParser methodsFor:'grammar'!
@@ -100,7 +100,7 @@
!
blockArgument
- ^ super blockArgument ==> #second
+ ^ super blockArgument ==> #second
!
blockBody
@@ -213,107 +213,107 @@
!PPCSmalltalkNoopParser methodsFor:'private'!
addStatements: aCollection into: aNode
- aCollection isNil
- ifTrue: [ ^ aNode ].
- aCollection do: [ :each |
- each class == PPSmalltalkToken
- ifFalse: [ aNode addNode: each ]
- ifTrue: [
- aNode statements isEmpty
- ifTrue: [ aNode addComments: each comments ]
- ifFalse: [ aNode statements last addComments: each comments ].
- aNode periods: (aNode periods asOrderedCollection
- addLast: each start;
- yourself) ] ].
- ^ aNode
+ aCollection isNil
+ ifTrue: [ ^ aNode ].
+ aCollection do: [ :each |
+ each class == PPSmalltalkToken
+ ifFalse: [ aNode addNode: each ]
+ ifTrue: [
+ aNode statements isEmpty
+ ifTrue: [ aNode addComments: each comments ]
+ ifFalse: [ aNode statements last addComments: each comments ].
+ aNode periods: (aNode periods asOrderedCollection
+ addLast: each start;
+ yourself) ] ].
+ ^ aNode
!
build: aNode assignment: anArray
- ^ anArray isEmpty
- ifTrue: [ aNode ]
- ifFalse: [
- anArray reverse
- inject: aNode
- into: [ :result :each |
- RBAssignmentNode
- variable: each first
- value: result
- position: each second start ] ]
+ ^ anArray isEmpty
+ ifTrue: [ aNode ]
+ ifFalse: [
+ anArray reverse
+ inject: aNode
+ into: [ :result :each |
+ RBAssignmentNode
+ variable: each first
+ value: result
+ position: each second start ] ]
!
build: aNode cascade: anArray
- | messages semicolons |
- ^ (anArray isNil or: [ anArray isEmpty ])
- ifTrue: [ aNode ]
- ifFalse: [
- messages := OrderedCollection new: anArray size + 1.
- messages addLast: aNode.
- semicolons := OrderedCollection new.
- anArray do: [ :each |
- messages addLast: (self
- build: aNode receiver
- messages: (Array with: each second)).
- semicolons addLast: each first start ].
- RBCascadeNode messages: messages semicolons: semicolons ]
+ | messages semicolons |
+ ^ (anArray isNil or: [ anArray isEmpty ])
+ ifTrue: [ aNode ]
+ ifFalse: [
+ messages := OrderedCollection new: anArray size + 1.
+ messages addLast: aNode.
+ semicolons := OrderedCollection new.
+ anArray do: [ :each |
+ messages addLast: (self
+ build: aNode receiver
+ messages: (Array with: each second)).
+ semicolons addLast: each first start ].
+ RBCascadeNode messages: messages semicolons: semicolons ]
!
build: aNode messages: anArray
- ^ (anArray isNil or: [ anArray isEmpty ])
- ifTrue: [ aNode ]
- ifFalse: [
- anArray
- inject: aNode
- into: [ :rec :msg |
- msg isNil
- ifTrue: [ rec ]
- ifFalse: [
- RBMessageNode
- receiver: rec
- selectorParts: msg first
- arguments: msg second ] ] ]
+ ^ (anArray isNil or: [ anArray isEmpty ])
+ ifTrue: [ aNode ]
+ ifFalse: [
+ anArray
+ inject: aNode
+ into: [ :rec :msg |
+ msg isNil
+ ifTrue: [ rec ]
+ ifFalse: [
+ RBMessageNode
+ receiver: rec
+ selectorParts: msg first
+ arguments: msg second ] ] ]
!
build: aTempCollection sequence: aStatementCollection
- | result |
- result := self
- addStatements: aStatementCollection
- into: RBSequenceNode new.
- aTempCollection isEmpty ifFalse: [
- result
- leftBar: aTempCollection first start
- temporaries: aTempCollection second
- rightBar: aTempCollection last start ].
- ^ result
+ | result |
+ result := self
+ addStatements: aStatementCollection
+ into: RBSequenceNode new.
+ aTempCollection isEmpty ifFalse: [
+ result
+ leftBar: aTempCollection first start
+ temporaries: aTempCollection second
+ rightBar: aTempCollection last start ].
+ ^ result
!
buildArray: aStatementCollection
- ^ self addStatements: aStatementCollection into: RBArrayNode new
+ ^ self addStatements: aStatementCollection into: RBArrayNode new
!
buildMethod: aMethodNode
- aMethodNode selectorParts
- do: [ :each | aMethodNode addComments: each comments ].
- aMethodNode arguments
- do: [ :each | aMethodNode addComments: each token comments ].
- aMethodNode pragmas do: [ :pragma |
- aMethodNode addComments: pragma comments.
- pragma selectorParts
- do: [ :each | aMethodNode addComments: each comments ].
- pragma arguments do: [ :each |
- each isLiteralArray
- ifFalse: [ aMethodNode addComments: each token comments ] ].
- pragma comments: nil ].
- ^ aMethodNode
+ aMethodNode selectorParts
+ do: [ :each | aMethodNode addComments: each comments ].
+ aMethodNode arguments
+ do: [ :each | aMethodNode addComments: each token comments ].
+ aMethodNode pragmas do: [ :pragma |
+ aMethodNode addComments: pragma comments.
+ pragma selectorParts
+ do: [ :each | aMethodNode addComments: each comments ].
+ pragma arguments do: [ :each |
+ each isLiteralArray
+ ifFalse: [ aMethodNode addComments: each token comments ] ].
+ pragma comments: nil ].
+ ^ aMethodNode
!
buildString: aString
- (aString isEmpty or: [ aString first ~= $' or: [ aString last ~= $' ] ])
- ifTrue: [ ^ aString ].
- ^ (aString
- copyFrom: 2
- to: aString size - 1)
- copyReplaceAll: ''''''
- with: ''''
+ (aString isEmpty or: [ aString first ~= $' or: [ aString last ~= $' ] ])
+ ifTrue: [ ^ aString ].
+ ^ (aString
+ copyFrom: 2
+ to: aString size - 1)
+ copyReplaceAll: ''''''
+ with: ''''
! !
!PPCSmalltalkNoopParser methodsFor:'token'!
--- a/compiler/benchmarks/stx_goodies_petitparser_compiler_benchmarks.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/benchmarks/stx_goodies_petitparser_compiler_benchmarks.st Mon Aug 17 12:56:02 2015 +0100
@@ -44,7 +44,10 @@
my classes is considered to be a prerequisite package."
^ #(
+
)
+
+ "Modified: / 16-05-2015 / 19:19:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
mandatoryPreRequisites
--- a/compiler/extensions.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/extensions.st Mon Aug 17 12:56:02 2015 +0100
@@ -863,8 +863,14 @@
!RBLiteralValueNode methodsFor:'*petitcompiler'!
isLiteralNumber
- [(NumberParser on: sourceText ) nextNumber] on: Exception do: [ ^ false ].
- ^ true
+ ((Smalltalk respondsTo: #isSmalltalk/X) and: [Smalltalk isSmalltalkX]) ifTrue:[
+ ^super isLiteralNumber
+ ] ifFalse:[
+ "Assume Pharo..."
+ [(NumberParser on: self sourceText ) nextNumber] on: Exception do: [ ^ false ].
+ ^ true
+ ].
+
! !
!RBProgramNode methodsFor:'*petitcompiler'!
--- a/compiler/stx_goodies_petitparser_compiler.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/stx_goodies_petitparser_compiler.st Mon Aug 17 12:56:02 2015 +0100
@@ -59,8 +59,8 @@
#'stx:goodies/petitparser' "PPActionParser - extended"
#'stx:goodies/petitparser/parsers/java' "PPJavaWhitespaceParser - extended"
#'stx:goodies/petitparser/parsers/smalltalk' "PPSmalltalkGrammar - extended"
+ #'stx:libbasic' "Autoload - superclass of PPCASTUtilitiesTests"
#'stx:goodies/refactoryBrowser/parser' "RBLiteralNode - extended"
- #'stx:libbasic' "Character - extended"
)
!
@@ -78,6 +78,8 @@
#'stx:goodies/petitparser/analyzer' "PPSentinel - referenced by PPCompiledParser class>>referringParser"
#'stx:libbasic2' "IdentityBag - referenced by PEGFsa>>checkTransitionsIdentity"
#'stx:libview' "Color - referenced by PEGFsa>>viewGraphOn:"
+ #'stx:libwidg' "ScrollableView - referenced by PPCNode>>inspector2TabTree"
+ #'stx:libwidg2' "HierarchicalListView - referenced by PPCNode>>inspector2TabTree"
)
!
@@ -232,6 +234,7 @@
PPCMappedActionNode
PPCTokenStarMessagePredicateNode
PPCTokenStarSeparatorNode
+ (PPCASTUtilitiesTests autoload)
)
!
@@ -346,6 +349,8 @@
PPParser allNodesDo:seen:
PPSmalltalkWhitespaceParser hash
PPParser compileTokenizing
+ PPCompositeParser asCompilerNode
+ PPSequenceParser map:
Object canHavePPCId
PPCompositeParser asCompilerNode
PPSequenceParser map:
--- a/compiler/tests/PPCCodeGeneratorTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/PPCCodeGeneratorTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -10,6 +10,7 @@
category:'PetitCompiler-Tests-Visitors'
!
+
!PPCCodeGeneratorTest methodsFor:'as yet unclassified'!
context
@@ -1130,3 +1131,10 @@
"Created: / 27-07-2015 / 15:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!PPCCodeGeneratorTest class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/PPCInliningVisitorTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/PPCInliningVisitorTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Tests-Visitors'
!
+
!PPCInliningVisitorTest methodsFor:'as yet unclassified'!
assert: object type: class
@@ -171,3 +172,10 @@
self assert: result child child type: PPCNilNode.
! !
+!PPCInliningVisitorTest class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/PPCLL1VisitorTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/PPCLL1VisitorTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Tests-Visitors'
!
+
!PPCLL1VisitorTest methodsFor:'as yet unclassified'!
setUp
@@ -139,3 +140,10 @@
! !
+!PPCLL1VisitorTest class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/PPCSpecializingVisitorTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/PPCSpecializingVisitorTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Tests-Visitors'
!
+
!PPCSpecializingVisitorTest methodsFor:'as yet unclassified'!
asNode: aPPParser
@@ -259,3 +260,10 @@
self assert: result child literal = 'foo'.
! !
+!PPCSpecializingVisitorTest class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/PPCTokenizingTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/PPCTokenizingTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -31,6 +31,8 @@
scannerClass notNil ifTrue:[
scannerClass removeFromSystem
].
+
+ "Modified: / 24-07-2015 / 19:50:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
context
--- a/compiler/tests/PPCUniversalTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/PPCUniversalTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -10,6 +10,7 @@
category:'PetitCompiler-Tests-Core-Universal'
!
+
!PPCUniversalTest methodsFor:'context'!
context
@@ -579,3 +580,10 @@
yourself.
! !
+!PPCUniversalTest class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/extras/Make.proto Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/Make.proto Mon Aug 17 12:56:02 2015 +0100
@@ -131,13 +131,15 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)PPCLRPNode.$(O) PPCLRPNode.$(H): PPCLRPNode.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPParser.$(O) PPCLRPParser.$(H): PPCLRPParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PPExpressionGrammar.$(O) PPExpressionGrammar.$(H): PPExpressionGrammar.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PPLL1ExpressionGrammar.$(O) PPLL1ExpressionGrammar.$(H): PPLL1ExpressionGrammar.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_goodies_petitparser_compiler_tests_extras.$(O) stx_goodies_petitparser_compiler_tests_extras.$(H): stx_goodies_petitparser_compiler_tests_extras.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPParserSmokeTest.$(O) PPCLRPParserSmokeTest.$(H): PPCLRPParserSmokeTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPCompositeParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPSourcesResource.$(O) PPCLRPSourcesResource.$(H): PPCLRPSourcesResource.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestResource.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPAction.$(O) PPCLRPAction.$(H): PPCLRPAction.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPCompiledParserSmokeTest.$(O) PPCLRPCompiledParserSmokeTest.$(H): PPCLRPCompiledParserSmokeTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPCompositeParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPContainedElement.$(O) PPCLRPContainedElement.$(H): PPCLRPContainedElement.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPSpawn.$(O) PPCLRPSpawn.$(H): PPCLRPSpawn.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPComment.$(O) PPCLRPComment.$(H): PPCLRPComment.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPContainedElement.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPCompiledParserSmokeTest_Tokenized.$(O) PPCLRPCompiledParserSmokeTest_Tokenized.$(H): PPCLRPCompiledParserSmokeTest_Tokenized.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPCompositeParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPCompiledParserSmokeTest_Universal.$(O) PPCLRPCompiledParserSmokeTest_Universal.$(H): PPCLRPCompiledParserSmokeTest_Universal.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPCompositeParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPErrorNode.$(O) PPCLRPErrorNode.$(H): PPCLRPErrorNode.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPContainedElement.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPEvent.$(O) PPCLRPEvent.$(H): PPCLRPEvent.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPContainedElement.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPMachine.$(O) PPCLRPMachine.$(H): PPCLRPMachine.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPContainedElement.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCLRPNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/compiler/tests/extras/Make.spec Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/Make.spec Mon Aug 17 12:56:02 2015 +0100
@@ -53,13 +53,15 @@
COMMON_CLASSES= \
PPCLRPNode \
PPCLRPParser \
- PPExpressionGrammar \
- PPLL1ExpressionGrammar \
- stx_goodies_petitparser_compiler_tests_extras \
+ PPCLRPParserSmokeTest \
+ PPCLRPSourcesResource \
PPCLRPAction \
+ PPCLRPCompiledParserSmokeTest \
PPCLRPContainedElement \
PPCLRPSpawn \
PPCLRPComment \
+ PPCLRPCompiledParserSmokeTest_Tokenized \
+ PPCLRPCompiledParserSmokeTest_Universal \
PPCLRPErrorNode \
PPCLRPEvent \
PPCLRPMachine \
@@ -79,13 +81,15 @@
COMMON_OBJS= \
$(OUTDIR_SLASH)PPCLRPNode.$(O) \
$(OUTDIR_SLASH)PPCLRPParser.$(O) \
- $(OUTDIR_SLASH)PPExpressionGrammar.$(O) \
- $(OUTDIR_SLASH)PPLL1ExpressionGrammar.$(O) \
- $(OUTDIR_SLASH)stx_goodies_petitparser_compiler_tests_extras.$(O) \
+ $(OUTDIR_SLASH)PPCLRPParserSmokeTest.$(O) \
+ $(OUTDIR_SLASH)PPCLRPSourcesResource.$(O) \
$(OUTDIR_SLASH)PPCLRPAction.$(O) \
+ $(OUTDIR_SLASH)PPCLRPCompiledParserSmokeTest.$(O) \
$(OUTDIR_SLASH)PPCLRPContainedElement.$(O) \
$(OUTDIR_SLASH)PPCLRPSpawn.$(O) \
$(OUTDIR_SLASH)PPCLRPComment.$(O) \
+ $(OUTDIR_SLASH)PPCLRPCompiledParserSmokeTest_Tokenized.$(O) \
+ $(OUTDIR_SLASH)PPCLRPCompiledParserSmokeTest_Universal.$(O) \
$(OUTDIR_SLASH)PPCLRPErrorNode.$(O) \
$(OUTDIR_SLASH)PPCLRPEvent.$(O) \
$(OUTDIR_SLASH)PPCLRPMachine.$(O) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/compiler/tests/extras/PPCLRPCompiledParserSmokeTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -0,0 +1,109 @@
+"{ Package: 'stx:goodies/petitparser/compiler/tests/extras' }"
+
+"{ NameSpace: Smalltalk }"
+
+PPCLRPParserSmokeTest subclass:#PPCLRPCompiledParserSmokeTest
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'PetitCompiler-Extras-Tests-LRP'
+!
+
+!PPCLRPCompiledParserSmokeTest class methodsFor:'resources'!
+
+resources
+ ^ Array with: (PPCSetUpBeforeTearDownAfterResource for: self)
+! !
+
+!PPCLRPCompiledParserSmokeTest class methodsFor:'testing'!
+
+isAbstract
+ ^ self == PPCLRPCompiledParserSmokeTest
+
+ "Modified: / 31-07-2015 / 07:53:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!PPCLRPCompiledParserSmokeTest methodsFor:'accessing'!
+
+compiledParser
+ ^ self compiledParserClass new
+
+ "Created: / 29-07-2015 / 17:00:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+compiledParserClass
+ ^ Smalltalk at: self compiledParserClassName
+
+ "Created: / 29-07-2015 / 16:54:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+compiledParserClassName
+ "Return the name of the compiled parser"
+
+ ^ (self petitParserClass name , 'C_' ,
+ "This is bit hacky!!"
+ ((self compilerConfiguration isKindOf: PPCTokenizingConfiguration) ifTrue:[ 'Tokenizing' ] ifFalse:[ 'Universal' ])) asSymbol
+
+ "Created: / 29-07-2015 / 16:54:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+compilerConfiguration
+ "Return configuration to use when compiling parser (as instance of PPCConfiguration)"
+
+ ^ self subclassResponsibility
+
+ "Created: / 29-07-2015 / 16:53:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+parserClass
+ ^ self compiledParserClass
+
+ "Modified: / 29-07-2015 / 18:43:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+parserInstanceFor: aSymbol
+ ^ self parserClass new startSymbol: aSymbol
+
+ "Modified: / 29-07-2015 / 18:43:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+petitParser
+ ^ self petitParserClass new
+
+ "Created: / 29-07-2015 / 17:01:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+petitParserClass
+ ^ PPCLRPParser
+! !
+
+!PPCLRPCompiledParserSmokeTest methodsFor:'context'!
+
+context
+
+ ^ PPCContext new
+! !
+
+!PPCLRPCompiledParserSmokeTest methodsFor:'setup & teardown'!
+
+setUpBefore
+ "Called before any of my tests is run (when resources are set up)"
+ | time configuration |
+
+ configuration := self compilerConfiguration.
+ configuration arguments parserName: self compiledParserClassName.
+ time := Time millisecondsToRun: [
+ self petitParser compileWithConfiguration: configuration.
+ ].
+ Transcript show: self petitParserClass name ; show:' compiled in: '; show: time asString; show: 'ms'; cr.
+
+ "Created: / 29-07-2015 / 16:29:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 29-07-2015 / 18:40:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+tearDownAfter
+ "Called after all my tests are ryn(when resources are torn down)"
+
+ "Created: / 29-07-2015 / 16:33:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/compiler/tests/extras/PPCLRPCompiledParserSmokeTest_Tokenized.st Mon Aug 17 12:56:02 2015 +0100
@@ -0,0 +1,17 @@
+"{ Package: 'stx:goodies/petitparser/compiler/tests/extras' }"
+
+"{ NameSpace: Smalltalk }"
+
+PPCLRPCompiledParserSmokeTest subclass:#PPCLRPCompiledParserSmokeTest_Tokenized
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'PetitCompiler-Extras-Tests-LRP'
+!
+
+!PPCLRPCompiledParserSmokeTest_Tokenized methodsFor:'accessing'!
+
+compilerConfiguration
+ ^ PPCConfiguration tokenizing
+! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/compiler/tests/extras/PPCLRPCompiledParserSmokeTest_Universal.st Mon Aug 17 12:56:02 2015 +0100
@@ -0,0 +1,17 @@
+"{ Package: 'stx:goodies/petitparser/compiler/tests/extras' }"
+
+"{ NameSpace: Smalltalk }"
+
+PPCLRPCompiledParserSmokeTest subclass:#PPCLRPCompiledParserSmokeTest_Universal
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'PetitCompiler-Extras-Tests-LRP'
+!
+
+!PPCLRPCompiledParserSmokeTest_Universal methodsFor:'accessing'!
+
+compilerConfiguration
+ ^ PPCConfiguration universal
+! !
+
--- a/compiler/tests/extras/PPCResources.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/PPCResources.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Extras-Tests-Support'
!
+
!PPCResources methodsFor:'expressions'!
expressionOfSize: size
@@ -62,7 +63,7 @@
expressionSourcesMedium
| sources |
-
+
cache at: #expressionSourcesMedium ifAbsentPut: [
sources := OrderedCollection new.
@@ -196,3 +197,10 @@
^ (self smalltalkInDirectory: '../smalltalk-src/') copyFrom: 1 to: 1000.
! !
+!PPCResources class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/extras/PPCompiledJavaSyntaxTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/PPCompiledJavaSyntaxTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Extras-Tests-Java'
!
+
!PPCompiledJavaSyntaxTest class methodsFor:'as yet unclassified'!
resources
@@ -571,3 +572,10 @@
rule: #methodDeclaration
! !
+!PPCompiledJavaSyntaxTest class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/extras/abbrev.stc Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/abbrev.stc Mon Aug 17 12:56:02 2015 +0100
@@ -24,8 +24,8 @@
PPCExpressionGrammarVerificationTest PPCExpressionGrammarVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
PPCLL1ExpressionGrammarTest PPCLL1ExpressionGrammarTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
PPCLRPAction PPCLRPAction stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
+PPCLRPCompiledParserSmokeTest PPCLRPCompiledParserSmokeTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
PPCLRPContainedElement PPCLRPContainedElement stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
-PPCLRPParserVerificationTest PPCLRPParserVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
PPCLRPSpawn PPCLRPSpawn stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
PPCSmalltalkGrammarTests_Tokenized PPCSmalltalkGrammarTests_Tokenized stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
PPCSmalltalkGrammarTests_Universal PPCSmalltalkGrammarTests_Universal stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
@@ -38,13 +38,13 @@
PPCLL1ExpressionGrammarTest_Tokenized PPCLL1ExpressionGrammarTest_Tokenized stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
PPCLL1ExpressionGrammarTest_Universal PPCLL1ExpressionGrammarTest_Universal stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
PPCLRPComment PPCLRPComment stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
+PPCLRPCompiledParserSmokeTest_Tokenized PPCLRPCompiledParserSmokeTest_Tokenized stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
+PPCLRPCompiledParserSmokeTest_Universal PPCLRPCompiledParserSmokeTest_Universal stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
PPCLRPErrorNode PPCLRPErrorNode stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
PPCLRPEvent PPCLRPEvent stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
PPCLRPMachine PPCLRPMachine stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
PPCLRPOnEntry PPCLRPOnEntry stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
PPCLRPOnExit PPCLRPOnExit stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
-PPCLRPParserVerificationTest_Tokenized PPCLRPParserVerificationTest_Tokenized stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
-PPCLRPParserVerificationTest_Universal PPCLRPParserVerificationTest_Universal stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 1
PPCLRPRunning PPCLRPRunning stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
PPCLRPState PPCLRPState stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
PPCLRPTransition PPCLRPTransition stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-LRP' 0
--- a/compiler/tests/extras/bc.mak Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/bc.mak Mon Aug 17 12:56:02 2015 +0100
@@ -78,13 +78,15 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)PPCLRPNode.$(O) PPCLRPNode.$(H): PPCLRPNode.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPParser.$(O) PPCLRPParser.$(H): PPCLRPParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)PPExpressionGrammar.$(O) PPExpressionGrammar.$(H): PPExpressionGrammar.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)PPLL1ExpressionGrammar.$(O) PPLL1ExpressionGrammar.$(H): PPLL1ExpressionGrammar.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)stx_goodies_petitparser_compiler_tests_extras.$(O) stx_goodies_petitparser_compiler_tests_extras.$(H): stx_goodies_petitparser_compiler_tests_extras.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPParserSmokeTest.$(O) PPCLRPParserSmokeTest.$(H): PPCLRPParserSmokeTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPCompositeParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPSourcesResource.$(O) PPCLRPSourcesResource.$(H): PPCLRPSourcesResource.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestResource.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPAction.$(O) PPCLRPAction.$(H): PPCLRPAction.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPCompiledParserSmokeTest.$(O) PPCLRPCompiledParserSmokeTest.$(H): PPCLRPCompiledParserSmokeTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPCompositeParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPContainedElement.$(O) PPCLRPContainedElement.$(H): PPCLRPContainedElement.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPSpawn.$(O) PPCLRPSpawn.$(H): PPCLRPSpawn.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPComment.$(O) PPCLRPComment.$(H): PPCLRPComment.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPContainedElement.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPCompiledParserSmokeTest_Tokenized.$(O) PPCLRPCompiledParserSmokeTest_Tokenized.$(H): PPCLRPCompiledParserSmokeTest_Tokenized.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPCompositeParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPCLRPCompiledParserSmokeTest_Universal.$(O) PPCLRPCompiledParserSmokeTest_Universal.$(H): PPCLRPCompiledParserSmokeTest_Universal.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPCompiledParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPParserSmokeTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPCompositeParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPErrorNode.$(O) PPCLRPErrorNode.$(H): PPCLRPErrorNode.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPContainedElement.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPEvent.$(O) PPCLRPEvent.$(H): PPCLRPEvent.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPContainedElement.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCLRPMachine.$(O) PPCLRPMachine.$(H): PPCLRPMachine.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPContainedElement.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCLRPNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/compiler/tests/extras/libInit.cc Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/libInit.cc Mon Aug 17 12:56:02 2015 +0100
@@ -29,13 +29,15 @@
__BEGIN_PACKAGE2__("libstx_goodies_petitparser_compiler_tests_extras", _libstx_goodies_petitparser_compiler_tests_extras_Init, "stx:goodies/petitparser/compiler/tests/extras");
_PPCLRPNode_Init(pass,__pRT__,snd);
_PPCLRPParser_Init(pass,__pRT__,snd);
-_PPExpressionGrammar_Init(pass,__pRT__,snd);
-_PPLL1ExpressionGrammar_Init(pass,__pRT__,snd);
-_stx_137goodies_137petitparser_137compiler_137tests_137extras_Init(pass,__pRT__,snd);
+_PPCLRPParserSmokeTest_Init(pass,__pRT__,snd);
+_PPCLRPSourcesResource_Init(pass,__pRT__,snd);
_PPCLRPAction_Init(pass,__pRT__,snd);
+_PPCLRPCompiledParserSmokeTest_Init(pass,__pRT__,snd);
_PPCLRPContainedElement_Init(pass,__pRT__,snd);
_PPCLRPSpawn_Init(pass,__pRT__,snd);
_PPCLRPComment_Init(pass,__pRT__,snd);
+_PPCLRPCompiledParserSmokeTest_137Tokenized_Init(pass,__pRT__,snd);
+_PPCLRPCompiledParserSmokeTest_137Universal_Init(pass,__pRT__,snd);
_PPCLRPErrorNode_Init(pass,__pRT__,snd);
_PPCLRPEvent_Init(pass,__pRT__,snd);
_PPCLRPMachine_Init(pass,__pRT__,snd);
--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st Mon Aug 17 12:13:16 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st Mon Aug 17 12:56:02 2015 +0100
@@ -10,6 +10,32 @@
!
+!stx_goodies_petitparser_compiler_tests_extras class methodsFor:'accessing'!
+
+additionalClassAttributesFor: aClass
+ "Answers additional set of class attributes for given class
+ Individual project definitions may override this method, but
+ overriding method should always merge its attributes with result
+ of 'super additionalClassAttributesFor: aClass'.
+
+ Here, we add #autoload attributes to all test cases and
+ test resources, as they are not neccessary for the package
+ and should not be compiled (because of unwanted dependency
+ on stx:goodies/sunit package)
+
+ But not make them autoloaded when the package is separate
+ test-package - by conventions such package should by named
+ #'module:package/subpackage/tests'
+ "
+ (TestCase notNil and:[aClass inheritsFrom: TestCase]) ifTrue:[^#()].
+ (TestResource notNil and:[aClass inheritsFrom: TestResource]) ifTrue:[^#()].
+
+
+ ^ super additionalClassAttributesFor: aClass
+
+ "Created: / 10-05-2015 / 14:17:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!stx_goodies_petitparser_compiler_tests_extras class methodsFor:'accessing - monticello'!
monticelloLastMergedVersionInfo
@@ -77,7 +103,7 @@
by searching all classes (and their packages) which are referenced by my classes."
^ #(
- #'stx:goodies/petitparser/compiler' "PPCArguments - referenced by PPCSmalltalkTests>>configuration"
+ #'stx:goodies/petitparser/compiler' "PPCArguments - referenced by PPCSmalltalkTests>>setUp"
#'stx:goodies/petitparser/parsers/smalltalk' "PPSmalltalkGrammar - referenced by PPCSmalltalkGrammarTests>>petitParserClass"
#'stx:libbasic2' "Random - referenced by PPCResources>>expressionOfSize:stream:"
)
@@ -108,8 +134,8 @@
(PPCCompositeParserTest autoload)
PPCLRPNode
PPCLRPParser
- (PPCLRPParserSmokeTest autoload)
- (PPCLRPSourcesResource autoload)
+ PPCLRPParserSmokeTest
+ PPCLRPSourcesResource
(PPCResources autoload)
(PPCSetUpBeforeTearDownAfterResource autoload)
(PPCSmalltalkGrammarTests autoload)
@@ -117,17 +143,17 @@
(PPCSmalltalkTests autoload)
(PPCompiledJavaResource autoload)
(PPCompiledJavaSyntaxTest autoload)
- PPExpressionGrammar
+ (PPExpressionGrammar autoload)
(PPExpressionGrammarTest autoload)
- PPLL1ExpressionGrammar
+ (PPLL1ExpressionGrammar autoload)
(PPLL1ExpressionGrammarTest autoload)
- #'stx_goodies_petitparser_compiler_tests_extras'
+ (#'stx_goodies_petitparser_compiler_tests_extras' autoload)
(PPCExpressionGrammarTest autoload)
(PPCExpressionGrammarVerificationTest autoload)
(PPCLL1ExpressionGrammarTest autoload)
PPCLRPAction
+ PPCLRPCompiledParserSmokeTest
PPCLRPContainedElement
- (PPCLRPParserVerificationTest autoload)
PPCLRPSpawn
(#'PPCSmalltalkGrammarTests_Tokenized' autoload)
(#'PPCSmalltalkGrammarTests_Universal' autoload)
@@ -140,13 +166,13 @@
(#'PPCLL1ExpressionGrammarTest_Tokenized' autoload)
(#'PPCLL1ExpressionGrammarTest_Universal' autoload)
PPCLRPComment
+ #'PPCLRPCompiledParserSmokeTest_Tokenized'
+ #'PPCLRPCompiledParserSmokeTest_Universal'
PPCLRPErrorNode
PPCLRPEvent
PPCLRPMachine
PPCLRPOnEntry
PPCLRPOnExit
- (#'PPCLRPParserVerificationTest_Tokenized' autoload)
- (#'PPCLRPParserVerificationTest_Universal' autoload)
PPCLRPRunning
PPCLRPState
PPCLRPTransition
--- a/islands/PPNonEmptyParser.st Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/PPNonEmptyParser.st Mon Aug 17 12:56:02 2015 +0100
@@ -12,6 +12,7 @@
PPNonEmptyParser comment:'I return failure, if the delegate parser did not consumed any input.'
!
+
!PPNonEmptyParser methodsFor:'parsing'!
parseOn: aPPContext
@@ -26,3 +27,10 @@
^ result
! !
+!PPNonEmptyParser class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/islands/abbrev.stc Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/abbrev.stc Mon Aug 17 12:56:02 2015 +0100
@@ -1,12 +1,12 @@
# automagically generated by the project definition
# this file is needed for stc to be able to compile modules independently.
# it provides information about a classes filename, category and especially namespace.
+JavaParser JavaParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
PPInputEnds PPInputEnds stx:goodies/petitparser/islands 'PetitIslands-Parsers' 0
PPIsland PPIsland stx:goodies/petitparser/islands 'PetitIslands-Parsers' 0
PPNonEmptyParser PPNonEmptyParser stx:goodies/petitparser/islands 'PetitIslands-Parsers' 0
PPWater PPWater stx:goodies/petitparser/islands 'PetitIslands-Parsers' 0
+XmlFeedParser XmlFeedParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
stx_goodies_petitparser_islands stx_goodies_petitparser_islands stx:goodies/petitparser/islands '* Projects & Packages *' 3
PPMemoizingIsland PPMemoizingIsland stx:goodies/petitparser/islands 'PetitIslands-Parsers' 0
-JavaParser JavaParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
RobustXmlFeedParser RobustXmlFeedParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
-XmlFeedParser XmlFeedParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
--- a/islands/stx_goodies_petitparser_islands.st Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/stx_goodies_petitparser_islands.st Mon Aug 17 12:56:02 2015 +0100
@@ -68,7 +68,7 @@
^ #(
#'stx:goodies/petitparser' "PPChoiceParser - extended"
- #'stx:libbasic' "Autoload - superclass of JavaParser"
+ #'stx:libbasic' "LibraryDefinition - superclass of stx_goodies_petitparser_islands"
)
!
@@ -107,15 +107,15 @@
^ #(
"<className> or (<className> attributes...) in load order"
+ (JavaParser autoload)
PPInputEnds
PPIsland
PPNonEmptyParser
PPWater
+ (XmlFeedParser autoload)
#'stx_goodies_petitparser_islands'
PPMemoizingIsland
- (JavaParser autoload)
(RobustXmlFeedParser autoload)
- (XmlFeedParser autoload)
)
!
--- a/islands/tests/FirstFollowNextTests.st Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/tests/FirstFollowNextTests.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitIslands-Tests'
!
+
!FirstFollowNextTests methodsFor:'support'!
assert: set allMatches: string
@@ -1055,3 +1056,10 @@
! !
+!FirstFollowNextTests class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/islands/tests/Make.proto Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/tests/Make.proto Mon Aug 17 12:56:02 2015 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/goodies/petitparser/islands -I$(INCLUDE_TOP)/stx/goodies/petitparser/tests -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
# if you need any additional defines for embedded C code,
@@ -102,6 +102,12 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
cd ../../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../tests && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/islands/tests/abbrev.stc Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/tests/abbrev.stc Mon Aug 17 12:56:02 2015 +0100
@@ -1,10 +1,10 @@
# automagically generated by the project definition
# this file is needed for stc to be able to compile modules independently.
# it provides information about a classes filename, category and especially namespace.
-stx_goodies_petitparser_islands_tests stx_goodies_petitparser_islands_tests stx:goodies/petitparser/islands/tests '* Projects & Packages *' 3
FirstFollowNextTests FirstFollowNextTests stx:goodies/petitparser/islands/tests 'PetitIslands-Tests' 1
JavaParserTest JavaParserTest stx:goodies/petitparser/islands/tests 'PetitIslands-Examples' 1
PPIslandTest PPIslandTest stx:goodies/petitparser/islands/tests 'PetitIslands-Tests' 1
-PPMemoizingIslandTest PPMemoizingIslandTest stx:goodies/petitparser/islands/tests 'PetitIslands-Tests' 1
RobustXmlFeedParserTest RobustXmlFeedParserTest stx:goodies/petitparser/islands/tests 'PetitIslands-Examples' 1
XmlFeedParserTest XmlFeedParserTest stx:goodies/petitparser/islands/tests 'PetitIslands-Examples' 1
+stx_goodies_petitparser_islands_tests stx_goodies_petitparser_islands_tests stx:goodies/petitparser/islands/tests '* Projects & Packages *' 3
+PPMemoizingIslandTest PPMemoizingIslandTest stx:goodies/petitparser/islands/tests 'PetitIslands-Tests' 1
--- a/islands/tests/bc.mak Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/tests/bc.mak Mon Aug 17 12:56:02 2015 +0100
@@ -35,7 +35,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\goodies\petitparser\islands -I$(INCLUDE_TOP)\stx\goodies\petitparser\tests -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -52,6 +52,12 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
pushd ..\..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\tests & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/islands/tests/stx_goodies_petitparser_islands_tests.st Mon Aug 17 12:13:16 2015 +0100
+++ b/islands/tests/stx_goodies_petitparser_islands_tests.st Mon Aug 17 12:56:02 2015 +0100
@@ -56,7 +56,9 @@
by searching along the inheritance chain of all of my classes."
^ #(
- #'stx:libbasic' "Autoload - superclass of FirstFollowNextTests"
+ #'stx:goodies/petitparser/tests' "PPAbstractParserTest - superclass of JavaParserTest"
+ #'stx:goodies/sunit' "TestAsserter - superclass of FirstFollowNextTests"
+ #'stx:libbasic' "LibraryDefinition - superclass of stx_goodies_petitparser_islands_tests"
)
!
@@ -71,6 +73,8 @@
by searching all classes (and their packages) which are referenced by my classes."
^ #(
+ #'stx:goodies/petitparser' "PPContext - referenced by JavaParserTest>>context"
+ #'stx:goodies/petitparser/islands' "JavaParser - referenced by JavaParserTest>>parserClass"
)
!
@@ -94,13 +98,13 @@
^ #(
"<className> or (<className> attributes...) in load order"
- #'stx_goodies_petitparser_islands_tests'
(FirstFollowNextTests autoload)
(JavaParserTest autoload)
(PPIslandTest autoload)
- (PPMemoizingIslandTest autoload)
(RobustXmlFeedParserTest autoload)
(XmlFeedParserTest autoload)
+ #'stx_goodies_petitparser_islands_tests'
+ (PPMemoizingIslandTest autoload)
)
!
--- a/lccmake.bat Mon Aug 17 12:13:16 2015 +0100
+++ b/lccmake.bat Mon Aug 17 12:56:02 2015 +0100
@@ -19,4 +19,25 @@
@call lccmake %1 %2 || exit /b "%errorlevel%"
@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
+@echo "***********************************"
+@pushd parsers\smalltalk
+@call lccmake %1 %2 || exit /b "%errorlevel%"
+@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/java
+@echo "***********************************"
+@pushd parsers\java
+@call lccmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call lccmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+
--- a/mingwmake.bat Mon Aug 17 12:13:16 2015 +0100
+++ b/mingwmake.bat Mon Aug 17 12:56:02 2015 +0100
@@ -24,4 +24,25 @@
@call mingwmake %1 %2 || exit /b "%errorlevel%"
@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
+@echo "***********************************"
+@pushd parsers\smalltalk
+@call mingwmake %1 %2 || exit /b "%errorlevel%"
+@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/java
+@echo "***********************************"
+@pushd parsers\java
+@call mingwmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call mingwmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+
--- a/parsers/java/Make.proto Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/Make.proto Mon Aug 17 12:56:02 2015 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/goodies/petitparser/tests -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/goodies/petitparser/tests -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
# if you need any additional defines for embedded C code,
--- a/parsers/java/PJEndOfLineCommentsNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/PJEndOfLineCommentsNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -23,7 +23,7 @@
!
printOn: aStream
- .^ aStream
+ ^ aStream
nextPutAll: 'EndOfLineComment value ==> ';
nextPutAll: self comment.
--- a/parsers/java/PJPackageDeclarationNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/PJPackageDeclarationNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitJava-AST'
!
+
!PJPackageDeclarationNode methodsFor:'accessing'!
nameNode
@@ -26,3 +27,10 @@
aVisitor visitPackageDeclarationNode: self
! !
+!PJPackageDeclarationNode class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/parsers/java/PJSyntaxNode.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/PJSyntaxNode.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,3 @@
category:'PetitJava-AST'
!
-PJSyntaxNode comment:''
-!
-
--- a/parsers/java/PPJavaLexicon.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/PPJavaLexicon.st Mon Aug 17 12:56:02 2015 +0100
@@ -1,1 +1,547 @@
-"{ Package: 'stx:goodies/petitparser/parsers/java' }"
"{ NameSpace: Smalltalk }"
PPCompositeParser subclass:#PPJavaLexicon
instanceVariableNames:'unicodeEscape rawInputCharacter unicodeMarker hexDigit
lineTerminator unicodeInputCharacter inputElements sub
inputElement whiteSpace comment javaToken keyword literal
separator operator identifier traditionalComment endOfLineComment
commentTail charactersInLine commentTailStar notStar
notStarNotSlash inputCharacter booleanLiteral nullLiteral
identifierChars javaLetter javaLetterOrDigit keywords
floatingPointLiteral integerLiteral characterLiteral
stringLiteral hexIntegerLiteral octalIntegerLiteral
decimalIntegerLiteral decimalNumeral integerTypeSuffix hexNumeral
octalNumeral nonZeroDigit digits hexDigits octalDigits octalDigit
hexadecimalFloatingPointLiteral decimalFloatingPointLiteral
exponentPart floatTypeSuffix exponentIndicator signedInteger sign
hexSignificand binaryExponent binaryExponentIndicator
escapeSequence singleCharacter stringCharacters stringCharacter
octalEscape zeroToThree input operators separators trueToken
falseToken nullToken'
classVariableNames:''
poolDictionaries:''
category:'PetitJava-Core'
!
PPJavaLexicon comment:'A parser with a definitions for some basic Java gramar parts
Grammar rules follow as closely as possible the specification found in "The Java Language Specification Third Edition"
URL = '
!
!PPJavaLexicon class methodsFor:'accessing'!
ignoredNames
"Answer a collection of instance-variables that should not be automatically initialized with productions, but that are used internal to the composite parser."
| newArray |
newArray := Array new: ((self namesToIgnore size) + (super ignoredNames size)).
newArray
replaceFrom: 1
to: self namesToIgnore size
with: self namesToIgnore.
newArray
replaceFrom: (self namesToIgnore size + 1)
to: newArray size
with: super ignoredNames.
^newArray
!
namesToIgnore
^#('keywords' 'operators' 'separators')
! !
!PPJavaLexicon methodsFor:'accessing'!
start
"Default start production."
^ input end
! !
!PPJavaLexicon methodsFor:'grammar-comments'!
charactersInLine
^ inputCharacter plus
!
comment
"traditional -> /*
endOfLine -> //"
^ traditionalComment / endOfLineComment
!
commentTail
^ ('*' asParser , commentTailStar ) /
(notStar , commentTail)
!
commentTailStar
^ ('/' asParser ) /
('*' asParser , commentTailStar ) /
(notStarNotSlash , commentTail )
!
endOfLineComment
^ '//' asParser , charactersInLine optional
!
notStar
^ ('*' asParser not , inputCharacter)/lineTerminator
!
notStarNotSlash
^ lineTerminator / ((PPPredicateObjectParser anyOf: '*/') not , inputCharacter )
!
traditionalComment
^ '/*' asParser , commentTail
! !
!PPJavaLexicon methodsFor:'grammar-identifiers'!
identifier
^ self asToken: (((keyword not) , (booleanLiteral not) , (nullLiteral not) , identifierChars ))
!
identifierChars
^ javaLetter plus , javaLetterOrDigit star
!
javaLetter
^ (#letter asParser) / (PPPredicateObjectParser anyOf: '_$')
!
javaLetterOrDigit
^ javaLetter / (#digit asParser)
! !
!PPJavaLexicon methodsFor:'grammar-input'!
input
^ (inputElements optional) , (sub optional)
!
inputElement
^ whiteSpace / comment / javaToken
!
inputElements
^ inputElement plus
!
javaToken
^ identifier / keyword / literal / separator / operator
!
sub
^ (Character value: 26) asParser
! !
!PPJavaLexicon methodsFor:'grammar-keywords'!
keyword
| keywordParsers |
keywordParsers := keywords keys asSortedCollection collect: [:eachKey | keywords at: eachKey ].
^ self asToken: ( (keywordParsers reduce: [ :a :b | a / b ]) )
"Modified (format): / 21-04-2015 / 15:27:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!PPJavaLexicon methodsFor:'grammar-lineTerminators'!
inputCharacter
^(lineTerminator not) , unicodeInputCharacter ==> #second
!
lineTerminator
self flag: 'Hack alert - should be fixed immediately in PJTraditionalCommentsNode>>comment:'.
^ (((Character codePoint: 10) asParser) ==> [ :lf | Array with: lf with: nil ])
/ (((Character codePoint: 13) asParser , ((Character codePoint: 10) asParser ) optional )) ==> [ :nodes | Array with: nodes first with: nil ]
"Modified: / 21-04-2015 / 17:16:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!PPJavaLexicon methodsFor:'grammar-literals'!
literal
"a literal must be a single token. Whitespaces are not allowed inside the literal"
^ nullLiteral / booleanLiteral / floatingPointLiteral / integerLiteral / characterLiteral / stringLiteral
! !
!PPJavaLexicon methodsFor:'grammar-literals-boolean'!
booleanLiteral
^ trueToken / falseToken
!
falseToken
^ ('false' asParser , #word asParser not) javaToken
!
nullToken
^ ('null' asParser , #word asParser not) javaToken
!
trueToken
^ ('true' asParser , #word asParser not) javaToken
! !
!PPJavaLexicon methodsFor:'grammar-literals-character'!
characterLiteral
^ ($' asParser , ( escapeSequence / singleCharacter ), $' asParser) javaToken
!
singleCharacter
^( PPPredicateObjectParser anyOf: '''\') not , inputCharacter ==> #second
! !
!PPJavaLexicon methodsFor:'grammar-literals-escape'!
escapeSequence
^ ($\ asParser , (PPPredicateObjectParser anyOf: 'btnfr""''\' ) ) /
octalEscape
!
octalEscape
^ $\ asParser , ( (zeroToThree , octalDigit , octalDigit) / (octalDigit , octalDigit optional) )
!
zeroToThree
^PPPredicateObjectParser anyOf: '0123'
! !
!PPJavaLexicon methodsFor:'grammar-literals-floating'!
binaryExponent
^ binaryExponentIndicator , signedInteger
!
binaryExponentIndicator
^ PPPredicateObjectParser anyOf: 'pP'
!
decimalFloatingPointLiteral
|dot|
dot := $. asParser.
^ ( ( (dot , digits)
/
(digits , dot , digits optional)) ,
exponentPart optional , floatTypeSuffix optional )
/
(digits ,
( (exponentPart , floatTypeSuffix optional)
/
(exponentPart optional , floatTypeSuffix) ))
!
exponentIndicator
^ PPPredicateObjectParser anyOf: 'eE'
!
exponentPart
^ exponentIndicator , signedInteger
!
floatTypeSuffix
^ PPPredicateObjectParser anyOf: 'fFdD'
!
floatingPointLiteral
^ (hexadecimalFloatingPointLiteral / decimalFloatingPointLiteral) javaToken
!
hexSignificand
|dot|
dot := $. asParser.
^ (hexNumeral , dot optional) /
($0 asParser , (PPPredicateObjectParser anyOf: 'xX') , hexDigits optional , dot , hexDigits )
!
hexadecimalFloatingPointLiteral
^ hexSignificand , binaryExponent , floatTypeSuffix optional
!
sign
^PPPredicateObjectParser anyOf: '-+'
!
signedInteger
^ sign optional , digits
! !
!PPJavaLexicon methodsFor:'grammar-literals-integer'!
decimalIntegerLiteral
^ decimalNumeral , (integerTypeSuffix optional)
!
decimalNumeral
^($0 asParser) / (nonZeroDigit , digits optional)
!
digits
"digit is already defined, no need to redefine it"
^#digit asParser plus
!
hexDigits
^hexDigit plus
!
hexIntegerLiteral
^ hexNumeral , (integerTypeSuffix optional)
!
hexNumeral
^$0 asParser, (PPPredicateObjectParser anyOf: 'xX' ), hexDigits
!
integerLiteral
^ (hexIntegerLiteral / octalIntegerLiteral / decimalIntegerLiteral) javaToken
!
integerTypeSuffix
^ PPPredicateObjectParser anyOf: 'lL'
!
nonZeroDigit
^PPPredicateObjectParser anyOf: '123456789'.
!
octalDigit
^PPPredicateObjectParser anyOf: '01234567'
!
octalDigits
^ octalDigit plus
!
octalIntegerLiteral
^ octalNumeral , (integerTypeSuffix optional)
!
octalNumeral
^($0 asParser) , octalDigits
! !
!PPJavaLexicon methodsFor:'grammar-literals-null'!
nullLiteral
^ nullToken
! !
!PPJavaLexicon methodsFor:'grammar-literals-string'!
stringCharacter
^ ( ( PPPredicateObjectParser anyOf: '"\') not , inputCharacter ==> #second ) /
escapeSequence
!
stringCharacters
^ stringCharacter plus
!
stringLiteral
^ ($" asParser , stringCharacters optional , $" asParser) javaToken
! !
!PPJavaLexicon methodsFor:'grammar-operators'!
operator
| operatorParsers |
operatorParsers := operators keys asSortedCollection collect: [:eachKey | operators at: eachKey ].
^self asToken: (operatorParsers reduce: [ :a :b | a / b ])
"Modified: / 21-04-2015 / 15:26:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!PPJavaLexicon methodsFor:'grammar-separators'!
separator
^self asToken: (PPPredicateObjectParser anyOf: '(){}[];,.' )
! !
!PPJavaLexicon methodsFor:'grammar-unicode-escapes'!
hexDigit
^#hex asParser
!
rawInputCharacter
^#any asParser
!
unicodeEscape
^ $\ asParser , unicodeMarker , hexDigit , hexDigit , hexDigit , hexDigit
!
unicodeInputCharacter
^ unicodeEscape / rawInputCharacter
!
unicodeMarker
^$u asParser plus
! !
!PPJavaLexicon methodsFor:'grammar-whiteSpace'!
whiteSpace
^ (Character space asParser ) /
(Character tab asParser ) /
((Character value: 12) asParser ) /
lineTerminator
! !
!PPJavaLexicon methodsFor:'initialization'!
initialize
super initialize.
self initializeKeywords.
self initializeOperators.
self initializeSeparators.
!
initializeKeywords
| values |
keywords := Dictionary new.
values := #('abstract' 'assert' 'boolean' 'break' 'byte' 'case' 'catch' 'char' 'class' 'const'
'continue' 'default' 'do' 'double' 'else' 'enum' 'extends' 'final' 'finally' 'float'
'for' 'if' 'goto' 'implements' 'import' 'instanceof' 'int' 'interface' 'long' 'native'
'new' 'package' 'private' 'protected' 'public' 'return' 'short' 'static' 'strictfp' 'super'
'switch' 'synchronized' 'this' 'throw' 'throws' 'transient' 'try' 'void' 'volatile' 'while').
values do: [:eachKeyword |
keywords at: eachKeyword
put: (PPUnresolvedParser named: ('keyword', eachKeyword first asUppercase asString , eachKeyword allButFirst))
].
keywords keysAndValuesDo: [:key :value |
(keywords at: key) def: (key asParser , #word asParser not)]
!
initializeOperators
| values |
operators := Dictionary new.
values := #( '>>>=' '>>>' '>>=' '>>' '>=' '>' '<<=' '<<' '<=' '<' '++' '+=' '+' '--' '-=' '-' '&&' '&=' '&'
'||' '|=' '|' '*=' '*' '%=' '%' '/=' '/' '^=' '^' '!!=' '!!' '==' '=' '~' '?' ':' '@' ).
" @ ? perhaps for annotation but not in the doc "
values do: [:eachOperator |
operators at: eachOperator
put: (PPUnresolvedParser named: ('operator', eachOperator asString))
].
operators keysAndValuesDo: [:key :value |
(operators at: key) def: (key asParser)]
!
initializeSeparators
| values |
separators := Dictionary new.
values := #( '(' ')' '{' '}' '[' ']' ';' ',' '.' ).
values do: [:eachSeparator |
separators at: eachSeparator
put: (PPUnresolvedParser named: ('separator', eachSeparator asString))
].
separators keysAndValuesDo: [:key :value |
(separators at: key) def: (key asParser)]
! !
!PPJavaLexicon methodsFor:'utility'!
asToken: aParser
^aParser javaToken
!
emptySquaredParenthesis
^ self asToken: (((self tokenFor: '['), (self tokenFor: ']')))
!
tokenFor: aString
^self asToken: (keywords at: aString
ifAbsent: [separators at: aString
ifAbsent: [operators at: aString] ])
! !
!PPJavaLexicon class methodsFor:'documentation'!
version_HG
^ '$Changeset: <not expanded> $'
! !
\ No newline at end of file
+"{ Package: 'stx:goodies/petitparser/parsers/java' }"
+
+"{ NameSpace: Smalltalk }"
+
+PPCompositeParser subclass:#PPJavaLexicon
+ instanceVariableNames:'unicodeEscape rawInputCharacter unicodeMarker hexDigit
+ lineTerminator unicodeInputCharacter inputElements sub
+ inputElement whiteSpace comment javaToken keyword literal
+ separator operator identifier traditionalComment endOfLineComment
+ commentTail charactersInLine commentTailStar notStar
+ notStarNotSlash inputCharacter booleanLiteral nullLiteral
+ identifierChars javaLetter javaLetterOrDigit keywords
+ floatingPointLiteral integerLiteral characterLiteral
+ stringLiteral hexIntegerLiteral octalIntegerLiteral
+ decimalIntegerLiteral decimalNumeral integerTypeSuffix hexNumeral
+ octalNumeral nonZeroDigit digits hexDigits octalDigits octalDigit
+ hexadecimalFloatingPointLiteral decimalFloatingPointLiteral
+ exponentPart floatTypeSuffix exponentIndicator signedInteger sign
+ hexSignificand binaryExponent binaryExponentIndicator
+ escapeSequence singleCharacter stringCharacters stringCharacter
+ octalEscape zeroToThree input operators separators trueToken
+ falseToken nullToken'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'PetitJava-Core'
+!
+
+PPJavaLexicon comment:'A parser with a definitions for some basic Java gramar parts
Grammar rules follow as closely as possible the specification found in "The Java Language Specification Third Edition"
URL = '
+!
+
+
+!PPJavaLexicon class methodsFor:'accessing'!
+
+ignoredNames
+ "Answer a collection of instance-variables that should not be automatically initialized with productions, but that are used internal to the composite parser."
+
+ | newArray |
+ newArray := Array new: ((self namesToIgnore size) + (super ignoredNames size)).
+ newArray
+ replaceFrom: 1
+ to: self namesToIgnore size
+ with: self namesToIgnore.
+ newArray
+ replaceFrom: (self namesToIgnore size + 1)
+ to: newArray size
+ with: super ignoredNames.
+ ^newArray
+!
+
+namesToIgnore
+
+ ^#('keywords' 'operators' 'separators')
+! !
+
+!PPJavaLexicon methodsFor:'accessing'!
+
+start
+ "Default start production."
+
+ ^ input end
+! !
+
+!PPJavaLexicon methodsFor:'grammar-comments'!
+
+charactersInLine
+
+ ^ inputCharacter plus
+!
+
+comment
+ "traditional -> /*
+ endOfLine -> //"
+ ^ traditionalComment / endOfLineComment
+!
+
+commentTail
+
+ ^ ('*' asParser , commentTailStar ) /
+ (notStar , commentTail)
+!
+
+commentTailStar
+
+ ^ ('/' asParser ) /
+ ('*' asParser , commentTailStar ) /
+ (notStarNotSlash , commentTail )
+!
+
+endOfLineComment
+
+ ^ '//' asParser , charactersInLine optional
+!
+
+notStar
+
+ ^ ('*' asParser not , inputCharacter)/lineTerminator
+!
+
+notStarNotSlash
+
+ ^ lineTerminator / ((PPPredicateObjectParser anyOf: '*/') not , inputCharacter )
+!
+
+traditionalComment
+
+ ^ '/*' asParser , commentTail
+! !
+
+!PPJavaLexicon methodsFor:'grammar-identifiers'!
+
+identifier
+
+ ^ self asToken: (((keyword not) , (booleanLiteral not) , (nullLiteral not) , identifierChars ))
+!
+
+identifierChars
+
+ ^ javaLetter plus , javaLetterOrDigit star
+!
+
+javaLetter
+
+ ^ (#letter asParser) / (PPPredicateObjectParser anyOf: '_$')
+!
+
+javaLetterOrDigit
+
+ ^ javaLetter / (#digit asParser)
+! !
+
+!PPJavaLexicon methodsFor:'grammar-input'!
+
+input
+
+ ^ (inputElements optional) , (sub optional)
+!
+
+inputElement
+
+ ^ whiteSpace / comment / javaToken
+!
+
+inputElements
+
+ ^ inputElement plus
+!
+
+javaToken
+
+
+ ^ identifier / keyword / literal / separator / operator
+!
+
+sub
+
+ ^ (Character value: 26) asParser
+! !
+
+!PPJavaLexicon methodsFor:'grammar-keywords'!
+
+keyword
+
+ | keywordParsers |
+
+ keywordParsers := keywords keys asSortedCollection collect: [:eachKey | keywords at: eachKey ].
+ ^ self asToken: ( (keywordParsers reduce: [ :a :b | a / b ]) )
+
+ "Modified (format): / 21-04-2015 / 15:27:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!PPJavaLexicon methodsFor:'grammar-lineTerminators'!
+
+inputCharacter
+
+ ^(lineTerminator not) , unicodeInputCharacter ==> #second
+!
+
+lineTerminator
+
+ self flag: 'Hack alert - should be fixed immediately in PJTraditionalCommentsNode>>comment:'.
+
+ ^ (((Character codePoint: 10) asParser) ==> [ :lf | Array with: lf with: nil ])
+ / (((Character codePoint: 13) asParser , ((Character codePoint: 10) asParser ) optional )) ==> [ :nodes | Array with: nodes first with: nil ]
+
+ "Modified: / 21-04-2015 / 17:16:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals'!
+
+literal
+ "a literal must be a single token. Whitespaces are not allowed inside the literal"
+
+ ^ nullLiteral / booleanLiteral / floatingPointLiteral / integerLiteral / characterLiteral / stringLiteral
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals-boolean'!
+
+booleanLiteral
+
+ ^ trueToken / falseToken
+!
+
+falseToken
+ ^ ('false' asParser , #word asParser not) javaToken
+!
+
+nullToken
+ ^ ('null' asParser , #word asParser not) javaToken
+!
+
+trueToken
+ ^ ('true' asParser , #word asParser not) javaToken
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals-character'!
+
+characterLiteral
+
+ ^ ($' asParser , ( escapeSequence / singleCharacter ), $' asParser) javaToken
+!
+
+singleCharacter
+
+ ^( PPPredicateObjectParser anyOf: '''\') not , inputCharacter ==> #second
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals-escape'!
+
+escapeSequence
+
+ ^ ($\ asParser , (PPPredicateObjectParser anyOf: 'btnfr""''\' ) ) /
+ octalEscape
+!
+
+octalEscape
+
+ ^ $\ asParser , ( (zeroToThree , octalDigit , octalDigit) / (octalDigit , octalDigit optional) )
+!
+
+zeroToThree
+
+ ^PPPredicateObjectParser anyOf: '0123'
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals-floating'!
+
+binaryExponent
+
+ ^ binaryExponentIndicator , signedInteger
+!
+
+binaryExponentIndicator
+
+ ^ PPPredicateObjectParser anyOf: 'pP'
+!
+
+decimalFloatingPointLiteral
+
+ |dot|
+ dot := $. asParser.
+
+ ^ ( ( (dot , digits)
+ /
+ (digits , dot , digits optional)) ,
+ exponentPart optional , floatTypeSuffix optional )
+ /
+ (digits ,
+ ( (exponentPart , floatTypeSuffix optional)
+ /
+ (exponentPart optional , floatTypeSuffix) ))
+!
+
+exponentIndicator
+
+ ^ PPPredicateObjectParser anyOf: 'eE'
+!
+
+exponentPart
+
+ ^ exponentIndicator , signedInteger
+!
+
+floatTypeSuffix
+
+ ^ PPPredicateObjectParser anyOf: 'fFdD'
+!
+
+floatingPointLiteral
+
+ ^ (hexadecimalFloatingPointLiteral / decimalFloatingPointLiteral) javaToken
+!
+
+hexSignificand
+ |dot|
+ dot := $. asParser.
+
+ ^ (hexNumeral , dot optional) /
+ ($0 asParser , (PPPredicateObjectParser anyOf: 'xX') , hexDigits optional , dot , hexDigits )
+!
+
+hexadecimalFloatingPointLiteral
+
+ ^ hexSignificand , binaryExponent , floatTypeSuffix optional
+!
+
+sign
+
+ ^PPPredicateObjectParser anyOf: '-+'
+!
+
+signedInteger
+
+ ^ sign optional , digits
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals-integer'!
+
+decimalIntegerLiteral
+
+ ^ decimalNumeral , (integerTypeSuffix optional)
+!
+
+decimalNumeral
+
+ ^($0 asParser) / (nonZeroDigit , digits optional)
+!
+
+digits
+ "digit is already defined, no need to redefine it"
+ ^#digit asParser plus
+!
+
+hexDigits
+
+ ^hexDigit plus
+!
+
+hexIntegerLiteral
+
+ ^ hexNumeral , (integerTypeSuffix optional)
+!
+
+hexNumeral
+
+ ^$0 asParser, (PPPredicateObjectParser anyOf: 'xX' ), hexDigits
+!
+
+integerLiteral
+
+ ^ (hexIntegerLiteral / octalIntegerLiteral / decimalIntegerLiteral) javaToken
+!
+
+integerTypeSuffix
+
+ ^ PPPredicateObjectParser anyOf: 'lL'
+!
+
+nonZeroDigit
+
+ ^PPPredicateObjectParser anyOf: '123456789'.
+!
+
+octalDigit
+
+ ^PPPredicateObjectParser anyOf: '01234567'
+!
+
+octalDigits
+
+ ^ octalDigit plus
+!
+
+octalIntegerLiteral
+
+ ^ octalNumeral , (integerTypeSuffix optional)
+!
+
+octalNumeral
+
+ ^($0 asParser) , octalDigits
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals-null'!
+
+nullLiteral
+
+ ^ nullToken
+! !
+
+!PPJavaLexicon methodsFor:'grammar-literals-string'!
+
+stringCharacter
+
+ ^ ( ( PPPredicateObjectParser anyOf: '"\') not , inputCharacter ==> #second ) /
+ escapeSequence
+!
+
+stringCharacters
+
+ ^ stringCharacter plus
+!
+
+stringLiteral
+
+ ^ ($" asParser , stringCharacters optional , $" asParser) javaToken
+! !
+
+!PPJavaLexicon methodsFor:'grammar-operators'!
+
+operator
+ | operatorParsers |
+
+ operatorParsers := operators keys asSortedCollection collect: [:eachKey | operators at: eachKey ].
+ ^self asToken: (operatorParsers reduce: [ :a :b | a / b ])
+
+ "Modified: / 21-04-2015 / 15:26:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!PPJavaLexicon methodsFor:'grammar-separators'!
+
+separator
+ ^self asToken: (PPPredicateObjectParser anyOf: '(){}[];,.' )
+! !
+
+!PPJavaLexicon methodsFor:'grammar-unicode-escapes'!
+
+hexDigit
+
+ ^#hex asParser
+!
+
+rawInputCharacter
+
+ ^#any asParser
+!
+
+unicodeEscape
+
+ ^ $\ asParser , unicodeMarker , hexDigit , hexDigit , hexDigit , hexDigit
+!
+
+unicodeInputCharacter
+ ^ unicodeEscape / rawInputCharacter
+!
+
+unicodeMarker
+
+ ^$u asParser plus
+! !
+
+!PPJavaLexicon methodsFor:'grammar-whiteSpace'!
+
+whiteSpace
+
+ ^ (Character space asParser ) /
+ (Character tab asParser ) /
+ ((Character value: 12) asParser ) /
+ lineTerminator
+! !
+
+!PPJavaLexicon methodsFor:'initialization'!
+
+initialize
+
+ super initialize.
+
+ self initializeKeywords.
+ self initializeOperators.
+ self initializeSeparators.
+!
+
+initializeKeywords
+
+ | values |
+ keywords := Dictionary new.
+ values := #('abstract' 'assert' 'boolean' 'break' 'byte' 'case' 'catch' 'char' 'class' 'const'
+ 'continue' 'default' 'do' 'double' 'else' 'enum' 'extends' 'final' 'finally' 'float'
+ 'for' 'if' 'goto' 'implements' 'import' 'instanceof' 'int' 'interface' 'long' 'native'
+ 'new' 'package' 'private' 'protected' 'public' 'return' 'short' 'static' 'strictfp' 'super'
+ 'switch' 'synchronized' 'this' 'throw' 'throws' 'transient' 'try' 'void' 'volatile' 'while').
+
+ values do: [:eachKeyword |
+ keywords at: eachKeyword
+ put: (PPUnresolvedParser named: ('keyword', eachKeyword first asUppercase asString , eachKeyword allButFirst))
+ ].
+
+ keywords keysAndValuesDo: [:key :value |
+ (keywords at: key) def: (key asParser , #word asParser not)]
+!
+
+initializeOperators
+
+ | values |
+ operators := Dictionary new.
+ values := #( '>>>=' '>>>' '>>=' '>>' '>=' '>' '<<=' '<<' '<=' '<' '++' '+=' '+' '--' '-=' '-' '&&' '&=' '&'
+ '||' '|=' '|' '*=' '*' '%=' '%' '/=' '/' '^=' '^' '!!=' '!!' '==' '=' '~' '?' ':' '@' ).
+ " @ ? perhaps for annotation but not in the doc "
+ values do: [:eachOperator |
+ operators at: eachOperator
+ put: (PPUnresolvedParser named: ('operator', eachOperator asString))
+ ].
+
+ operators keysAndValuesDo: [:key :value |
+ (operators at: key) def: (key asParser)]
+!
+
+initializeSeparators
+
+ | values |
+ separators := Dictionary new.
+ values := #( '(' ')' '{' '}' '[' ']' ';' ',' '.' ).
+
+ values do: [:eachSeparator |
+ separators at: eachSeparator
+ put: (PPUnresolvedParser named: ('separator', eachSeparator asString))
+ ].
+
+ separators keysAndValuesDo: [:key :value |
+ (separators at: key) def: (key asParser)]
+! !
+
+!PPJavaLexicon methodsFor:'utility'!
+
+asToken: aParser
+
+ ^aParser javaToken
+!
+
+emptySquaredParenthesis
+
+ ^ self asToken: (((self tokenFor: '['), (self tokenFor: ']')))
+!
+
+tokenFor: aString
+
+ ^self asToken: (keywords at: aString
+ ifAbsent: [separators at: aString
+ ifAbsent: [operators at: aString] ])
+! !
+
+!PPJavaLexicon class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/parsers/java/PPJavaTokenParser.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/PPJavaTokenParser.st Mon Aug 17 12:56:02 2015 +0100
@@ -12,29 +12,31 @@
!PPJavaTokenParser methodsFor:'parsing'!
parseComments: anArray on: aStream
-
- | start comments |
- comments := anArray.
- [
- | peekTwice |
- [ aStream atEnd not and: [ aStream peek isSeparator ] ]
- whileTrue: [ aStream next ].
- peekTwice := aStream peekTwice.
- ((peekTwice first = $/) and:
- [ (peekTwice second = $*) or: [peekTwice second = $/]])] whileTrue: [
-"
- Transcript show: ('position ', aStream position asString, ' char ', aStream next asString); cr.
-"
- aStream next.
- start := aStream position.
- (aStream next = $*)
- ifTrue: [ aStream upToAll: '*/' ]
- ifFalse: [
- | position |
- position := aStream position.
- aStream upToAnyOf: CharacterSet crlf].
- comments := comments copyWith: (start to: aStream position) ].
- ^ comments
+
+ | start comments |
+ comments := anArray.
+ [
+ | peekTwice |
+ [ aStream atEnd not and: [ aStream peek isSeparator ] ]
+ whileTrue: [ aStream next ].
+ peekTwice := aStream peekTwice.
+ ((peekTwice first = $/) and:
+ [ (peekTwice second = $*) or: [peekTwice second = $/]])] whileTrue: [
+"
+ Transcript show: ('position ', aStream position asString, ' char ', aStream next asString); cr.
+"
+ aStream next.
+ start := aStream position.
+ (aStream next = $*)
+ ifTrue: [ aStream upToAll: '*/' ]
+ ifFalse: [
+ | position |
+ position := aStream position.
+ aStream upToAnyOf: (String with: (Character codePoint: 13) with: (Character codePoint: 10))].
+ comments := comments copyWith: (start to: aStream position) ].
+ ^ comments
+
+ "Modified: / 21-04-2015 / 17:23:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
parseOn: aPPContext
--- a/parsers/java/PPJavaWhitespaceParser.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/PPJavaWhitespaceParser.st Mon Aug 17 12:56:02 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitJava-Core'
!
+
!PPJavaWhitespaceParser methodsFor:'as yet unclassified'!
acceptsEpsilon
@@ -36,25 +37,27 @@
!
parseOn: context
-
- | start |
+
+ | start |
- [
- | peekTwice |
- [ context atEnd not and: [ context peek isSeparator ] ]
- whileTrue: [ context next ].
- peekTwice := context peekTwice.
- ((peekTwice first = $/) and:
- [ (peekTwice second = $*) or: [peekTwice second = $/]])
- ] whileTrue: [
- context next.
- start := context position.
- (context next = $*)
- ifTrue: [ context upToAll: '*/' ]
- ifFalse: [
- | position |
- position := context position.
- context upToAnyOf: CharacterSet crlf].
- ].
+ [
+ | peekTwice |
+ [ context atEnd not and: [ context peek isSeparator ] ]
+ whileTrue: [ context next ].
+ peekTwice := context peekTwice.
+ ((peekTwice first = $/) and:
+ [ (peekTwice second = $*) or: [peekTwice second = $/]])
+ ] whileTrue: [
+ context next.
+ start := context position.
+ (context next = $*)
+ ifTrue: [ context upToAll: '*/' ]
+ ifFalse: [
+ | position |
+ position := context position.
+ context upToAnyOf: String crlf].
+ ].
+
+ "Modified: / 10-05-2015 / 07:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
--- a/parsers/java/abbrev.stc Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/abbrev.stc Mon Aug 17 12:56:02 2015 +0100
@@ -22,7 +22,6 @@
PJTypeNode PJTypeNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJVariableDeclaratorNode PJVariableDeclaratorNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PPJavaSyntax PPJavaSyntax stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
-PPJavaSyntaxTest PPJavaSyntaxTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 1
PJAbstractTypeDeclarationNode PJAbstractTypeDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJAnnotationNode PJAnnotationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJArrayTypeNode PJArrayTypeNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
@@ -45,7 +44,6 @@
PJStringLiteralNode PJStringLiteralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJWhileStatementNode PJWhileStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PPJavaParser PPJavaParser stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
-PPJavaParserTest PPJavaParserTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 1
PJConstructorDeclarationNode PJConstructorDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJEndOfLineCommentsNode PJEndOfLineCommentsNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJMethodDeclarationNode PJMethodDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 1
@@ -53,3 +51,5 @@
PJSimpleNameNode PJSimpleNameNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJTraditionalCommentsNode PJTraditionalCommentsNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
PJTypeDeclarationNode PJTypeDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PPJavaParserTest PPJavaParserTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 1
+PPJavaSyntaxTest PPJavaSyntaxTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 1
--- a/parsers/java/bc.mak Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/bc.mak Mon Aug 17 12:56:02 2015 +0100
@@ -35,7 +35,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\goodies\petitparser\tests -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\goodies\petitparser\tests -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
--- a/parsers/java/extensions.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/extensions.st Mon Aug 17 12:56:02 2015 +0100
@@ -11,10 +11,14 @@
ifFalse: [ aString ]])
! !
-!PPParser methodsFor:'*petitjava-operations'!
+!PPParser methodsFor:'*petitcompiler'!
javaToken
- ^ PPJavaTokenParser on: self
+ | ws |
+ ws := PPJavaWhitespaceParser new.
+ ^ ((ws, ((PPTokenParser on: self) tokenClass: PPJavaToken; yourself), ws) ==> #second)
+ propertyAt: #'trimmingToken' put: true;
+ yourself
! !
!stx_goodies_petitparser_parsers_java class methodsFor:'documentation'!
--- a/parsers/java/stx_goodies_petitparser_parsers_java.st Mon Aug 17 12:13:16 2015 +0100
+++ b/parsers/java/stx_goodies_petitparser_parsers_java.st Mon Aug 17 12:56:02 2015 +0100
@@ -73,7 +73,6 @@
by searching all classes (and their packages) which are referenced by my classes."
^ #(
- #'stx:libbasic2' "CharacterSet - referenced by PPJavaTokenParser>>parseComments:on:"
)
!
@@ -126,7 +125,6 @@
PJTypeNode
PJVariableDeclaratorNode
PPJavaSyntax
- (PPJavaSyntaxTest autoload)
PJAbstractTypeDeclarationNode
PJAnnotationNode
PJArrayTypeNode
@@ -149,7 +147,6 @@
PJStringLiteralNode
PJWhileStatementNode
PPJavaParser
- (PPJavaParserTest autoload)
PJConstructorDeclarationNode
PJEndOfLineCommentsNode
PJMethodDeclarationNode
@@ -157,6 +154,8 @@
PJSimpleNameNode
PJTraditionalCommentsNode
PJTypeDeclarationNode
+ (PPJavaParserTest autoload)
+ (PPJavaSyntaxTest autoload)
)
!
--- a/stx_goodies_petitparser.st Mon Aug 17 12:13:16 2015 +0100
+++ b/stx_goodies_petitparser.st Mon Aug 17 12:56:02 2015 +0100
@@ -62,7 +62,14 @@
preRequisites scan. See #preRequisites for more."
^ #(
+ #'stx:goodies/monticello' "MCDirectoryRepository - referenced by stx_goodies_petitparser class>>monticelloExportTo:"
+ #'stx:libscm/mercurial' "HGPackageWorkingCopy - referenced by stx_goodies_petitparser class>>monticelloExportTo:"
+ #'stx:libscm/mercurial/monticello' "HGMCVersionInfo - referenced by stx_goodies_petitparser class>>monticelloExportTo:"
+ #'stx:libwidg' "ScrollableView - referenced by PPParser>>inspector2TabTree"
+ #'stx:libwidg2' "HierarchicalListView - referenced by PPParser>>inspector2TabTree"
)
+
+ "Modified: / 03-06-2015 / 08:47:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
mandatoryPreRequisites
@@ -90,8 +97,6 @@
by searching all classes (and their packages) which are referenced by my classes."
^ #(
- #'stx:goodies/monticello' "MCDirectoryRepository - referenced by stx_goodies_petitparser class>>exportAsMczTo:"
- #'stx:libscm/mercurial/monticello' "HGMCVersionInfo - referenced by stx_goodies_petitparser class>>exportAsMczTo:"
)
!
@@ -112,7 +117,10 @@
^ #(
#'stx:goodies/petitparser/analyzer'
#'stx:goodies/petitparser/tests'
- )
+ #'stx:goodies/petitparser/parsers/smalltalk'
+ #'stx:goodies/petitparser/parsers/java'
+ #'stx:goodies/petitparser/compiler'
+)
! !
!stx_goodies_petitparser class methodsFor:'description - compilation'!
@@ -129,7 +137,8 @@
Class tryLocalSourceFirst: true. \
Smalltalk packagePath add:''$(TOP)/..'' . \
Smalltalk loadPackage:''stx:goodies/petitparser''. \
- (Smalltalk at: #''stx_goodies_petitparser'') exportAsMczTo: ''mc''."
+ (Smalltalk at: #''stx_goodies_petitparser'') monticelloExportTo: ''mc''.\
+ Smalltalk exit: 0."
'
@@ -286,40 +295,66 @@
!stx_goodies_petitparser class methodsFor:'utilities - monticello'!
-exportAsMczTo: directory
+monticelloExportTo: directory
"Export .mcz packages to given directory"
- | packages exporter mcrepo |
+ | packages message exporter mcrepo hgrev hgrepo |
Smalltalk loadPackage: 'stx:goodies/monticello'.
Smalltalk loadPackage: 'stx:libscm/mercurial/monticello'.
Class tryLocalSourceFirst: true.
-
- packages := #(
+ packages := #(
'stx:goodies/petitparser'
'stx:goodies/petitparser/tests'
'stx:goodies/petitparser/analyzer'
'stx:goodies/petitparser/analyzer/tests'
+
'stx:goodies/petitparser/parsers/smalltalk'
'stx:goodies/petitparser/parsers/smalltalk/tests'
+ 'stx:goodies/petitparser/parsers/java'
+
'stx:goodies/petitparser/compiler'
'stx:goodies/petitparser/compiler/tests'
+ 'stx:goodies/petitparser/compiler/tests/extras'
'stx:goodies/petitparser/compiler/benchmarks'
).
+ packages do:[:pkgnm |
+ Smalltalk loadPackage: pkgnm.
+ ].
+
+ packages do:[:pkgnm |
+ | pm cs |
+
+ pm := HGPackageWorkingCopy named: pkgnm.
+ hgrepo isNil ifTrue:[
+ hgrepo := pm repository.
+ ].
+ hgrev isNil ifTrue:[
+ hgrev := pm revision.
+ ] ifFalse:[
+ hgrev = pm revision ifFalse:[
+ self error: 'Package revisions differ!!'
+ ].
+ ].
+ ].
+
+ message := (hgrepo @ hgrev) messageDigest.
+
exporter := [:pkgnm|
| mcpkg mcwc mcvi mcversion |
Stdout nextPutAll: 'Exporting '; nextPutLine: pkgnm.
- Smalltalk loadPackage: pkgnm.
mcpkg := MCPackage named: pkgnm.
mcwc := mcpkg workingCopy.
mcvi := HGMCVersionInfo forPackage: pkgnm.
+ mcvi message: message.
[
- mcversion := mcwc newVersion
+ mcversion := mcwc newVersion.
+ mcversion snapshot includeExtrasForSTX: false.
] on: MCVersionNameAndMessageRequest do:[:ex |
- ex resume: (Array with: mcvi name with: mcvi message)
+ ex resume: (Array with: mcvi name with: message)
].
mcversion info: mcvi.
mcrepo storeVersion: mcversion.
@@ -329,10 +364,11 @@
packages do: exporter.
"
- stx_goodies_petitparser exportAsMczTo: '/tmp'
+ stx_goodies_petitparser monticelloExportTo: '/tmp'
"
"Created: / 04-10-2014 / 21:30:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 03-06-2015 / 08:06:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!stx_goodies_petitparser class methodsFor:'documentation'!
--- a/tests/PPArithmeticParserTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/tests/PPArithmeticParserTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPCompositeParserTest subclass:#PPArithmeticParserTest
instanceVariableNames:''
classVariableNames:''
--- a/tests/PPCompositeParserTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/tests/PPCompositeParserTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPAbstractParserTest subclass:#PPCompositeParserTest
instanceVariableNames:'parser result'
classVariableNames:''
--- a/tests/PPExpressionParserTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/tests/PPExpressionParserTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPArithmeticParserTest subclass:#PPExpressionParserTest
instanceVariableNames:''
classVariableNames:''
--- a/tests/PPExtensionTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/tests/PPExtensionTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -112,16 +112,18 @@
!PPExtensionTest methodsFor:'testing-stream'!
testStream
- | dot stream |
- dot := (Character codePoint: 183) asString.
- stream := 'abc' readStream asPetitStream.
- self assert: stream class equals: PPStream.
- self assert: stream printString equals: dot , 'abc'.
- self assert: stream peek equals: $a.
- self assert: stream uncheckedPeek equals: $a.
- self assert: stream next equals: $a.
- self assert: stream printString equals: 'a' , dot , 'bc'.
- self assert: stream asPetitStream equals: stream
+ | dot stream |
+ dot := String with: (Character codePoint: 183).
+ stream := 'abc' readStream asPetitStream.
+ self assert: stream class equals: PPStream.
+ self assert: stream printString equals: dot , 'abc'.
+ self assert: stream peek equals: $a.
+ self assert: stream uncheckedPeek equals: $a.
+ self assert: stream next equals: $a.
+ self assert: stream printString equals: 'a' , dot , 'bc'.
+ self assert: stream asPetitStream equals: stream
+
+ "Modified: / 02-06-2015 / 17:22:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
testText
--- a/tests/PPLambdaParserTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/tests/PPLambdaParserTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPCompositeParserTest subclass:#PPLambdaParserTest
instanceVariableNames:''
classVariableNames:''
--- a/tests/PPParserResource.st Mon Aug 17 12:13:16 2015 +0100
+++ b/tests/PPParserResource.st Mon Aug 17 12:56:02 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/tests' }"
+"{ NameSpace: Smalltalk }"
+
TestResource subclass:#PPParserResource
instanceVariableNames:'parsers'
classVariableNames:''
--- a/tests/PPScriptingTest.st Mon Aug 17 12:13:16 2015 +0100
+++ b/tests/PPScriptingTest.st Mon Aug 17 12:56:02 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPAbstractParserTest subclass:#PPScriptingTest
instanceVariableNames:''
classVariableNames:''
--- a/vcmake.bat Mon Aug 17 12:13:16 2015 +0100
+++ b/vcmake.bat Mon Aug 17 12:56:02 2015 +0100
@@ -28,4 +28,25 @@
@call vcmake %1 %2 || exit /b "%errorlevel%"
@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
+@echo "***********************************"
+@pushd parsers\smalltalk
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/java
+@echo "***********************************"
+@pushd parsers\java
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+