Using the XML features of LCI

+ Baseline architecture in generated PDFs


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

topics/fl/lci/Makefile

@@ -3,13 +3,11 @@ schemata = ../../../shared/xsd
 
 build:
 
-xml:
-	java -jar ${validator} -warning ${schemata}/lcf.xsd fl.xml
-
 test:
-	python ../../convergence/lci/lci.py fl-lci.cfg architecture
+	python ../../convergence/lci/lci.py xml fl.lcf architecture
 
 check:
+	java -jar ${validator} -warning ${schemata}/lcf.xsd fl.lcf
 	ls xbgf/*.xbgf | xargs java -jar ${validator} ${schemata}/xbgf.xsd
 	ls bgf/*.bgf | xargs java -jar ${validator} ${schemata}/bgf.xsd
 

topics/fl/lci/fl-lci.cfg

@@ -13,19 +13,19 @@ ACTIONS
 	# if validate is present, extracted bgfs and all bgfs produced by transformations will be validated with it
 	# besides shortcuts, one can use these variables:
 	#	%action%	- everywhere			macro for the name of the action
-	#	%name%	- everywhere			macro for the name of the source
+	#	%source%	- everywhere			macro for the name of the source
 	#	%type%		- in extract			macro for the type of the source
-	#	%args%		- in extract			macro for the extraction arguments
-	#	%1%		- in diff				macro for the first filename in a pair
-	#	%2%		- in diff				macro for the second filename in a pair
+	#	%arguments%		- in extract			macro for the extraction arguments
+	#	%first%		- in diff				macro for the first filename in a pair
+	#	%second%		- in diff				macro for the second filename in a pair
 	extract
-		%tools%/%type%2bgf %args% bgf/%name%.bgf
+		%tools%/%type%2bgf %arguments% bgf/%source%.bgf
 	unerase, abstract1, c2a, downcase, h2v, preferdcg, reroot, jaxbdrop, downcase, omdrop, preferjaxb, stripterminals, layering, preferjava, xsdmassage
-		%tools%/xbgf bgf/%name%.bgf xbgf/%action%.xbgf bgf/%name%.%action%.bgf
+		%tools%/xbgf bgf/%source%.bgf xbgf/%action%.xbgf bgf/%source%.%action%.bgf
 	validate
-		java -jar %validator% %bgfschema% bgf/%name%.bgf
+		java -jar %validator% %bgfschema% bgf/%source%.bgf
 	diff
-		%tools%/bdt bgf/%1%.bgf bgf/%2%.bgf
+		%tools%/bdt bgf/%first%.bgf bgf/%second%.bgf
 	test
 		xsltproc %slps%/shared/xsl/ldf2samples.xslt %baseldf% >samples.xml
 

topics/fl/lci/fl-lci.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30428</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9DF685A6-6572-47F9-8DE3-1E827BFDB62F}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -45,6 +45,9 @@
     <None Include="..\..\..\shared\xsd\btf.xsd">
       <Link>btf.xsd</Link>
     </None>
+    <None Include="..\..\..\shared\xsd\lcf.xsd">
+      <Link>lcf.xsd</Link>
+    </None>
     <None Include="..\..\..\shared\xsd\ldf.xsd">
       <Link>ldf.xsd</Link>
     </None>
@@ -54,13 +57,21 @@
     <None Include="..\..\..\shared\xsd\xbgf.xsd">
       <Link>xbgf.xsd</Link>
     </None>
+    <None Include="fl.lcf" />
     <None Include="xbgf\abstract1.xbgf" />
-    <None Include="xbgf\abstract2.xbgf" />
-    <None Include="xbgf\antlr.xbgf" />
+    <None Include="xbgf\c2a.xbgf" />
     <None Include="xbgf\dcg.xbgf" />
-    <None Include="xbgf\java1.xbgf" />
-    <None Include="xbgf\java3.xbgf" />
+    <None Include="xbgf\downcase.xbgf" />
+    <None Include="xbgf\h2v.xbgf" />
+    <None Include="xbgf\jaxbdrop.xbgf" />
+    <None Include="xbgf\layering.xbgf" />
+    <None Include="xbgf\omdrop.xbgf" />
+    <None Include="xbgf\preferdcg.xbgf" />
+    <None Include="xbgf\preferjava.xbgf" />
+    <None Include="xbgf\preferjaxb.xbgf" />
+    <None Include="xbgf\reroot.xbgf" />
+    <None Include="xbgf\stripterminals.xbgf" />
     <None Include="xbgf\unerase.xbgf" />
-    <None Include="xbgf\xsd.xbgf" />
+    <None Include="xbgf\xsdmassage.xbgf" />
   </ItemGroup>
 </Project>

topics/fl/lci/fl.lcf

@@ -41,7 +41,7 @@
   <shortcut>
     <name>rundcgdir</name>
     <definition>
-      <expand>fl</expand>prolog
+      <expand>fl</expand>/prolog
     </definition>
   </shortcut>
   <comment>
@@ -183,56 +183,58 @@
   <target>
     <name>java</name>
     <branch>
-      <perform>reroot</perform>
-      <perform>preferjaxb</perform>
-      <perform>omdrop</perform>
+      <take>om</take>
       <perform>downcase</perform>
-      <on>om</on>
+      <perform>omdrop</perform>
+      <perform>preferjaxb</perform>
+      <perform>reroot</perform>
     </branch>
     <branch>
-      <perform>reroot</perform>
-      <perform>jaxbdrop</perform>
+      <take>jaxb</take>
       <perform>downcase</perform>
-      <on>jaxb</on>
+      <perform>jaxbdrop</perform>
+      <perform>reroot</perform>
     </branch>
   </target>
   <target>
     <name>xsdjava</name>
     <branch>
+      <take>java</take>
       <perform>unerase</perform>
-      <on>java</on>
     </branch>
     <branch>
-      <perform>xsdmassage</perform>
-      <perform>preferjava</perform>
+      <take>xsd</take>
       <perform>downcase</perform>
-      <on>xsd</on>
+      <perform>preferjava</perform>
+      <perform>xsdmassage</perform>
     </branch>
   </target>
   <target>
     <name>concrete</name>
     <branch>
-      <perform>reroot</perform>
+      <take>dcg</take>
       <perform>downcase</perform>
-      <on>dcg</on>
+      <perform>reroot</perform>
     </branch>
     <branch>
-      <perform>reroot</perform>
-      <perform>h2v</perform>
-      <perform>preferdcg</perform>
+      <take>antlr</take>
       <perform>downcase</perform>
-      <on>antlr</on>
+      <perform>preferdcg</perform>
+      <perform>h2v</perform>
+      <perform>reroot</perform>
     </branch>
-</target>
+  </target>
   <target>
     <name>abstract</name>
     <branch>
-      <perform>c2a layering stripterminals</perform>
-      <on>concrete</on>
+      <take>concrete</take>
+      <perform>stripterminals</perform>
+      <perform>layering</perform>
+      <perform>c2a</perform>
     </branch>
     <branch>
+      <take>xsdjava</take>
       <perform>abstract1</perform>
-      <on>xsdjava</on>
     </branch>
   </target>
 </lcf:configuration>