derive-free version with better XBGF modularisation

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@96 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Jul 30, 2008 · 44d041c · 44d041c
1 parent 863d2f7
commit 44d041c
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 54 deletions.
diff --git a/topics/fl/lci/Makefile b/topics/fl/lci/Makefile
@@ -4,7 +4,7 @@ schemata = ../../../shared/xsd
 build:
 
 test:
-	python ../../convergence/lci/lci.py fl-lci.cfg architecture.pdf
+	python ../../convergence/lci/lci.py fl-lci.cfg architecture
 
 check:
 	ls xbgf/*.xbgf | xargs java -jar ${validator} ${schemata}/xbgf.xsd
@@ -18,5 +18,5 @@ clean:
 	rm -f *.user
 	rm -f *.suo
 	rm -f sample*
-	rm -f architecture.*
+	rm -f architecture*
 
diff --git a/topics/fl/lci/fl-lci.cfg b/topics/fl/lci/fl-lci.cfg
@@ -20,9 +20,7 @@ ACTIONS
 	#	%2%		- in diff				macro for the second filename in a pair
 	extract
 		%tools%/%type%2bgf %args% bgf/%name%.bgf
-	derive
-		%tools%/xbgf bgf/%name%.bgf xbgf/%name%.xbgf bgf/%name%.%action%.bgf
-	unerase, abstract1, abstract2
+	unerase, abstract1, c2a, downcase, h2v, preferdcg, reroot, java3drop, downcase, omdrop, preferjaxb, stripterminals, layering, preferjava, xsdmassage
 		%tools%/xbgf bgf/%name%.bgf xbgf/%action%.xbgf bgf/%name%.%action%.bgf
 	validate
 		java -jar %validator% %bgfschema% bgf/%name%.bgf
@@ -39,10 +37,10 @@ SOURCES
 	antlr
 		antlr
 		 %fl%/java1/FL.g
-	java1
+	om
 		java
 		%fl%/java1 types
-	#java3
+	#jaxb
 	#	java
 	#	%fl%/java3 fl
 	dcg
@@ -53,15 +51,16 @@ TARGETS
 	# any number of input branches per target
 	# if more then one input, all results get to be pairwise diffed
 	java:
-		derive java1
+		reroot preferjaxb omdrop downcase om
+		#reroot java3drop downcase jaxb
 	xsdjava:
 		unerase java
-		derive xsd
-	dcgantlr:
-		derive dcg
-		derive antlr
+		xsdmassage preferjava downcase xsd
+	concrete:
+		reroot downcase dcg
+		reroot h2v preferdcg downcase antlr
 	abstract:
-		abstract2 dcgantlr
+		c2a layering stripterminals concrete
 		abstract1 xsdjava
 
 IMPLEMENTATIONS

diff --git a/topics/fl/lci/xbgf/abstract2.xbgf → topics/fl/lci/xbgf/c2a.xbgf b/topics/fl/lci/xbgf/abstract2.xbgf → topics/fl/lci/xbgf/c2a.xbgf
@@ -1,14 +1,6 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:strip>
-    <allTerminals/>
-  </xbgf:strip>
-  <xbgf:unite>
-    <add>atom</add>
-    <to>expr</to>
-  </xbgf:unite>
-  <xbgf:prune>eoln</xbgf:prune>
   <xbgf:massage>
     <bgf:production>
       <label>binary</label>
@@ -55,4 +47,4 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:permute>
-</xbgf:sequence>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/downcase.xbgf b/topics/fl/lci/xbgf/downcase.xbgf
@@ -0,0 +1,4 @@
+<xbgf:sequence
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:downcase/>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/antlr.xbgf → topics/fl/lci/xbgf/h2v.xbgf b/topics/fl/lci/xbgf/antlr.xbgf → topics/fl/lci/xbgf/h2v.xbgf
@@ -1,19 +1,6 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:downcase/>
-  <xbgf:rename>
-    <nonterminal>
-      <from>newline</from>
-      <to>eoln</to>
-    </nonterminal>
-  </xbgf:rename>
-  <xbgf:rename>
-    <nonterminal>
-      <from>id</from>
-      <to>name</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:vertical>
     <nonterminal>expr</nonterminal>
   </xbgf:vertical>

diff --git a/topics/fl/lci/xbgf/java3.xbgf → topics/fl/lci/xbgf/java3drop.xbgf b/topics/fl/lci/xbgf/java3.xbgf → topics/fl/lci/xbgf/java3drop.xbgf
diff --git a/topics/fl/lci/xbgf/layering.xbgf b/topics/fl/lci/xbgf/layering.xbgf
@@ -0,0 +1,9 @@
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:unite>
+    <add>atom</add>
+    <to>expr</to>
+  </xbgf:unite>
+  <xbgf:prune>eoln</xbgf:prune>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/omdrop.xbgf b/topics/fl/lci/xbgf/omdrop.xbgf
@@ -0,0 +1,3 @@
+<xbgf:sequence xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:undefine>visitor</xbgf:undefine>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/preferdcg.xbgf b/topics/fl/lci/xbgf/preferdcg.xbgf
@@ -0,0 +1,16 @@
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:rename>
+    <nonterminal>
+      <from>newline</from>
+      <to>eoln</to>
+    </nonterminal>
+  </xbgf:rename>
+  <xbgf:rename>
+    <nonterminal>
+      <from>id</from>
+      <to>name</to>
+    </nonterminal>
+  </xbgf:rename>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/preferjava.xbgf b/topics/fl/lci/xbgf/preferjava.xbgf
@@ -0,0 +1,17 @@
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:undefine>fragment</xbgf:undefine>
+  <xbgf:rename>
+    <nonterminal>
+      <from>xsd:string</from>
+      <to>string</to>
+    </nonterminal>
+  </xbgf:rename>
+  <xbgf:rename>
+    <nonterminal>
+      <from>xsd:int</from>
+      <to>int</to>
+    </nonterminal>
+  </xbgf:rename>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/java1.xbgf → topics/fl/lci/xbgf/preferjaxb.xbgf b/topics/fl/lci/xbgf/java1.xbgf → topics/fl/lci/xbgf/preferjaxb.xbgf
@@ -1,6 +1,4 @@
 <xbgf:sequence xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:downcase/>
-  <xbgf:undefine>visitor</xbgf:undefine>
   <xbgf:rename>
     <selector>
       <from>args</from>
@@ -13,7 +11,4 @@
       <to>function</to>
     </selector>
   </xbgf:rename>
-  <xbgf:reroot>
-    <root>program</root>
-  </xbgf:reroot>
 </xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/reroot.xbgf b/topics/fl/lci/xbgf/reroot.xbgf
@@ -0,0 +1,5 @@
+<xbgf:sequence xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:reroot>
+    <root>program</root>
+  </xbgf:reroot>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/stripterminals.xbgf b/topics/fl/lci/xbgf/stripterminals.xbgf
@@ -0,0 +1,7 @@
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:strip>
+    <allTerminals/>
+  </xbgf:strip>
+</xbgf:sequence>
diff --git a/topics/fl/lci/xbgf/xsd.xbgf b/topics/fl/lci/xbgf/xsd.xbgf
@@ -1,20 +1,6 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:downcase/>
-  <xbgf:undefine>fragment</xbgf:undefine>
-  <xbgf:rename>
-    <nonterminal>
-      <from>xsd:string</from>
-      <to>string</to>
-    </nonterminal>
-  </xbgf:rename>
-  <xbgf:rename>
-    <nonterminal>
-      <from>xsd:int</from>
-      <to>int</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:massage>
     <bgf:production>
       <nonterminal>program</nonterminal>