preprocessor & postprocessor

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@110 ab42f6e0-554d-0410-b580-99e487e6eeb2

topics/fl/asfsdf/FL.sdf

@@ -7,6 +7,5 @@ exports
 	context-free start-symbols 
 		PROGRAM
 	sorts
-		PROGRAM NEWLINE
-
+		PROGRAM
 

topics/fl/asfsdf/Makefile

@@ -1,18 +1,18 @@
-metaenv = ~/Tools/Meta
+metaenv = `which sdf2table | xargs dirname`/../share
 
 all:
 	make build
 	make test
 
 test:
-	cat suboptimal.trm
-	sglr -p FL.tbl -i suboptimal.trm | asfe -e FL.eqs | unparsePT
+	cat suboptimal.fl
+	cat suboptimal.fl | python pre.py | sglr -p FL.tbl | asfe -e FL.eqs | restorebrackets -p FL.tbl | unparsePT | python post.py
 
 build:
 	echo definition > FL.def
 	cat *.sdf syntax/*.sdf optimise/*.sdf >> FL.def
-	cat ${metaenv}/share/sdf-library/library/basic/*.sdf >> FL.def
-	cat ${metaenv}/share/asf-library/library/basic/*.sdf >> FL.def
+	cat ${metaenv}/sdf-library/library/basic/*.sdf >> FL.def
+	cat ${metaenv}/asf-library/library/basic/*.sdf >> FL.def
 	sdf2table -m FL FL.def
 
 clean:

topics/fl/asfsdf/optimise/FL.sdf

@@ -1,10 +1,10 @@
 module optimise/FL
 
 imports syntax/FL
-
+	
 hiddens
-	imports basic/Whitespace
 	context-free start-symbols PROGRAM
+
 	variables
 		"N"[0-9]*	-> FL-INT
 		"E"[0-9]*	-> EXPR
@@ -13,4 +13,4 @@ hiddens
 		"Fun*"		-> FUNCTION*
 		"Fun"		-> FUNCTION
 		"Program"	-> PROGRAM
-
+

topics/fl/asfsdf/post.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+import sys
+for line in sys.stdin:
+ print line.strip().split(';')[0]

topics/fl/asfsdf/pre.py

@@ -0,0 +1,5 @@
+#!/usr/bin/python
+import sys
+for line in sys.stdin:
+ if line.strip():
+  print line.strip(),';'

topics/fl/asfsdf/suboptimal.fl

@@ -0,0 +1,8 @@
+fun x = if (0 == 1) then 42 else (43 + 45)
+fdu y = 0 + 1 + 0 + 5 + 0 - 0
+fte z = if z then (2 + 3) else (2+3)
+fqu a = if (a==0) then (0+5) else (7 - 0)
+fse b = (b + 2) == (b + 2)
+mult n m = if (n==0) then 0 else (m + (mult (n - 1) m))
+fac n = if (n==0) then 1 else (mult n (fac (n - 1)))
+

topics/fl/asfsdf/syntax/FL.sdf

@@ -1,14 +1,15 @@
 module syntax/FL
 
 imports syntax/Numbers
+imports basic/Whitespace
 
 exports
 	sorts 
-		PROGRAM FUNCTION EXPR OPS NAME
+		PROGRAM FUNCTION EXPR OPS NAME NEWLINE
 
 	context-free syntax
 		FUNCTION+					-> PROGRAM
-		NAME NAME+ "=" EXPR NEWLINE+			-> FUNCTION
+		NAME NAME+ "=" EXPR NEWLINE			-> FUNCTION
 		EXPR OPS EXPR 					-> EXPR {left}	%% binary
 		NAME EXPR+					-> EXPR		%% apply
 		"if" EXPR "then" EXPR "else" EXPR			-> EXPR		%% ifthenelse
@@ -20,6 +21,7 @@ exports
 		"-"		-> OPS
 		"+"		-> OPS
 		"=="		-> OPS
+		";"		-> NEWLINE %% preprocessed
 
 	lexical syntax
 		[a-z]+			-> NAME
@@ -31,8 +33,3 @@ exports
 hiddens
 	context-free start-symbols 
 		PROGRAM
-	sorts
-		NEWLINE
-	lexical syntax
-		[\ \t]			-> LAYOUT
-		[\n]			-> NEWLINE

topics/fl/asfsdf/syntax/Numbers.sdf

@@ -1,6 +1,7 @@
 module syntax/Numbers
 
 imports basic/Integers
+imports basic/Whitespace
 
 exports
   sorts 
@@ -11,9 +12,6 @@ context-free syntax
 	"add-int" "(" FL-INT "," FL-INT ")" -> FL-INT
 
 hiddens
-
-	imports basic/Whitespace
-
 	context-free start-symbols FL-INT
 
 	context-free syntax