more progress: consistent target naming, introduce instead of define,…

… unite-based unlayering, etc

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

topics/java/lci/Makefile

@@ -2,6 +2,10 @@ validator = ../../../shared/tools/checkxml
 
 build:
 
+diff2:
+	xbgf xbgf/unlayerExpressions3.xbgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.bgf foo
+	gdt xbgf.log bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.unlayerExpressions3.bgf | grep -v Ok
+
 diff:
 	gdt bgf/jls3app.fixErrors3.prepare3.bgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations3.refactorEnumDeclarations.refactorInterfaceDeclarations3.breakSemantics3doc.bgf
 

topics/java/lci/java.lcf

@@ -35,7 +35,7 @@
     </grammar>
   </tool>
 
-  <!--
+
   <source>
     <name>jls1app</name>
     <grammar>
@@ -69,7 +69,7 @@
       </extraction>
     </grammar>
   </source>
--->
+
 
   <source>
     <name>jls3app</name>
@@ -88,9 +88,9 @@
     </grammar>
   </source>
 
-  <!--
+
   <target>
-    <name>one</name>
+    <name>jls1</name>
     <branch>
       <input>jls1app</input>
       <perform>fixErrors1</perform>
@@ -105,7 +105,7 @@
   </target>
 
   <target>
-    <name>two</name>
+    <name>jls2</name>
     <branch>
       <input>jls2app</input>
       <perform>fixErrors2</perform>
@@ -128,9 +128,9 @@
       <perform>breakSemantics2doc</perform>
     </branch>
   </target>
-  -->
+
   <target>
-    <name>three</name>
+    <name>jls3</name>
     <branch>
       <input>jls3app</input>
       <perform>fixErrors3</perform>
@@ -152,11 +152,11 @@
     </branch>
   </target>
 
-  <!--
+
   <target>
     <name>onetwo</name>
     <branch>
-      <input>one</input>
+      <input>jls1</input>
       <perform>refactorStatements</perform>
       <perform>refactorTypes1</perform>
       <perform>upgradeDeclarations1to2</perform>
@@ -166,7 +166,7 @@
       <perform>cropFeatures1</perform>
     </branch>
     <branch>
-      <input>two</input>
+      <input>jls2</input>
     </branch>
   </target>
   <target>
@@ -177,14 +177,15 @@
       <perform>addFeatures2to3</perform>
     </branch>
     <branch>
-      <input>three</input>
+      <input>jls3</input>
     </branch>
     <branch>
-      <input>doc</input>
+      <input>jlsdoc</input>
     </branch>
   </target>
+
   <target>
-    <name>doc</name>
+    <name>jlsdoc</name>
     <branch>
       <input>jls1doc</input>
       <perform>fixErrors1doc</perform>
@@ -204,7 +205,7 @@
       <perform>fixErrors3doc</perform>
     </branch>
   </target>
-  
+  <!--
   <target>
     <name>formal</name>
     <branch>