Portability: fixes for Smalltalk/X
* Do not use #crShow: - not present in Smalltalk/X
* Do not use Array class>>with:withAll:
* do not use detect:ifFound:ifAbsent:
--- a/compiler/PPCSequenceNode.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/PPCSequenceNode.st Tue May 12 01:57:37 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Nodes'
!
+
!PPCSequenceNode methodsFor:'accessing'!
prefix
@@ -127,3 +128,10 @@
^ visitor visitSequenceNode: self
! !
+!PPCSequenceNode class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCTokenCodeGenerator.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/PPCTokenCodeGenerator.st Tue May 12 01:57:37 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Visitors'
!
+
!PPCTokenCodeGenerator methodsFor:'as yet unclassified'!
afterAccept: node retval: retval
@@ -86,3 +87,10 @@
compiler rememberStrategy: (PPCCompilerTokenizingRememberStrategy on: compiler).
! !
+!PPCTokenCodeGenerator class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/PPCTokenizingVisitor.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/PPCTokenizingVisitor.st Tue May 12 01:57:37 2015 +0100
@@ -18,17 +18,17 @@
tokens addLast: self eofToken.
tokens do: [ :token | token unmarkForInline ].
- whitespaceNode := tokens detect: [ :e | e isTrimmingTokenNode ] ifFound: [:token |
- token whitespace copy
- unmarkForInline;
- name: 'consumeWhitespace';
- yourself
- ] ifNone: [
- PPCNilNode new
- name: 'consumeWhitespace';
- yourself
- ].
-
+ whitespaceNode := tokens detect: [ :e | e isTrimmingTokenNode ] ifNone:[nil].
+ whitespaceNode notNil ifTrue:[
+ whitespaceNode := whitespaceNode whitespace copy
+ unmarkForInline;
+ name: 'consumeWhitespace';
+ yourself
+ ] ifFalse:[
+ whitespaceNode := (PPCNilNode new)
+ name: 'consumeWhitespace';
+ yourself
+ ].
tokenizerNode := PPCTokenChoiceNode new
children: tokens asArray;
name: 'nextToken';
@@ -43,7 +43,7 @@
].
^ parserNode
- "Modified: / 10-05-2015 / 07:27:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 12-05-2015 / 01:37:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
eofToken
--- a/compiler/tests/PPLL1ExpressionGrammar.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/PPLL1ExpressionGrammar.st Tue May 12 01:57:37 2015 +0100
@@ -13,12 +13,14 @@
add
^ prod, addPrime optional
- map: [ :_prod :_addPrime |
- _addPrime isNil
- ifTrue: [ _prod ]
- ifFalse: [ Array with: _prod withAll: _addPrime ]
-
- ]
+ map: [ :_prod :_addPrime |
+ _addPrime isNil
+ ifTrue: [ _prod ]
+ ifFalse: [ (Array with: _prod) , _addPrime ]
+
+ ]
+
+ "Modified: / 12-05-2015 / 01:35:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
addPrime
@@ -27,12 +29,14 @@
mul
^ prim, mulPrime optional
- map: [ :_prim :_mulPrime |
- _mulPrime isNil
- ifTrue: [ _prim ]
- ifFalse: [ Array with: _prim withAll: _mulPrime ]
-
- ]
+ map: [ :_prim :_mulPrime |
+ _mulPrime isNil
+ ifTrue: [ _prim ]
+ ifFalse: [ (Array with: _prim) , _mulPrime ]
+
+ ]
+
+ "Modified: / 12-05-2015 / 01:35:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
mulPrime
@@ -61,11 +65,13 @@
term
^ prod, termPrime optional
- map: [ :_prod :_termPrime |
+ map: [ :_prod :_termPrime |
_termPrime isNil
ifTrue: [ _prod ]
- ifFalse: [ Array with: _prod withAll: _termPrime ]
- ]
+ ifFalse: [ (Array with: _prod) , _termPrime ]
+ ]
+
+ "Modified: / 12-05-2015 / 01:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
termPrime
--- a/compiler/tests/PPTokenizedExpressionGrammarResource.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/PPTokenizedExpressionGrammarResource.st Tue May 12 01:57:37 2015 +0100
@@ -20,7 +20,8 @@
time := Time millisecondsToRun: [
PPExpressionGrammar new compileWithConfiguration: configuration.
].
- Transcript crShow: 'Expression grammar tokenized in: ', time asString, 'ms'.
-
+ Transcript show: 'Expression grammar tokenized in: ';show: time asString; show: 'ms'; cr.
+
+ "Modified: / 12-05-2015 / 01:38:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
--- a/compiler/tests/PPTokenizedLL1ExpressionGrammarResource.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/PPTokenizedLL1ExpressionGrammarResource.st Tue May 12 01:57:37 2015 +0100
@@ -20,7 +20,8 @@
time := Time millisecondsToRun: [
PPLL1ExpressionGrammar new compileWithConfiguration: configuration.
].
- Transcript crShow: 'Expression grammar compiled in: ', time asString, 'ms'.
-
+ Transcript show: 'Expression grammar compiled in: '; show: time asString; show: 'ms'; cr.
+
+ "Modified: / 12-05-2015 / 01:38:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
--- a/compiler/tests/extras/Make.proto Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/Make.proto Tue May 12 01:57:37 2015 +0100
@@ -130,6 +130,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)PPCCompiledJavaVerificationTest.$(O) PPCCompiledJavaVerificationTest.$(H): PPCCompiledJavaVerificationTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPCExpressionsVerificationTest.$(O) PPCExpressionsVerificationTest.$(H): PPCExpressionsVerificationTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCResources.$(O) PPCResources.$(H): PPCResources.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestResource.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCSmalltalkTests.$(O) PPCSmalltalkTests.$(H): PPCSmalltalkTests.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCSmalltalkVerificationTest.$(O) PPCSmalltalkVerificationTest.$(H): PPCSmalltalkVerificationTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -139,7 +140,9 @@
$(OUTDIR)PPTokenizedSmalltalkGrammarResource.$(O) PPTokenizedSmalltalkGrammarResource.$(H): PPTokenizedSmalltalkGrammarResource.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestResource.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPTokenizedSmalltalkGrammarTests.$(O) PPTokenizedSmalltalkGrammarTests.$(H): PPTokenizedSmalltalkGrammarTests.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)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)PPCompiledExpressionsVerificationTest.$(O) PPCompiledExpressionsVerificationTest.$(H): PPCompiledExpressionsVerificationTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCExpressionsVerificationTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPCompiledSmalltalkVerificationTest.$(O) PPCompiledSmalltalkVerificationTest.$(H): PPCompiledSmalltalkVerificationTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCSmalltalkVerificationTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPTokenizedExpressionsVerificationTest.$(O) PPTokenizedExpressionsVerificationTest.$(H): PPTokenizedExpressionsVerificationTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCExpressionsVerificationTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)PPTokenizedSmalltalkVerificationTest.$(O) PPTokenizedSmalltalkVerificationTest.$(H): PPTokenizedSmalltalkVerificationTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/compiler/tests/extras/PPCSmalltalkVerificationTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/compiler/tests/extras/Make.spec Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/Make.spec Tue May 12 01:57:37 2015 +0100
@@ -52,6 +52,7 @@
COMMON_CLASSES= \
PPCCompiledJavaVerificationTest \
+ PPCExpressionsVerificationTest \
PPCResources \
PPCSmalltalkTests \
PPCSmalltalkVerificationTest \
@@ -61,7 +62,9 @@
PPTokenizedSmalltalkGrammarResource \
PPTokenizedSmalltalkGrammarTests \
stx_goodies_petitparser_compiler_tests_extras \
+ PPCompiledExpressionsVerificationTest \
PPCompiledSmalltalkVerificationTest \
+ PPTokenizedExpressionsVerificationTest \
PPTokenizedSmalltalkVerificationTest \
@@ -69,6 +72,7 @@
COMMON_OBJS= \
$(OUTDIR_SLASH)PPCCompiledJavaVerificationTest.$(O) \
+ $(OUTDIR_SLASH)PPCExpressionsVerificationTest.$(O) \
$(OUTDIR_SLASH)PPCResources.$(O) \
$(OUTDIR_SLASH)PPCSmalltalkTests.$(O) \
$(OUTDIR_SLASH)PPCSmalltalkVerificationTest.$(O) \
@@ -78,7 +82,9 @@
$(OUTDIR_SLASH)PPTokenizedSmalltalkGrammarResource.$(O) \
$(OUTDIR_SLASH)PPTokenizedSmalltalkGrammarTests.$(O) \
$(OUTDIR_SLASH)stx_goodies_petitparser_compiler_tests_extras.$(O) \
+ $(OUTDIR_SLASH)PPCompiledExpressionsVerificationTest.$(O) \
$(OUTDIR_SLASH)PPCompiledSmalltalkVerificationTest.$(O) \
+ $(OUTDIR_SLASH)PPTokenizedExpressionsVerificationTest.$(O) \
$(OUTDIR_SLASH)PPTokenizedSmalltalkVerificationTest.$(O) \
--- a/compiler/tests/extras/PPCResources.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/PPCResources.st Tue May 12 01:57:37 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Extras-Tests-Support'
!
+
!PPCResources methodsFor:'expressions'!
expressionOfSize: size
@@ -53,26 +54,29 @@
2000 timesRepeat: [
sources add: (self expressionOfSize: 200).
].
- sources
+ sources
].
^ cache at: #expressionSourcesBig
-
+
+ "Modified: / 12-05-2015 / 01:44:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
expressionSourcesMedium
| sources |
-
+
cache at: #expressionSourcesMedium ifAbsentPut: [
sources := OrderedCollection new.
-
+
1000 timesRepeat: [
sources add: (self expressionOfSize: 100).
].
- sources
+ sources
].
^ cache at: #expressionSourcesMedium
-
+
+ "Created: / 12-05-2015 / 01:45:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!PPCResources methodsFor:'initialization'!
@@ -89,7 +93,9 @@
files := self readDirectory: directory.
files := self files: files withExtension: 'java'.
- ^ files collect: [ :f | (FileStream fileNamed: f) contents ]
+ ^ files collect: [ :f | (FileStream fileNamed: f) contents asString ]
+
+ "Modified: / 12-05-2015 / 01:50:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
javaLangMath
--- a/compiler/tests/extras/PPCompiledExpressionsVerificationTest.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/PPCompiledExpressionsVerificationTest.st Tue May 12 01:57:37 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Extras-Tests-Expressions'
!
+
!PPCompiledExpressionsVerificationTest class methodsFor:'as yet unclassified'!
resources
@@ -33,3 +34,10 @@
^ super testSanity
! !
+!PPCompiledExpressionsVerificationTest class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/extras/PPCompiledJavaSyntaxTest.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/PPCompiledJavaSyntaxTest.st Tue May 12 01:57:37 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Extras-Tests-Java'
!
+
!PPCompiledJavaSyntaxTest class methodsFor:'as yet unclassified'!
resources
--- a/compiler/tests/extras/PPCompiledSmalltalkVerificationTest.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/PPCompiledSmalltalkVerificationTest.st Tue May 12 01:57:37 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Extras-Tests-Smalltalk'
!
+
!PPCompiledSmalltalkVerificationTest class methodsFor:'as yet unclassified'!
resources
--- a/compiler/tests/extras/PPTokenizedSmalltalkGrammarResource.st Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/PPTokenizedSmalltalkGrammarResource.st Tue May 12 01:57:37 2015 +0100
@@ -9,6 +9,7 @@
category:'PetitCompiler-Extras-Tests-Smalltalk'
!
+
!PPTokenizedSmalltalkGrammarResource methodsFor:'as yet unclassified'!
setUp
--- a/compiler/tests/extras/abbrev.stc Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/abbrev.stc Tue May 12 01:57:37 2015 +0100
@@ -2,8 +2,8 @@
# this file is needed for stc to be able to compile modules independently.
# it provides information about a classes filename, category and especially namespace.
PPCCompiledJavaVerificationTest PPCCompiledJavaVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Java' 1
+PPCResources PPCResources stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Support' 1
PPCExpressionsVerificationTest PPCExpressionsVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
-PPCResources PPCResources stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Support' 1
PPCSmalltalkTests PPCSmalltalkTests stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
PPCSmalltalkVerificationTest PPCSmalltalkVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
PPCompiledJavaResource PPCompiledJavaResource stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Java' 1
@@ -13,7 +13,7 @@
PPTokenizedSmalltalkGrammarResource PPTokenizedSmalltalkGrammarResource stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
PPTokenizedSmalltalkGrammarTests PPTokenizedSmalltalkGrammarTests stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
stx_goodies_petitparser_compiler_tests_extras stx_goodies_petitparser_compiler_tests_extras stx:goodies/petitparser/compiler/tests/extras '* Projects & Packages *' 3
+PPCompiledSmalltalkVerificationTest PPCompiledSmalltalkVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
PPCompiledExpressionsVerificationTest PPCompiledExpressionsVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
-PPCompiledSmalltalkVerificationTest PPCompiledSmalltalkVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
+PPTokenizedSmalltalkVerificationTest PPTokenizedSmalltalkVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
PPTokenizedExpressionsVerificationTest PPTokenizedExpressionsVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Expressions' 1
-PPTokenizedSmalltalkVerificationTest PPTokenizedSmalltalkVerificationTest stx:goodies/petitparser/compiler/tests/extras 'PetitCompiler-Extras-Tests-Smalltalk' 1
--- a/compiler/tests/extras/bc.mak Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/bc.mak Tue May 12 01:57:37 2015 +0100
@@ -77,6 +77,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)PPCCompiledJavaVerificationTest.$(O) PPCCompiledJavaVerificationTest.$(H): PPCCompiledJavaVerificationTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPCExpressionsVerificationTest.$(O) PPCExpressionsVerificationTest.$(H): PPCExpressionsVerificationTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCResources.$(O) PPCResources.$(H): PPCResources.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestResource.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCSmalltalkTests.$(O) PPCSmalltalkTests.$(H): PPCSmalltalkTests.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCSmalltalkVerificationTest.$(O) PPCSmalltalkVerificationTest.$(H): PPCSmalltalkVerificationTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -86,7 +87,9 @@
$(OUTDIR)PPTokenizedSmalltalkGrammarResource.$(O) PPTokenizedSmalltalkGrammarResource.$(H): PPTokenizedSmalltalkGrammarResource.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestResource.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPTokenizedSmalltalkGrammarTests.$(O) PPTokenizedSmalltalkGrammarTests.$(H): PPTokenizedSmalltalkGrammarTests.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)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)PPCompiledExpressionsVerificationTest.$(O) PPCompiledExpressionsVerificationTest.$(H): PPCompiledExpressionsVerificationTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCExpressionsVerificationTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPCompiledSmalltalkVerificationTest.$(O) PPCompiledSmalltalkVerificationTest.$(H): PPCompiledSmalltalkVerificationTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCSmalltalkVerificationTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPTokenizedExpressionsVerificationTest.$(O) PPTokenizedExpressionsVerificationTest.$(H): PPTokenizedExpressionsVerificationTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCExpressionsVerificationTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PPTokenizedSmalltalkVerificationTest.$(O) PPTokenizedSmalltalkVerificationTest.$(H): PPTokenizedSmalltalkVerificationTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\compiler\tests\extras\PPCSmalltalkVerificationTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/compiler/tests/extras/libInit.cc Tue May 12 01:33:33 2015 +0100
+++ b/compiler/tests/extras/libInit.cc Tue May 12 01:57:37 2015 +0100
@@ -28,6 +28,7 @@
OBJ snd; struct __vmData__ *__pRT__; {
__BEGIN_PACKAGE2__("libstx_goodies_petitparser_compiler_tests_extras", _libstx_goodies_petitparser_compiler_tests_extras_Init, "stx:goodies/petitparser/compiler/tests/extras");
_PPCCompiledJavaVerificationTest_Init(pass,__pRT__,snd);
+_PPCExpressionsVerificationTest_Init(pass,__pRT__,snd);
_PPCResources_Init(pass,__pRT__,snd);
_PPCSmalltalkTests_Init(pass,__pRT__,snd);
_PPCSmalltalkVerificationTest_Init(pass,__pRT__,snd);
@@ -37,7 +38,9 @@
_PPTokenizedSmalltalkGrammarResource_Init(pass,__pRT__,snd);
_PPTokenizedSmalltalkGrammarTests_Init(pass,__pRT__,snd);
_stx_137goodies_137petitparser_137compiler_137tests_137extras_Init(pass,__pRT__,snd);
+_PPCompiledExpressionsVerificationTest_Init(pass,__pRT__,snd);
_PPCompiledSmalltalkVerificationTest_Init(pass,__pRT__,snd);
+_PPTokenizedExpressionsVerificationTest_Init(pass,__pRT__,snd);
_PPTokenizedSmalltalkVerificationTest_Init(pass,__pRT__,snd);
--- a/islands/abbrev.stc Tue May 12 01:33:33 2015 +0100
+++ b/islands/abbrev.stc Tue May 12 01:57:37 2015 +0100
@@ -8,5 +8,5 @@
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
-RobustXmlFeedParser RobustXmlFeedParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0