--- a/compiler/stx_goodies_petitparser_compiler.st	Tue Apr 21 17:20:11 2015 +0100
+++ b/compiler/stx_goodies_petitparser_compiler.st	Thu Apr 30 23:43:14 2015 +0200
@@ -58,6 +58,7 @@
 
     ^ #(
         #'stx:goodies/petitparser'    "PPActionParser - extended"
+        #'stx:goodies/petitparser/parsers/java'    "PPJavaWhitespaceParser - extended"
         #'stx:goodies/petitparser/parsers/smalltalk'    "PPSmalltalkGrammar - extended"
         #'stx:libbasic'    "Character - extended"
     )
@@ -74,9 +75,8 @@
      by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
-        #'stx:libbasic2'    "Stack - referenced by PPCCompiler>>initialize"
-        #'stx:goodies/petitparser/analyzer'
-        #'stx:goodies/petitparser/islands'
+        #'stx:goodies/petitparser/analyzer'    "PPSentinel - referenced by PPCompiledParser class>>referringParser"
+        #'stx:libbasic2'    "Stack - referenced by PPCCompiler>>initializeForCompiledClassName:"
     )
 !
 
@@ -108,72 +108,74 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
+        PPCArguments
         PPCBridge
         PPCCompiledMethod
         PPCCompiler
+        PPCConfiguration
         PPCContext
         PPCContextMemento
         PPCGuard
         PPCMethod
-        PPCMethodStrategy
         PPCNode
-        PPCOptimizationResult
+        PPCNodeVisitor
         PPCompiledParser
         #'stx_goodies_petitparser_compiler'
         PPCAbstractCharacterNode
         PPCAbstractLiteralNode
         PPCAbstractPredicateNode
         PPCAnyNode
+        PPCCodeGenerator
         PPCDelegateNode
+        PPCEndOfFileNode
+        PPCFirstPrototype
         PPCInlinedMethod
+        PPCInliningVisitor
         PPCListNode
         PPCNilNode
+        PPCPluggableConfiguration
         PPCPluggableNode
         PPCProfilingContext
+        PPCRewritingVisitor
         PPCUnknownNode
         PPCAbstractActionNode
         PPCAndNode
         PPCCharSetPredicateNode
         PPCCharacterNode
         PPCChoiceNode
+        PPCCopyVisitor
         PPCForwardNode
-        PPCInlineAnyNode
-        PPCInlineCharacterNode
-        PPCInlineNilNode
-        PPCInlinePluggableNode
         PPCLiteralNode
+        PPCMergingVisitor
         PPCMessagePredicateNode
         PPCNegateNode
         PPCNotCharSetPredicateNode
         PPCNotLiteralNode
         PPCNotMessagePredicateNode
         PPCNotNode
+        PPCOptimizingVisitor
         PPCOptionalNode
         PPCPlusNode
         PPCPredicateNode
         PPCSentinelNode
         PPCSequenceNode
         PPCStarNode
+        PPCTokenConsumeNode
+        PPCTokenDetector
         PPCTokenNode
+        PPCTokenVisitor
+        PPCTokenizingCodeGenerator
         PPCTrimNode
         PPCTrimmingTokenNode
         PPCActionNode
-        PPCInlineCharSetPredicateNode
-        PPCInlineLiteralNode
-        PPCInlineMessagePredicateNode
-        PPCInlineNotCharSetPredicateNode
-        PPCInlineNotLiteralNode
-        PPCInlineNotMessagePredicateNode
+        PPCLLChoiceNode
         PPCStarAnyNode
         PPCStarCharSetPredicateNode
         PPCStarMessagePredicateNode
         PPCSymbolActionNode
         PPCTokenSequenceNode
-        PPCTokenActionNode
         PPCTokenStarMessagePredicateNode
-        PPCInlineTokenStarMessagePredicateNode
         PPCTokenStarSeparatorNode
-        PPCInlineTokenStarSeparatorNode
     )
 !
 
@@ -224,9 +226,6 @@
         PPParser compile
         PPParser compile:
         PPParser compile:andParse:
-        PPParser compile:parameters:
-        PPParser compileWith:
-        PPParser compileWithParameters:
         PPParser firstSetSuchThat:
         PPParser firstSetSuchThat:into:openSet:
         PPParser id
@@ -250,11 +249,9 @@
         PPSequenceParser compileWith:
         PPSequenceParser firstSetSuchThat:into:openSet:
         PPSmalltalkGrammar comment
-        PPSmalltalkGrammar updateContext:
         PPSmalltalkGrammar whitespace
         PPSmalltalkTokenParser compileWith:
         PPSmalltalkTokenParser parseOnX:
-        PPSmalltalkTokenParser updateContext:
         PPSmalltalkTokenParser whitespace
         PPSmalltalkWhitespaceParser #'='
         PPSmalltalkWhitespaceParser acceptsEpsilon
@@ -266,7 +263,6 @@
         PPToken isToken
         PPTokenParser asCompilerNode
         PPTokenParser displayName
-        PPTokenParser firstSets:into:
         PPTokenParser isFirstSetTerminal
         PPTokenParser isTokenParser
         PPTokenParser optimize
@@ -274,13 +270,21 @@
         PPTokenParser startsWith:
         PPTokenParser whitespace
         PPTrimmingParser asCompilerNode
-        PPTrimmingParser compileWith:
-        PPTrimmingParser firstSets:into:
         UndefinedObject asInteger
         UndefinedObject isAlphaNumeric
         UndefinedObject isDigit
         UndefinedObject isLetter
         UndefinedObject isSeparator
+        PPCharSetPredicate #'='
+        PPCharSetPredicate hash
+        PPContext atWs
+        PPContext methodInvoked:
+        PPContext setWs
+        PPJavaWhitespaceParser #'='
+        PPJavaWhitespaceParser hash
+        PPParser compileAs:
+        PPParser compileWithConfiguration:
+        PPParser javaToken
     )
 ! !