now works from the ASF+SDF MetaEnvironment as well (always make clean…

… beforehand!)

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

topics/fl/asfsdf/FL.sdf

@@ -2,7 +2,7 @@ module FL
 
 imports Syntax
 imports Optimiser
-imports Calculator
+imports Numbers
 
 exports
 	context-free start-symbols 

topics/fl/asfsdf/Makefile

@@ -5,13 +5,13 @@ testcase = ../shared/factorial.txt
 
 all: FL.tbl FL.eqs test
 
-FL.eqs: Optimiser.asf Calculator.asf
+FL.eqs: Optimiser.asf Numbers.asf
 	eqs-dump -m Optimiser -o Optimiser.eqs
-	eqs-dump -m Calculator -o Calculator.eqs
+	eqs-dump -m Numbers -o Numbers.eqs
 	@LDIR=${PWD} ; cd ${asfl} ; eqs-dump -m basic/Integers -o $$LDIR/Integers.eqs
-	concat-asf -o FL.eqs Optimiser.eqs Integers.eqs Calculator.eqs
+	concat-asf -o FL.eqs Optimiser.eqs Integers.eqs Numbers.eqs
 
-FL.tbl: FL.sdf Syntax.sdf Numbers.sdf Optimiser.sdf Calculator.sdf
+FL.tbl: FL.sdf Syntax.sdf Numbers.sdf Optimiser.sdf
 	@if [ -r /usr/local/bin/pack-sdf ]; then \
 		make packbuild ; \
 	else \

topics/fl/asfsdf/Numbers.sdf

@@ -4,10 +4,20 @@ imports basic/Integers
 imports basic/Whitespace
 
 exports
-	sorts 
+	context-free start-symbols
 		Int
+	sorts
+		Int
+	context-free syntax
+		add-int(Int,Int) -> Int
+		toInt(Integer) -> Int
 	lexical syntax
-		"-"? NatCon 	-> Int
+		"-"? NatCon -> Int
 
 hiddens
-	context-free start-symbols Int
+        variables
+		"&N" [0-9]* -> NatCon
+		"&I" [0-9]* -> Int
+		"&H" [0-9]* -> Integer
+	lexical variables
+		"&LN" [0-9]* -> [0-9]+

topics/fl/asfsdf/Optimiser.sdf

@@ -1,7 +1,7 @@
 module Optimiser
 
 imports Syntax
-imports Calculator
+imports Numbers
 
 hiddens
 	context-free start-symbols Program