Inside peg.d the ParseTree change to a mixin template

.gitignore

@@ -45,3 +45,12 @@ build/*
 
 .vscode/
 
+# Emacs
+*#
+*.parked
+
+# Pegged self generator
+pegged/dev/peggedgrammar
+
+# Test .done
+.done

dub.json

@@ -8,6 +8,8 @@
         "pegged/peg.d",
         "pegged/grammar.d",
         "pegged/parser.d",
+        "pegged/parsetree.d",
+        "pegged/defaultparsetree.d",
         "pegged/introspection.d",
         "pegged/tohtml.d",
         "pegged/dynamic/grammar.d",

examples/arithmetic/src/pegged/examples/arithmetic.d

@@ -7,6 +7,7 @@ module pegged.examples.arithmetic;
 import std.conv: to;
 
 import pegged.grammar;
+import pegged.defaultparsetree : ParseTree = DefaultParseTree;
 
 mixin(grammar(`
 # Arithmetic grammar with variable terminal

examples/c/src/pegged/examples/cparser.d

@@ -2,7 +2,7 @@ module pegged.examples.cparser;
 
 import pegged.grammar;
 
-struct C
+@safe struct C
 {
     enum names = [`TranslationUnit`:true, `ExternalDeclaration`:true, `FunctionDefinition`:true, `PrimaryExpression`:true,
     `PostfixExpression`:true, `ArgumentExpressionList`:true, `UnaryExpression`:true, `IncrementExpression`:true, `PlusPlus`:true,
@@ -21,7 +21,9 @@ struct C
     `Keyword`:true, `Spacing`:true, `Comment`:true, `StringLiteral`:true, `DQChar`:true, `EscapeSequence`:true, `CharLiteral`:true, `IntegerLiteral`:true,
     `Integer`:true, `IntegerSuffix`:true, `FloatLiteral`:true, `Sign`:true];
 
-    mixin decimateTree;
+    import pegged.defaultparsetree : ParseTree = DefaultParseTree;
+    mixin decimateTree!ParseTree;
+    mixin DefaultPatters!ParseTree;
 
     static ParseTree TranslationUnit(ParseTree p)
     {

examples/parameterized/src/pegged/examples/parameterized.d

@@ -113,7 +113,7 @@ unittest
         A <- Parameterized.LineComment
     "));
 
-    ParseTree p5 = ParamTest5("// This is a comment!
+    auto p5 = ParamTest5("// This is a comment!
     This is not a comment.
     End.");
     assert(p5.successful);

examples/simple_arithmetic/src/pegged/examples/simple_arithmetic.d

@@ -7,7 +7,7 @@ module pegged.examples.simple_arithmetic;
 import std.conv: to;
 
 import pegged.grammar;
-
+import pegged.defaultparsetree : ParseTree = DefaultParseTree;
 mixin(grammar(`
 Arithmetic:
     Term     < Factor (Add / Sub)*

makefile

@@ -1,11 +1,47 @@
+include setup.mk
+
 all:
 	if [ -x /usr/bin/dmd ]; then \
-		dmd -w -wi -O -release -noboundscheck -lib -oflibpegged.a pegged/peg.d pegged/grammar.d pegged/parser.d pegged/introspection.d pegged/dynamic/grammar.d pegged/dynamic/peg.d; \
+		dmd -w -wi -O -release -noboundscheck -lib -oflibpegged.a $(DFILES); \
 	elif [ -x /usr/bin/ldc2 ]; then \
-		ldc2 -w -wi -O2 -release -boundscheck=off -c -of=libpegged.a pegged/peg.d pegged/grammar.d pegged/parser.d pegged/dynamic/grammar.d pegged/dynamic/peg.d; \
+		ldc2 -w -wi -O2 -release -boundscheck=off -c -of=libpegged.a $(DFILES); \
 	elif [ -x /usr/bin/gdc ]; then \
-		gdc -Wall -O2 -frelease -fbounds-check=off -c -olibpegged.a pegged/peg.d pegged/grammar.d pegged/parser.d pegged/dynamic/grammar.d pegged/dynamic/peg.d; \
+		gdc -Wall -O2 -frelease -fbounds-check=off -c -olibpegged.a $(DFILES); \
 	fi
 
 clean:
 		rm -f libpegged.a
+
+info:
+	@echo "DFILES = $(DFILES)"
+
+ALL_PEG:=${shell find examples -maxdepth 1 -type d -not -path examples}
+
+define Pegs
+$1/.done:
+	cd $1; dub test
+	touch $1/.done
+
+endef
+
+${foreach DONE,$(ALL_PEG), ${eval ${call Pegs,$(DONE)}}}
+
+DO_ALL := ${addsuffix /.done,$(ALL_PEG)}
+
+test-all: $(DO_ALL)
+
+test-clean:
+	rm -f $(DO_ALL)
+
+export DO_ALL_PEG=${foreach DONE,$(ALL_PEG), ${call Pegs,$(DONE)}}
+
+
+CALL_PEG:=${call Pegs,c}}
+
+export CALL_PEG
+
+show:
+	@echo "$$CALL_PEG"
+	@echo "$$DO_ALL_PEG"
+	@echo $(ALL_PEG)
+	@echo $(DO_ALL)

pegged/defaultparsetree.d

@@ -0,0 +1,32 @@
+/**
+   This module contaits functions and parameter for ParseTree data element
+ */
+module pegged.defaultparsetree;
+
+import std.traits : isType, ReturnType, ForeachType, isCallable, Unqual;
+
+private import pegged.peg : ParseCollectionsM;
+private import pegged.dynamic.peg : DynamicPeg;
+import pegged.parsetree : isParseTree, ParseTreeM;
+/**
+   The basic parse tree, as used throughout the project.
+   You can define your own parse tree node, but respect the basic layout.
+   Example:
+   struct MyParseTree {
+       mixin ParseTreeM;
+       ... My own stuff
+   }
+*/
+
+struct DefaultParseTree {
+    mixin ParseTreeM;
+    mixin ParseCollectionsM;
+    alias DPEG=DynamicPeg!(ParseTree);
+//    mixin DynamicParseCollectionsM;
+
+}
+
+//mixin DynmicParseCollectionM!(ParseTree);
+
+
+static assert(isParseTree!DefaultParseTree);

pegged/dev/Makefile

@@ -0,0 +1,11 @@
+
+DCFALGS+=-I../../
+DCFALGS+=-I../../examples/peggedgrammar/src/
+LDFLAGS+=../../libpegged.a
+DFILES+=../../examples/peggedgrammar/src/pegged/examples/peggedgrammar.d
+
+all:
+	dmd $(DCFALGS) $(DFILES) regenerate.d $(LDFLAGS)
+
+clean:
+	rm -f regenerate

pegged/dev/regenerate.d

@@ -5,7 +5,7 @@ module pegged.dev.regenerate;
 
 import pegged.grammar;
 import pegged.examples.peggedgrammar;
-import pegged.examples.testergrammar;
+//import pegged.examples.testergrammar;
 
 void main()
 {