DOC target converges now with all three sources

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@274 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Sep 15, 2008 · 9cb8098 · 9cb8098
1 parent 09b7441
commit 9cb8098
Show file tree

Hide file tree

Showing 10 changed files with 2,923 additions and 10 deletions.
diff --git a/topics/java/jls3/collect.kw b/topics/java/jls3/collect.kw
@@ -1,8 +1,8 @@
 4.1
 4.2
-4.3
+4.3/2
 4.4
-4.5.1
+4.5.1/3
 6.5
 7.3
 7.4.1
@@ -61,7 +61,7 @@
 15.8
 15.8.1
 15.9
-15.10
+15.10/2
 15.11
 15.12/2
 15.13

diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile
@@ -2,9 +2,12 @@ validator = ../../../shared/tools/checkxml
 
 build:
 
-diff: test
+diff2: test
 	gdt bgf/jls1app.prepare1.refactorStatements.refactorTypes.structure1.addFeatures1to2.cropFeatures1.bgf bgf/jls2.prepare2.bgf
 
+diff: test
+	../../../shared/tools/gdt bgf/jls2doc.fixErrors2doc.enhanceModifiers.addFeatures2to3doc.bgf bgf/jls3doc.fixErrors3doc.bgf
+
 test:
 	python ../../convergence/lci/lci.py java.lcf architecture
 	@rm -f architecture*.dot

diff --git a/topics/java/lci/java-lci.csproj b/topics/java/lci/java-lci.csproj
@@ -59,14 +59,22 @@
     </None>
     <None Include="java.lcf" />
     <None Include="xbgf\addFeatures1to2.xbgf" />
+    <None Include="xbgf\addFeatures1to2doc.xbgf" />
     <None Include="xbgf\addFeatures2to3.xbgf" />
+    <None Include="xbgf\addFeatures2to3doc.xbgf" />
     <None Include="xbgf\cropFeatures1.xbgf" />
+    <None Include="xbgf\enhanceModifiers.xbgf" />
+    <None Include="xbgf\fixErrors1doc.xbgf" />
+    <None Include="xbgf\fixErrors2doc.xbgf" />
+    <None Include="xbgf\fixErrors3.xbgf" />
+    <None Include="xbgf\fixErrors3doc.xbgf" />
     <None Include="xbgf\preferLALR.xbgf" />
     <None Include="xbgf\prepare1.xbgf" />
     <None Include="xbgf\prepare2.xbgf" />
     <None Include="xbgf\prepare3.xbgf" />
     <None Include="xbgf\refactorStatements.xbgf" />
     <None Include="xbgf\refactorTypes.xbgf" />
+    <None Include="xbgf\restructure1doc.xbgf" />
     <None Include="xbgf\structure1.xbgf" />
   </ItemGroup>
 </Project>
diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -167,13 +167,18 @@
       <perform>fixErrors1doc</perform>
       <perform>restructure1doc</perform>
       <perform>addFeatures1to2doc</perform>
+      <perform>enhanceModifiers</perform>
+      <perform>addFeatures2to3doc</perform>
     </branch>
     <branch>
       <input>jls2doc</input>
       <perform>fixErrors2doc</perform>
+      <perform>enhanceModifiers</perform>
+      <perform>addFeatures2to3doc</perform>
     </branch>
     <branch>
       <input>jls3doc</input>
+      <perform>fixErrors3doc</perform>
     </branch>
   </target>
   <target>