--- a/compiler/Make.spec	Fri Jul 31 14:07:31 2015 +0100
+++ b/compiler/Make.spec	Mon Aug 17 12:56:02 2015 +0100
@@ -52,10 +52,14 @@
 
 COMMON_CLASSES= \
 	PEGFsa \
+	PEGFsaAbstractDeterminizator \
 	PEGFsaFailure \
 	PEGFsaInterpret \
+	PEGFsaInterpretRecord \
+	PEGFsaMinimizator \
 	PEGFsaPair \
 	PEGFsaState \
+	PEGFsaStateInfo \
 	PEGFsaTransition \
 	PPCASTUtilities \
 	PPCArguments \
@@ -75,24 +79,34 @@
 	PPCContext \
 	PPCContextMemento \
 	PPCGuard \
+	PPCIdGenerator \
 	PPCMethod \
 	PPCNode \
 	PPCNodeVisitor \
 	PPCPluggableConfiguration \
 	PPCScanner \
 	PPCScannerCodeGenerator \
+	PPCScannerResultStrategy \
 	PPCTokenGuard \
 	PPCompiledParser \
 	PPMappedActionParser \
 	stx_goodies_petitparser_compiler \
 	FooScanner \
+	PEGFsaCharacterTransition \
+	PEGFsaChoiceDeterminizator \
+	PEGFsaDeterminizator \
+	PEGFsaEpsilonTransition \
 	PEGFsaGenerator \
+	PEGFsaPredicateTransition \
+	PEGFsaSequenceDeterminizator \
+	PEGFsaUncopiableState \
 	PPCAbstractLiteralNode \
 	PPCAbstractPredicateNode \
 	PPCAnyNode \
 	PPCCharacterNode \
 	PPCCodeGenerator \
 	PPCDelegateNode \
+	PPCDistinctResultStrategy \
 	PPCEndOfFileNode \
 	PPCFSACodeGen \
 	PPCInlinedMethod \
@@ -102,11 +116,15 @@
 	PPCPluggableNode \
 	PPCProfilingContext \
 	PPCRewritingVisitor \
+	PPCTokenCodeGenerator \
+	PPCTokenizingCodeGen \
 	PPCTokenizingCompiler \
 	PPCTokenizingConfiguration \
 	PPCUniversalConfiguration \
+	PPCUniversalResultStrategy \
 	PPCUnknownNode \
 	PPTokenizingCompiledParser \
+	PEGFsaEOFTransition \
 	PPCAbstractActionNode \
 	PPCAndNode \
 	PPCCharSetPredicateNode \
@@ -134,7 +152,6 @@
 	PPCSequenceNode \
 	PPCSpecializingVisitor \
 	PPCStarNode \
-	PPCTokenCodeGenerator \
 	PPCTokenConsumeNode \
 	PPCTokenDetector \
 	PPCTokenNode \
@@ -163,10 +180,14 @@
 
 COMMON_OBJS= \
     $(OUTDIR_SLASH)PEGFsa.$(O) \
+    $(OUTDIR_SLASH)PEGFsaAbstractDeterminizator.$(O) \
     $(OUTDIR_SLASH)PEGFsaFailure.$(O) \
     $(OUTDIR_SLASH)PEGFsaInterpret.$(O) \
+    $(OUTDIR_SLASH)PEGFsaInterpretRecord.$(O) \
+    $(OUTDIR_SLASH)PEGFsaMinimizator.$(O) \
     $(OUTDIR_SLASH)PEGFsaPair.$(O) \
     $(OUTDIR_SLASH)PEGFsaState.$(O) \
+    $(OUTDIR_SLASH)PEGFsaStateInfo.$(O) \
     $(OUTDIR_SLASH)PEGFsaTransition.$(O) \
     $(OUTDIR_SLASH)PPCASTUtilities.$(O) \
     $(OUTDIR_SLASH)PPCArguments.$(O) \
@@ -186,24 +207,34 @@
     $(OUTDIR_SLASH)PPCContext.$(O) \
     $(OUTDIR_SLASH)PPCContextMemento.$(O) \
     $(OUTDIR_SLASH)PPCGuard.$(O) \
+    $(OUTDIR_SLASH)PPCIdGenerator.$(O) \
     $(OUTDIR_SLASH)PPCMethod.$(O) \
     $(OUTDIR_SLASH)PPCNode.$(O) \
     $(OUTDIR_SLASH)PPCNodeVisitor.$(O) \
     $(OUTDIR_SLASH)PPCPluggableConfiguration.$(O) \
     $(OUTDIR_SLASH)PPCScanner.$(O) \
     $(OUTDIR_SLASH)PPCScannerCodeGenerator.$(O) \
+    $(OUTDIR_SLASH)PPCScannerResultStrategy.$(O) \
     $(OUTDIR_SLASH)PPCTokenGuard.$(O) \
     $(OUTDIR_SLASH)PPCompiledParser.$(O) \
     $(OUTDIR_SLASH)PPMappedActionParser.$(O) \
     $(OUTDIR_SLASH)stx_goodies_petitparser_compiler.$(O) \
     $(OUTDIR_SLASH)FooScanner.$(O) \
+    $(OUTDIR_SLASH)PEGFsaCharacterTransition.$(O) \
+    $(OUTDIR_SLASH)PEGFsaChoiceDeterminizator.$(O) \
+    $(OUTDIR_SLASH)PEGFsaDeterminizator.$(O) \
+    $(OUTDIR_SLASH)PEGFsaEpsilonTransition.$(O) \
     $(OUTDIR_SLASH)PEGFsaGenerator.$(O) \
+    $(OUTDIR_SLASH)PEGFsaPredicateTransition.$(O) \
+    $(OUTDIR_SLASH)PEGFsaSequenceDeterminizator.$(O) \
+    $(OUTDIR_SLASH)PEGFsaUncopiableState.$(O) \
     $(OUTDIR_SLASH)PPCAbstractLiteralNode.$(O) \
     $(OUTDIR_SLASH)PPCAbstractPredicateNode.$(O) \
     $(OUTDIR_SLASH)PPCAnyNode.$(O) \
     $(OUTDIR_SLASH)PPCCharacterNode.$(O) \
     $(OUTDIR_SLASH)PPCCodeGenerator.$(O) \
     $(OUTDIR_SLASH)PPCDelegateNode.$(O) \
+    $(OUTDIR_SLASH)PPCDistinctResultStrategy.$(O) \
     $(OUTDIR_SLASH)PPCEndOfFileNode.$(O) \
     $(OUTDIR_SLASH)PPCFSACodeGen.$(O) \
     $(OUTDIR_SLASH)PPCInlinedMethod.$(O) \
@@ -213,11 +244,15 @@
     $(OUTDIR_SLASH)PPCPluggableNode.$(O) \
     $(OUTDIR_SLASH)PPCProfilingContext.$(O) \
     $(OUTDIR_SLASH)PPCRewritingVisitor.$(O) \
+    $(OUTDIR_SLASH)PPCTokenCodeGenerator.$(O) \
+    $(OUTDIR_SLASH)PPCTokenizingCodeGen.$(O) \
     $(OUTDIR_SLASH)PPCTokenizingCompiler.$(O) \
     $(OUTDIR_SLASH)PPCTokenizingConfiguration.$(O) \
     $(OUTDIR_SLASH)PPCUniversalConfiguration.$(O) \
+    $(OUTDIR_SLASH)PPCUniversalResultStrategy.$(O) \
     $(OUTDIR_SLASH)PPCUnknownNode.$(O) \
     $(OUTDIR_SLASH)PPTokenizingCompiledParser.$(O) \
+    $(OUTDIR_SLASH)PEGFsaEOFTransition.$(O) \
     $(OUTDIR_SLASH)PPCAbstractActionNode.$(O) \
     $(OUTDIR_SLASH)PPCAndNode.$(O) \
     $(OUTDIR_SLASH)PPCCharSetPredicateNode.$(O) \
@@ -245,7 +280,6 @@
     $(OUTDIR_SLASH)PPCSequenceNode.$(O) \
     $(OUTDIR_SLASH)PPCSpecializingVisitor.$(O) \
     $(OUTDIR_SLASH)PPCStarNode.$(O) \
-    $(OUTDIR_SLASH)PPCTokenCodeGenerator.$(O) \
     $(OUTDIR_SLASH)PPCTokenConsumeNode.$(O) \
     $(OUTDIR_SLASH)PPCTokenDetector.$(O) \
     $(OUTDIR_SLASH)PPCTokenNode.$(O) \