--- a/compiler/stx_goodies_petitparser_compiler.st	Tue Aug 18 22:46:10 2015 +0100
+++ b/compiler/stx_goodies_petitparser_compiler.st	Mon Aug 24 15:56:20 2015 +0100
@@ -16,15 +16,15 @@
     "The last merged version is: "
 
     ^ '
-    Name: PetitCompiler-JanKurs.20150510144201
-    Author: JanKurs
-    Time: 10-05-2015, 04:42:29.192 PM
-    UUID: 58a4786b-1182-4904-8b44-a13d3918f244
+    Name: PetitCompiler-JanVrany.170
+    Author: JanVrany
+    Time: 24-08-2015, 03:19:51.340 PM
+    UUID: c20a744f-3b41-4aaa-bb8a-71ce74a2a952       
     Repository: http://smalltalkhub.com/mc/JanKurs/PetitParser/main
     '
 
     "Created: / 03-10-2014 / 02:27:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 12-05-2015 / 01:19:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 24-08-2015 / 15:23:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 monticelloName
@@ -57,7 +57,6 @@
 
     ^ #(
         #'stx:goodies/petitparser'    "PPActionParser - extended"
-        #'stx:goodies/petitparser/parsers/java'    "PPJavaWhitespaceParser - extended"
         #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - extended"
         #'stx:goodies/refactoryBrowser/parser'    "RBLiteralNode - extended"
         #'stx:libbasic'    "Character - extended"
@@ -76,8 +75,8 @@
 
     ^ #(
         #'stx:goodies/petitparser/analyzer'    "PPSentinel - referenced by PPCompiledParser class>>referringParser"
+        #'stx:goodies/petitparser/parsers/java'    "PPJavaToken - referenced by PPParser>>javaToken"
         #'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"
     )
@@ -124,20 +123,17 @@
         PPCASTUtilities
         PPCArguments
         PPCBridge
+        PPCClass
         PPCClassBuilder
         PPCCodeBlock
         PPCCodeGen
         PPCCompilationError
         PPCCompilationWarning
         PPCCompiledMethod
-        PPCCompiler
-        PPCCompilerTokenErrorStrategy
-        PPCCompilerTokenRememberStrategy
-        PPCCompilerTokenizingErrorStrategy
-        PPCCompilerTokenizingRememberStrategy
         PPCConfiguration
         PPCContext
         PPCContextMemento
+        PPCDistinctScanner
         PPCGuard
         PPCIdGenerator
         PPCMethod
@@ -146,6 +142,7 @@
         PPCPluggableConfiguration
         PPCScanner
         PPCScannerCodeGenerator
+        PPCScannerError
         PPCScannerResultStrategy
         PPCTokenGuard
         PPCompiledParser
@@ -157,6 +154,7 @@
         PEGFsaDeterminizator
         PEGFsaEpsilonTransition
         PEGFsaGenerator
+        PEGFsaParserState
         PEGFsaPredicateTransition
         PEGFsaSequenceDeterminizator
         PEGFsaUncopiableState
@@ -169,22 +167,25 @@
         PPCDistinctResultStrategy
         PPCEndOfFileNode
         PPCFSACodeGen
+        PPCFSAVisitor
         PPCInlinedMethod
         PPCInliningVisitor
         PPCListNode
         PPCNilNode
+        PPCNoResultStrategy
         PPCPluggableNode
         PPCProfilingContext
         PPCRewritingVisitor
         PPCTokenCodeGenerator
         PPCTokenizingCodeGen
-        PPCTokenizingCompiler
         PPCTokenizingConfiguration
+        PPCUniversalCodeGen
         PPCUniversalConfiguration
         PPCUniversalResultStrategy
         PPCUnknownNode
         PPTokenizingCompiledParser
         PEGFsaEOFTransition
+        PEGFsaParserTransition
         PPCAbstractActionNode
         PPCAndNode
         PPCCharSetPredicateNode
@@ -221,6 +222,7 @@
         PPCTokenizingParserNode
         PPCTokenizingVisitor
         PPCTrimmingTokenNode
+        PPCUniversalCodeGenerator
         PPCActionNode
         PPCDeterministicChoiceNode
         PPCRecognizingSequenceNode
@@ -338,8 +340,6 @@
         PPContext atWs
         PPContext methodInvoked:
         PPContext setWs
-        PPJavaWhitespaceParser #'='
-        PPJavaWhitespaceParser hash
         PPParser compileAs:
         PPParser compileWithConfiguration:
         PPParser javaToken