--- a/compiler/Make.proto	Tue Jul 28 07:16:10 2015 +0100
+++ b/compiler/Make.proto	Fri Jul 31 08:16:54 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/goodies/sunit -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
+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/PPCTokenizingCodeGenerator.st	Tue Jul 28 07:16:10 2015 +0100
+++ b/compiler/PPCTokenizingCodeGenerator.st	Fri Jul 31 08:16:54 2015 +0100
@@ -9,6 +9,7 @@
 	category:'PetitCompiler-Visitors'
 !
 
+
 !PPCTokenizingCodeGenerator methodsFor:'accessing'!
 
 guards
@@ -91,8 +92,10 @@
 
     node children do: [ :child |
         | tokenMethodName |
-        
-        child acceptsEpsilon ifTrue: [  
+
+        "TODO: JK: fix this in a proper way. Commented for now to make LRPParser cimpilable 
+         with tokenizing"
+        "child acceptsEpsilon"false ifTrue: [  
             possibleError := false.
             compiler codeAssignParsedValueOf:[ self visit:child ] to:self retvalVar.
             compiler codeReturn
@@ -125,7 +128,7 @@
         compiler codeError: 'no choice found'.
     ]
 
-    "Modified: / 10-05-2015 / 07:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 31-07-2015 / 08:07:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 visitDeterministicChoiceNode: node
@@ -220,3 +223,10 @@
     self error: 'shoudl not happend!!'
 ! !
 
+!PPCTokenizingCodeGenerator class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+

--- a/compiler/abbrev.stc	Tue Jul 28 07:16:10 2015 +0100
+++ b/compiler/abbrev.stc	Fri Jul 31 08:16:54 2015 +0100
@@ -8,7 +8,6 @@
 PEGFsaState PEGFsaState stx:goodies/petitparser/compiler 'PetitCompiler-FSA' 0
 PEGFsaTransition PEGFsaTransition stx:goodies/petitparser/compiler 'PetitCompiler-FSA' 0
 PPCASTUtilities PPCASTUtilities stx:goodies/petitparser/compiler 'PetitCompiler-Support' 0
-PPCASTUtilitiesTests PPCASTUtilitiesTests stx:goodies/petitparser/compiler 'PetitCompiler-Tests-Support' 1
 PPCArguments PPCArguments stx:goodies/petitparser/compiler 'PetitCompiler-Core' 0
 PPCBridge PPCBridge stx:goodies/petitparser/compiler 'PetitCompiler-Core' 0
 PPCClassBuilder PPCClassBuilder stx:goodies/petitparser/compiler 'PetitCompiler-Core' 0
@@ -108,3 +107,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	Tue Jul 28 07:16:10 2015 +0100
+++ b/compiler/bc.mak	Fri Jul 31 08:16:54 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\goodies\sunit -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
+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/stx_goodies_petitparser_compiler.st	Tue Jul 28 07:16:10 2015 +0100
+++ b/compiler/stx_goodies_petitparser_compiler.st	Fri Jul 31 08:16:54 2015 +0100
@@ -59,8 +59,7 @@
         #'stx:goodies/petitparser'    "PPActionParser - extended"
         #'stx:goodies/petitparser/parsers/java'    "PPJavaWhitespaceParser - extended"
         #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - extended"
-        #'stx:goodies/sunit'    "TestAsserter - superclass of PPCASTUtilitiesTests"
-        #'stx:libbasic'    "Character - extended"
+        #'stx:libbasic'    "Autoload - superclass of PPCASTUtilitiesTests"
     )
 !
 
@@ -119,7 +118,6 @@
         PEGFsaState
         PEGFsaTransition
         PPCASTUtilities
-        (PPCASTUtilitiesTests autoload)
         PPCArguments
         PPCBridge
         PPCClassBuilder
@@ -219,6 +217,7 @@
         PPCMappedActionNode
         PPCTokenStarMessagePredicateNode
         PPCTokenStarSeparatorNode
+        (PPCASTUtilitiesTests autoload)
     )
 !