semi-consistent state

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@293 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Sep 22, 2008 · cb28d86 · cb28d86
1 parent da67609
commit cb28d86
Show file tree

Hide file tree

Showing 9 changed files with 638 additions and 206 deletions.
diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile
@@ -5,8 +5,8 @@ build:
 diff2: test
 	gdt bgf/jls1app.prepare1.refactorStatements.refactorTypes.structure1.addFeatures1to2.cropFeatures1.bgf bgf/jls2.prepare2.bgf
 
-diff: test
-	../../../shared/tools/gdt bgf/jls2syntax.fixErrors2.prepare2.bgf bgf/jls2doc.fixErrors2doc.deyaccify2doc.inlineStatements2doc.inlineExpressions2doc.refactorDeclarations2doc.breakSemantics2doc.bgf
+diff:
+	../../../shared/tools/gdt bgf/jls2syntax.fixErrors2.prepare2.bgf bgf/jls2doc.fixErrors2doc.unifyModifiers.deyaccify2doc.refactorTypes.inlineStatements2doc.inlineExpressions2doc.refactorDeclarations2doc.breakSemantics2doc.bgf
 
 test:
 	python ../../convergence/lci/lci.py java.lcf architecture

diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -108,7 +108,9 @@
     <branch>
       <input>jls2doc</input>
       <perform>fixErrors2doc</perform>
+      <perform>unifyModifiers</perform>
       <perform>deyaccify2doc</perform>
+      <perform>refactorTypes</perform>
       <perform>inlineStatements2doc</perform>
       <perform>inlineExpressions2doc</perform>
       <perform>refactorDeclarations2doc</perform>

diff --git a/topics/java/lci/xbgf/breakSemantics2doc.xbgf b/topics/java/lci/xbgf/breakSemantics2doc.xbgf
@@ -22,42 +22,21 @@
     </bgf:production>
   </xbgf:remove>
 
-  <!--
-   - Fail: InterfaceDeclaration.
-      - [], ,([t(interface), n(Identifier), ?(,([t(extends), n(TypeList)])), n(InterfaceBody)])
+<!--
+   - Fail: SwitchBlockStatementGroup.
+      - [], ,([n(SwitchLabel), n(BlockStatements)])
      vs.
-      - [], ,([?(n(InterfaceModifiers)), n(Identifier), ?(,([t(extends), n(TypeList)])), n(InterfaceBody)])
-  -->
-  <xbgf:project>
-    <bgf:production>
-      <nonterminal>InterfaceDeclaration</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>interface</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>extends</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>TypeList</nonterminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>InterfaceBody</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:project>
+      - [], ,([n(SwitchLabels), n(BlockStatements)])
+-->
+  <xbgf:replace>
+    <bgf:expression>
+      <nonterminal>SwitchLabels</nonterminal>
+    </bgf:expression>
+    <bgf:expression>
+      <nonterminal>SwitchLabel</nonterminal>
+    </bgf:expression>
+    <in>
+      <nonterminal>SwitchBlockStatementGroup</nonterminal>
+    </in>
+  </xbgf:replace>
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/deyaccify2doc.xbgf b/topics/java/lci/xbgf/deyaccify2doc.xbgf
@@ -27,7 +27,6 @@
       <to>SwitchBlockStatementGroups</to>
     </nonterminal>
   </xbgf:rename>
-  <!-- replace by massage later -->
   <xbgf:massage>
     <bgf:expression>
       <optional>

diff --git a/topics/java/lci/xbgf/inlineExpressions2doc.xbgf b/topics/java/lci/xbgf/inlineExpressions2doc.xbgf
@@ -194,36 +194,7 @@
      vs.
       - [], ;([n(StatementExpressionList), ,([?(t(final)), n(Type), n(VariableDeclarators)])])
   -->
-  <!--xbgf:deyaccify>StatementExpressionList</xbgf:deyaccify-->
-  <!-- Use this while deyaccify doesn't work-->
-  <xbgf:undefine>StatementExpressionList</xbgf:undefine>
-  <xbgf:define>
-    <bgf:production>
-      <nonterminal>StatementExpressionList</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>StatementExpression</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <star>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>,</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>StatementExpression</nonterminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-            </star>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:define>
-  <!-- end of fake deyaccify -->
+  <xbgf:deyaccify>StatementExpressionList</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
       <nonterminal>MoreStatementExpressions</nonterminal>
@@ -253,36 +224,8 @@
      vs.
       - [], ,([t({), ?(n(VariableInitializers)), ?(t((,))), t(})])
   -->
-  <!--xbgf:deyaccify>VariableInitializers</xbgf:deyaccify-->
-  <!-- Use this while deyaccify doesn't work-->
-  <xbgf:undefine>VariableInitializers</xbgf:undefine>
-  <xbgf:define><bgf:production>
-    <nonterminal>VariableInitializers</nonterminal>
-    <bgf:expression>
-      <sequence>
-        <bgf:expression>
-          <nonterminal>VariableInitializer</nonterminal>
-        </bgf:expression>
-        <bgf:expression>
-          <star>
-            <bgf:expression>
-              <sequence>
-                <bgf:expression>
-                  <terminal>,</terminal>
-                </bgf:expression>
-                <bgf:expression>
-                  <nonterminal>VariableInitializer</nonterminal>
-                </bgf:expression>
-              </sequence>
-            </bgf:expression>
-          </star>
-        </bgf:expression>
-      </sequence>
-    </bgf:expression>
-  </bgf:production>
-</xbgf:define>
-  <!-- end of fake deyaccify -->
-  <xbgf:inline>VariableInitializers</xbgf:inline>
+  <xbgf:deyaccify>VariableInitializers</xbgf:deyaccify>
+   <xbgf:inline>VariableInitializers</xbgf:inline>
 
   <!--
   And one more time:
@@ -292,35 +235,6 @@
      vs.
       - [], ;([n(VariableDeclarator), ,([n(VariableDeclarators), t((,)), n(VariableDeclarator)])])
   -->
-  <!--xbgf:deyaccify>VariableDeclarators</xbgf:deyaccify-->
-  <!-- Use this while deyaccify doesn't work-->
-  <xbgf:undefine>VariableDeclarators</xbgf:undefine>
-  <xbgf:define>
-    <bgf:production>
-      <nonterminal>VariableDeclarators</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>VariableDeclarator</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <star>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>,</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>VariableDeclarator</nonterminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-            </star>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:define>
-  <!-- end of fake deyaccify -->
-
+  <xbgf:deyaccify>VariableDeclarators</xbgf:deyaccify>
+
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/prepare2.xbgf b/topics/java/lci/xbgf/prepare2.xbgf
@@ -4,15 +4,9 @@
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
-  <xbgf:vertical>
-    <nonterminal>Type</nonterminal>
-  </xbgf:vertical>
   <xbgf:vertical>
     <nonterminal>Primary</nonterminal>
   </xbgf:vertical>
-  <xbgf:vertical>
-    <nonterminal>Modifier</nonterminal>
-  </xbgf:vertical>
 
   <xbgf:vertical>
     <nonterminal>Selector</nonterminal>
@@ -29,9 +23,6 @@
   <xbgf:vertical>
     <nonterminal>InterfaceMemberDecl</nonterminal>
   </xbgf:vertical>
-  <xbgf:vertical>
-    <nonterminal>BasicType</nonterminal>
-  </xbgf:vertical>
 
   <xbgf:define>
     <bgf:production>