code restructuring

Parser/Makefile

@@ -2,22 +2,20 @@
 all: rats jastadd
 
 ast:
-	mkdir -p spec-gen
-	for f in spec/*.rats ; do f=$$(basename "$$f"); grep "^////" spec/$$f > spec-gen/$${f%.*}.ast ; done ; echo
-	sed -i 's|//// ||' spec-gen/*.ast
+	mkdir -p spec-gen/ast
+	for f in spec/parser/*.rats ; do f=$$(basename "$$f"); grep "^////" spec/parser/$$f > spec-gen/ast/$${f%.*}.ast ; done ; echo
+	sed -i 's|//// ||' spec-gen/ast/*.ast
 
 jastadd: ast
 	mkdir -p src-gen/org/tud/forty/ast
 	rm -f src-gen/org/tud/forty/ast/*
-	sed -i 's|class PrettyPrint|aspect PrettyPrint|' spec/Printing.jadd
-	sed -i 's|class PrettyPrint|aspect PrettyPrint|' spec/OmpPrinting.jadd
-	cd src-gen; java -jar ../tools/jastadd/jastadd2.jar --package="org.tud.forty.ast" --indent='2space' --rewrite=regular ../spec/*.ast ../spec-gen/*.ast ../spec/*.jadd ../spec/*.jrag
-	sed -i 's|aspect PrettyPrint|class PrettyPrint|' spec/Printing.jadd
-	sed -i 's|aspect PrettyPrint|class PrettyPrint|' spec/OmpPrinting.jadd
+	sed -i 's|class PrettyPrint |aspect PrettyPrint |' spec/printer/*.jadd
+	cd src-gen; java -jar ../tools/jastadd/jastadd2.jar --package="org.tud.forty.ast" --indent='2space' --rewrite=regular ../spec-gen/ast/* ../spec/printer/* ../spec/rewrites/* ../spec/semantics/*
+	sed -i 's|aspect PrettyPrint|class PrettyPrint|' spec/printer/*.jadd
 
 rats:
 	mkdir -p src-gen/org/tud/forty/parser
-	cd spec; java -jar ../tools/rats.jar -lgpl -out ../src-gen/org/tud/forty/parser SlottableFortranParser.rats
+	cd spec/parser; java -jar ../../tools/rats.jar -lgpl -out ../../src-gen/org/tud/forty/parser SlottableFortranParser.rats
 	./minify.sh
 
 doc:
@@ -26,15 +24,13 @@ doc:
 
 clean:
 	rm -rf doc/*
-	rm -f spec-gen/*
+	rm -rf spec-gen/*
 	rm -rf src-gen/*
 
 dot:
-	sed -i 's|class PrettyPrint|aspect PrettyPrint|' spec/Printing.jadd
-	sed -i 's|class PrettyPrint|aspect PrettyPrint|' spec/OmpPrinting.jadd
-	cd src-gen; java -jar ../tools/jastadd/jastadd2.jar --dot --package="org.tud.forty.ast" --indent='4space' ../spec/*.ast ../spec-gen/*.ast ../spec/*.jadd
-	sed -i 's|aspect PrettyPrint|class PrettyPrint|' spec/Printing.jadd
-	sed -i 's|aspect PrettyPrint|class PrettyPrint|' spec/OmpPrinting.jadd
+	sed -i 's|class PrettyPrint |aspect PrettyPrint |' spec/printer/*.jadd
+	cd src-gen; java -jar ../tools/jastadd/jastadd2.jar --dot --package="org.tud.forty.ast" --indent='4space' ../spec-gen/ast/* ../spec/printer/* ../spec/rewrites/* ../spec/semantics/*
+	sed -i 's|aspect PrettyPrint|class PrettyPrint|' spec/printer/*.jadd
 
 drfort:
 	javac -cp tools/rats.jar -d tools/DrFort/ src-gen/org/tud/forty/ast/* src-gen/org/tud/forty/parser/* src/DrFort.java

Parser/spec/ConditionalLinesPrinting.jadd → Parser/spec/printer/ConditionalLinesPrinting.jadd

-aspect PrettyPrint {
+class PrettyPrint {
     //// ConditionalExecutableConstruct:ExecutableConstruct ::= ExecutableConstruct;
     public void ConditionalExecutableConstruct.prettyPrint(PrettyPrinter s) {
         s.append("!$ ");