consistent state: targets one, two and doc are reached

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@307 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Sep 24, 2008 · 13171f9 · 13171f9
1 parent 95349e4
commit 13171f9
Show file tree

Hide file tree

Showing 27 changed files with 1,666 additions and 454 deletions.
diff --git a/topics/java/jls1/collect.kw b/topics/java/jls1/collect.kw
@@ -15,7 +15,7 @@
 8.1.5
 8.3
 8.3.1
-8.4/2
+8.4
 8.4.1/2
 8.4.3
 8.4.4

diff --git a/topics/java/jls3/collect.kw b/topics/java/jls3/collect.kw
@@ -19,7 +19,7 @@
 8.1.6
 8.3
 8.3.1
-8.4/2
+8.4
 8.4.1/2
 8.4.3
 8.4.6

diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile
@@ -6,7 +6,10 @@ diff2: test
 	gdt bgf/jls1app.prepare1.refactorStatements.refactorTypes.structure1.addFeatures1to2.cropFeatures1.bgf bgf/jls2.prepare2.bgf
 
 diff:
-	../../../shared/tools/gdt bgf/jls2syntax.fixErrors2.prepare2.expandOps.bgf bgf/jls2doc.fixErrors2doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes.deyaccifyExpressions.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations.refactorDeclarations2doc.breakSemantics2doc.bgf
+	../../../shared/tools/xbgf xbgf/refactorMiscDeclarations.xbgf bgf/jls2doc.fixErrors2doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes.deyaccifyExpressions.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations.refactorInterfaceDeclarations.bgf bgf/jls2doc.fixErrors2doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes.deyaccifyExpressions.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations.refactorInterfaceDeclarations.refactorMiscDeclarations.bgf
+	../../../shared/tools/xbgf xbgf/breakSemantics2doc.xbgf bgf/jls2doc.fixErrors2doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes.deyaccifyExpressions.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations.refactorInterfaceDeclarations.refactorMiscDeclarations.bgf bgf/jls2doc.fixErrors2doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes.deyaccifyExpressions.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations.refactorInterfaceDeclarations.refactorMiscDeclarations.breakSemantics2doc.bgf
+	../../../shared/tools/gdt bgf/jls2syntax.fixErrors2.prepare2.expandOps.bgf bgf/jls2doc.fixErrors2doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes.deyaccifyExpressions.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations.refactorInterfaceDeclarations.refactorMiscDeclarations.breakSemantics2doc.bgf
+
 
 
 test:

diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -16,12 +16,12 @@
     </expansion>
   </shortcut>
 
-  <!--tool>
+  <tool>
     <name>validation</name>
     <grammar>
       <expand>tools</expand>/checkxml bgf
     </grammar>
-  </tool-->
+  </tool>
   <tool>
     <name>comparison</name>
     <grammar>
@@ -86,18 +86,19 @@
     </grammar>
   </source>
 
-  <!--target>
+  <target>
     <name>one</name>
     <branch>
       <input>jls1syntax</input>
       <perform>prepare1</perform>
     </branch>
     <branch>
       <input>jls1doc</input>
-      <perform>unifyNames</perform>
+      <perform>fixErrors1doc</perform>
+      <perform>unifyNames1</perform>
       <perform>preferLALR</perform>
     </branch>
-  </target-->
+  </target>
 
   <target>
     <name>two</name>
@@ -118,12 +119,13 @@
       <perform>inlineStatements2doc</perform>
       <perform>inlineExpressions2doc</perform>
       <perform>refactorClassDeclarations</perform>
-      <perform>refactorDeclarations2doc</perform>
+      <perform>refactorInterfaceDeclarations</perform>
+      <perform>refactorMiscDeclarations</perform>
       <perform>breakSemantics2doc</perform>
     </branch>
   </target>
 
-  <!--target>
+  <target>
     <name>three</name>
     <branch>
       <input>jls3syntax</input>
@@ -189,6 +191,7 @@
       <perform>fixErrors3doc</perform>
     </branch>
   </target>
+
   <target>
     <name>formal</name>
     <branch>
@@ -200,6 +203,6 @@
     <branch>
       <input>jls3syntax</input>
     </branch>
-  </target-->
+  </target>
 
 </lcf:configuration>
diff --git a/topics/java/lci/snapshot/architecture_small.pdf b/topics/java/lci/snapshot/architecture_small.pdf
diff --git a/topics/java/lci/xbgf/addFeatures1to2doc.xbgf b/topics/java/lci/xbgf/addFeatures1to2doc.xbgf
@@ -54,7 +54,32 @@
     </bgf:production>
   </xbgf:add>
   <xbgf:horizontal>FieldAccess</xbgf:horizontal>
-
+  <xbgf:define>
+    <bgf:production>
+      <nonterminal>ClassName</nonterminal>
+      <bgf:expression>
+        <choice>
+          <bgf:expression>
+            <nonterminal>Identifier</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <sequence>
+              <bgf:expression>
+                <nonterminal>AmbiguousName</nonterminal>
+              </bgf:expression>
+              <bgf:expression>
+                <terminal>.</terminal>
+              </bgf:expression>
+              <bgf:expression>
+                <nonterminal>Identifier</nonterminal>
+              </bgf:expression>
+            </sequence>
+          </bgf:expression>
+        </choice>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:define>
+
   <!--
      - Fail: LocalVariableDeclaration.
       - [], ,([n(Type), n(VariableDeclarators)])

diff --git a/topics/java/lci/xbgf/addFeatures2to3doc.xbgf b/topics/java/lci/xbgf/addFeatures2to3doc.xbgf
@@ -1222,40 +1222,11 @@
   </xbgf:strip>
 
   <!--
-     - Fail: FormalParameterList.
-      - [], ;([n(FormalParameter), ,([n(FormalParameterList), t((,)), n(FormalParameter)])])
-     vs.
-      - [], ;([n(LastFormalParameter), ,([n(FormalParameters), t((,)), n(LastFormalParameter)])])
      - Fail: ConstructorDeclarator.
-      - [], ,([n(SimpleTypeName), t((), ?(n(FormalParameterList)), t())])
+      - [], ,([n(Identifier), t((), ?(n(FormalParameterList)), t())])
      vs.
-      - [], ,([?(n(TypeParameters)), n(SimpleTypeName), t((), ?(n(FormalParameterList)), t())])
-
+      - [], ,([?(n(TypeParameters)), n(Identifier), t((), ?(n(FormalParameterList)), t())])
   -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>FormalParameterList</from>
-      <to>FormalParameters</to>
-    </nonterminal>
-  </xbgf:rename>
-  <xbgf:project>
-    <bgf:production>
-      <nonterminal>ConstructorDeclarator</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>SimpleTypeName</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:project>
   <xbgf:inject>
     <bgf:production>
       <nonterminal>ConstructorDeclarator</nonterminal>
@@ -1269,7 +1240,7 @@
             </optional>
           </bgf:expression>
           <bgf:expression>
-            <nonterminal>SimpleTypeName</nonterminal>
+            <nonterminal>Identifier</nonterminal>
           </bgf:expression>
           <bgf:expression>
             <terminal>(</terminal>
@@ -1288,6 +1259,46 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:inject>
+
+  <!--
+     - Fail: FormalParameterList.
+      - [], ;([n(FormalParameter), ,([n(FormalParameterList), t((,)), n(FormalParameter)])])
+     vs.
+      - [], ;([n(LastFormalParameter), ,([n(FormalParameters), t((,)), n(LastFormalParameter)])])
+   - Fail: MethodDeclarator.
+      - [], ,([n(Identifier), t((), ?(n(FormalParameters)), t())])
+     vs.
+      - [], ,([n(Identifier), t((), ?(n(FormalParameterList)), t())])
+
+  -->
+  <xbgf:rename>
+    <nonterminal>
+      <from>FormalParameterList</from>
+      <to>FormalParameters</to>
+    </nonterminal>
+  </xbgf:rename>
+  <xbgf:replace>
+    <bgf:expression>
+      <nonterminal>FormalParameters</nonterminal>
+    </bgf:expression>
+    <bgf:expression>
+      <nonterminal>FormalParameterList</nonterminal>
+    </bgf:expression>
+    <in>
+      <nonterminal>MethodDeclarator</nonterminal>
+    </in>
+  </xbgf:replace>
+  <xbgf:replace>
+    <bgf:expression>
+      <nonterminal>FormalParameters</nonterminal>
+    </bgf:expression>
+    <bgf:expression>
+      <nonterminal>FormalParameterList</nonterminal>
+    </bgf:expression>
+    <in>
+      <nonterminal>ConstructorDeclarator</nonterminal>
+    </in>
+  </xbgf:replace>
   <xbgf:define>
     <bgf:production>
       <nonterminal>FormalParameterList</nonterminal>
@@ -1343,74 +1354,6 @@
     </bgf:production>
   </xbgf:define>
 
-  <!--
-     - Fail: PrimaryNoNewArray.
-      - [], ;([n(Literal), ,([n(Type), t(.), t(class)]), ,([t(void), t(.), t(class)]), t(this), ,([t(ClassName), t(.), t(this)]), ,([t((), n(Expression), t())]), n(ClassInstanceCreationExpression), n(FieldAccess), n(MethodInvocation), n(ArrayAccess)])
-     vs.
-      - [], ;([n(Literal), ,([n(Type), t(.), t(class)]), ,([t(void), t(.), t(class)]), t(this), ,([n(ClassName), t(.), t(this)]), ,([t((), n(Expression), t())]), n(ClassInstanceCreationExpression), n(FieldAccess), n(MethodInvocation), n(ArrayAccess)])
-  -->
-  <xbgf:vertical>
-    <nonterminal>PrimaryNoNewArray</nonterminal>
-  </xbgf:vertical>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>PrimaryNoNewArray</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>ClassName</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>this</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:project>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>PrimaryNoNewArray</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>this</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:project>
-  <xbgf:inject>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>PrimaryNoNewArray</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>ClassName</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>this</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:inject>
-  <xbgf:horizontal>PrimaryNoNewArray</xbgf:horizontal>
-  <xbgf:strip>
-    <selector>target</selector>
-  </xbgf:strip>
-
   <!--
      - Fail: ConstantDeclaration.
       - [], ,([?(n(ConstantModifiers)), n(Type), n(VariableDeclarators)])