convergence progress; bug fixed in the xbgf overview

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@399 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Oct 31, 2008 · 1fdc002 · 1fdc002
1 parent d4085f5
commit 1fdc002
Show file tree

Hide file tree

Showing 10 changed files with 876 additions and 30 deletions.
diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile
@@ -4,7 +4,7 @@ build:
 
 diff:
 	python ../../convergence/lci/lci.py java3.lcf architecture
-	gdts bgf/app3.fixErrors3.prepare3.allowMultipleLabels.bgf bgf/doc3.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.unlayerExpressions3.inlineStatements2doc.inlineExpressions3doc.refactorClassDeclarations3.refactorInterfaceDeclarations3.refactorMiscDeclarations3.breakSemantics3doc.bgf
+	gdts bgf/app3.correct.refactor.generalizeLabels.generalizeBlock.generalize.bgf bgf/doc3.correct.generalizeModifiers.generalizeNames.deyaccify.refactorTypes.refactorExpressions.inlineStatements.generalizeStatements.refactorStatements.editExpressions.refactorClasses.refactorInterfaces.refactorEnums.refactorDeclarations.edit.bgf
 
 test:
 	python ../../convergence/lci/lci.py java.lcf architecture

diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -150,6 +150,8 @@
       <perform>refactorTypes-doc3</perform>
       <perform>refactorExpressions-doc3</perform>
       <perform>inlineStatements</perform>
+      <perform>generalizeStatements</perform>
+      <perform>refactorStatements-doc3</perform>
       <perform>editExpressions</perform>
       <perform>refactorClasses-doc3</perform>
       <perform>refactorInterfaces-doc3</perform>
@@ -163,7 +165,7 @@
     <name>jls12</name>
     <branch>
       <input>jls1</input>
-      <perform>refactorStatements</perform>
+      <perform>refactorStatements-jls1</perform>
       <perform>generalizeStatements</perform>
       <perform>refactorTypes-jls1</perform>
       <perform>editDeclarations</perform>

diff --git a/topics/java/lci/xbgf/correct-app3.xbgf b/topics/java/lci/xbgf/correct-app3.xbgf
@@ -133,4 +133,110 @@ Annotation:
     </bgf:production>
   </xbgf:define>
 
+  <!--   ISSUE CORRECT SPECERROR
+  - Fail: Statement.
+      - [], ;([n(Block),
+              ,([t(break), ?(n(Identifier))]),
+     vs.
+      - [], ;([n(Block),
+               ,([t(break), ?(n(Identifier)), t((;))]),
+-->
+  <!-- REVISE -->
+  <xbgf:replace>
+    <bgf:expression>
+      <sequence>
+        <bgf:expression>
+          <terminal>break</terminal>
+        </bgf:expression>
+        <bgf:expression>
+          <optional>
+            <bgf:expression>
+              <nonterminal>Identifier</nonterminal>
+            </bgf:expression>
+          </optional>
+        </bgf:expression>
+      </sequence>
+    </bgf:expression>
+    <bgf:expression>
+      <sequence>
+        <bgf:expression>
+          <terminal>break</terminal>
+        </bgf:expression>
+        <bgf:expression>
+          <optional>
+            <bgf:expression>
+              <nonterminal>Identifier</nonterminal>
+            </bgf:expression>
+          </optional>
+        </bgf:expression>
+        <bgf:expression>
+          <terminal>;</terminal>
+        </bgf:expression>
+      </sequence>
+    </bgf:expression>
+  </xbgf:replace>
+
+  <!--   ISSUE CORRECT SPECERROR
+         same with continue -->
+  <xbgf:replace>
+    <bgf:expression>
+      <sequence>
+        <bgf:expression>
+          <terminal>continue</terminal>
+        </bgf:expression>
+        <bgf:expression>
+          <optional>
+            <bgf:expression>
+              <nonterminal>Identifier</nonterminal>
+            </bgf:expression>
+          </optional>
+        </bgf:expression>
+      </sequence>
+    </bgf:expression>
+    <bgf:expression>
+      <sequence>
+        <bgf:expression>
+          <terminal>continue</terminal>
+        </bgf:expression>
+        <bgf:expression>
+          <optional>
+            <bgf:expression>
+              <nonterminal>Identifier</nonterminal>
+            </bgf:expression>
+          </optional>
+        </bgf:expression>
+        <bgf:expression>
+          <terminal>;</terminal>
+        </bgf:expression>
+      </sequence>
+    </bgf:expression>
+  </xbgf:replace>
+
+  <!-- ISSUE CORRECT 
+  forgotten comma
+  ElementValues:
+        ElementValue [ ElementValues ]
+  should be
+  ElementValues:
+        ElementValue [ "," ElementValues ]
+  -->
+  <!-- REVISE -->
+  <xbgf:replace>
+    <bgf:expression>
+      <nonterminal>ElementValues</nonterminal>
+    </bgf:expression>
+    <bgf:expression>
+      <sequence>
+        <bgf:expression>
+          <terminal>,</terminal>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>ElementValues</nonterminal>
+        </bgf:expression>
+      </sequence>
+    </bgf:expression>
+    <in>
+      <nonterminal>ElementValues</nonterminal>
+    </in>
+  </xbgf:replace>
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/edit-doc3.xbgf b/topics/java/lci/xbgf/edit-doc3.xbgf
@@ -2,26 +2,6 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- 
-  NOT semantic-preserving in any way.
-
-   - Fail: MethodBody.
-      - [], n(Block)
-     vs.
-      - [], ;([n(Block), t((;))])
-  -->
-  <xbgf:vertical>
-    <nonterminal>MethodBody</nonterminal>
-  </xbgf:vertical>
-  <xbgf:remove>
-    <bgf:production>
-      <nonterminal>MethodBody</nonterminal>
-      <bgf:expression>
-        <terminal>;</terminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:remove>
-
   <!--  somehow NonWildcardTypeArguments was used anyway
    - Fail: Primary.
       - [], ,([n(NonWildcardTypeArguments), ;([n(ExplicitGenericInvocationSuffix), ,([t(this), n(Arguments)])])])

diff --git a/topics/java/lci/xbgf/inlineStatements.xbgf b/topics/java/lci/xbgf/inlineStatements.xbgf
@@ -136,7 +136,7 @@
       - [], ,([t(switch), n(ParExpression), t({), n(SwitchBlockStatementGroups), t(})])
      vs.
       - [], ,([t(switch), n(ParExpression), t({), n(SwitchBlockStatementGroups), ?(n(SwitchLabels)), t(})])
-  -->
+  -->
   <!-- GENERALITY -->
   <xbgf:project>
     <bgf:production>
@@ -295,5 +295,5 @@
   <xbgf:inline>LocalVariableDeclaration</xbgf:inline>
 
   <xbgf:horizontal>Statement</xbgf:horizontal>
-
+
 </xbgf:sequence>