Tell stc to NOT to inline #not as it has different meaning in PetitParser...
--- a/compiler/Make.spec Tue Apr 14 07:40:53 2015 +0100
+++ b/compiler/Make.spec Wed Apr 15 05:22:53 2015 +0100
@@ -34,7 +34,7 @@
# ********** OPTIONAL: MODIFY the next line(s) ***
# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
# STCLOCALOPTIMIZATIONS=+optspace3
-STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3 -inlinenot
# Argument(s) to the stc compiler (stc --usage).
--- a/compiler/PPCAbstractCharacterNode.st Tue Apr 14 07:40:53 2015 +0100
+++ b/compiler/PPCAbstractCharacterNode.st Wed Apr 15 05:22:53 2015 +0100
@@ -70,7 +70,7 @@
^ self stop: compiler.
!
-compileWith: compiler id: id.
+compileWith: compiler id: id
self start: compiler.
self body: compiler.
^ compiler stopMethod.
--- a/compiler/stx_goodies_petitparser_compiler.st Tue Apr 14 07:40:53 2015 +0100
+++ b/compiler/stx_goodies_petitparser_compiler.st Wed Apr 15 05:22:53 2015 +0100
@@ -78,6 +78,14 @@
)
!
+stcOptimizationOptions
+ "do not inline the not operation here - it is overwritten"
+
+ ^ super stcOptimizationOptions , ' -inlinenot'
+
+ "Created: / 13-04-2015 / 14:18:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
subProjects
"list packages which are known as subprojects.
The generated makefile will enter those and make there as well.
--- a/compiler/tests/Make.spec Tue Apr 14 07:40:53 2015 +0100
+++ b/compiler/tests/Make.spec Wed Apr 15 05:22:53 2015 +0100
@@ -34,7 +34,7 @@
# ********** OPTIONAL: MODIFY the next line(s) ***
# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
# STCLOCALOPTIMIZATIONS=+optspace3
-STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3 -inlinenot
# Argument(s) to the stc compiler (stc --usage).
--- a/compiler/tests/stx_goodies_petitparser_compiler_tests.st Tue Apr 14 07:40:53 2015 +0100
+++ b/compiler/tests/stx_goodies_petitparser_compiler_tests.st Wed Apr 15 05:22:53 2015 +0100
@@ -80,6 +80,14 @@
)
!
+stcOptimizationOptions
+ "do not inline the not operation here - it is overwritten"
+
+ ^ super stcOptimizationOptions , ' -inlinenot'
+
+ "Created: / 13-04-2015 / 14:18:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
subProjects
"list packages which are known as subprojects.
The generated makefile will enter those and make there as well.
--- a/parsers/smalltalk/Make.proto Tue Apr 14 07:40:53 2015 +0100
+++ b/parsers/smalltalk/Make.proto Wed Apr 15 05:22:53 2015 +0100
@@ -109,7 +109,7 @@
# build all packages containing referenced classes for this package
-# they are nor needed to compile the package
+# they are not needed to compile the package (but later, to load it)
references:
--- a/parsers/smalltalk/Make.spec Tue Apr 14 07:40:53 2015 +0100
+++ b/parsers/smalltalk/Make.spec Wed Apr 15 05:22:53 2015 +0100
@@ -34,7 +34,7 @@
# ********** OPTIONAL: MODIFY the next line(s) ***
# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
# STCLOCALOPTIMIZATIONS=+optspace3
-STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3 -inlinenot
# Argument(s) to the stc compiler (stc --usage).
--- a/parsers/smalltalk/stx_goodies_petitparser_parsers_smalltalk.st Tue Apr 14 07:40:53 2015 +0100
+++ b/parsers/smalltalk/stx_goodies_petitparser_parsers_smalltalk.st Wed Apr 15 05:22:53 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/parsers/smalltalk' }"
+"{ NameSpace: Smalltalk }"
+
LibraryDefinition subclass:#stx_goodies_petitparser_parsers_smalltalk
instanceVariableNames:''
classVariableNames:''
@@ -7,12 +9,6 @@
category:'* Projects & Packages *'
!
-!stx_goodies_petitparser_parsers_smalltalk class methodsFor:'documentation'!
-
-extensionsVersion_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
!stx_goodies_petitparser_parsers_smalltalk class methodsFor:'accessing - monticello'!
@@ -89,6 +85,14 @@
)
!
+stcOptimizationOptions
+ "do not inline the not operation here - it is overwritten"
+
+ ^ super stcOptimizationOptions , ' -inlinenot'
+
+ "Created: / 13-04-2015 / 14:18:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
subProjects
"list packages which are known as subprojects.
The generated makefile will enter those and make there as well.