more tagging work

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@386 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Oct 29, 2008 · f5bc5d8 · f5bc5d8
1 parent 22fc862
commit f5bc5d8
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 62 deletions.
diff --git a/topics/java/lci/java-lci.csproj b/topics/java/lci/java-lci.csproj
@@ -52,7 +52,6 @@
       <Link>xbgf.xsd</Link>
     </None>
     <None Include="java.lcf" />
-    <None Include="xbgf\allowMethodBodyEmpty.xbgf" />
     <None Include="xbgf\correct-app1.xbgf" />
     <None Include="xbgf\correct-app2.xbgf" />
     <None Include="xbgf\correct-app3.xbgf" />
@@ -61,40 +60,45 @@
     <None Include="xbgf\correct-doc3.xbgf" />
     <None Include="xbgf\deyaccify-doc2.xbgf" />
     <None Include="xbgf\edit-doc1.xbgf" />
+    <None Include="xbgf\edit-doc2.xbgf" />
+    <None Include="xbgf\edit-doc3.xbgf" />
     <None Include="xbgf\editDeclarations.xbgf" />
-    <None Include="xbgf\editExpressions-doc2.xbgf" />
-    <None Include="xbgf\editExpressions-doc3.xbgf" />
+    <None Include="xbgf\editExpressions-jls1.xbgf" />
     <None Include="xbgf\editExpressions.xbgf" />
+    <None Include="xbgf\eliminate-doc2.xbgf" />
     <None Include="xbgf\extend-doc1.xbgf" />
     <None Include="xbgf\extend-doc12.xbgf" />
-    <None Include="xbgf\extend-doc2.xbgf" />
-    <None Include="xbgf\extend-doc3.xbgf" />
     <None Include="xbgf\extend-jls1.xbgf" />
     <None Include="xbgf\extend-jls2.xbgf" />
     <None Include="xbgf\extendModifiers.xbgf" />
+    <None Include="xbgf\generalize-app3.xbgf" />
+    <None Include="xbgf\generalize-jls1.xbgf" />
+    <None Include="xbgf\generalizeBlock.xbgf" />
     <None Include="xbgf\generalizeLabels.xbgf" />
+    <None Include="xbgf\generalizeModifiers-doc1.xbgf" />
     <None Include="xbgf\generalizeModifiers.xbgf" />
     <None Include="xbgf\generalizeNames-doc1.xbgf" />
     <None Include="xbgf\generalizeNames.xbgf" />
+    <None Include="xbgf\generalizeStatements.xbgf" />
+    <None Include="xbgf\inline-jls2.xbgf" />
     <None Include="xbgf\inlineStatements.xbgf" />
-    <None Include="xbgf\prefer3.xbgf" />
-    <None Include="xbgf\preferLALR.xbgf" />
-    <None Include="xbgf\prepare1.xbgf" />
-    <None Include="xbgf\prepare2.xbgf" />
-    <None Include="xbgf\prepare3.xbgf" />
+    <None Include="xbgf\refactor-app1.xbgf" />
+    <None Include="xbgf\refactor-app2.xbgf" />
+    <None Include="xbgf\refactor-app3.xbgf" />
+    <None Include="xbgf\refactor-doc1.xbgf" />
     <None Include="xbgf\refactorClasses-doc2.xbgf" />
     <None Include="xbgf\refactorClasses-doc3.xbgf" />
     <None Include="xbgf\refactorDeclarations-doc2.xbgf" />
     <None Include="xbgf\refactorDeclarations-doc3.xbgf" />
-    <None Include="xbgf\refactorEnumDeclarations.xbgf" />
-    <None Include="xbgf\refactorExpressions-doc2.xbgf" />
+    <None Include="xbgf\refactorEnums.xbgf" />
     <None Include="xbgf\refactorExpressions-doc3.xbgf" />
+    <None Include="xbgf\refactorExpressions.xbgf" />
     <None Include="xbgf\refactorInterfaces-doc2.xbgf" />
     <None Include="xbgf\refactorInterfaces-doc3.xbgf" />
-    <None Include="xbgf\refactorOps.xbgf" />
     <None Include="xbgf\refactorStatements.xbgf" />
     <None Include="xbgf\refactorTypes-doc2.xbgf" />
     <None Include="xbgf\refactorTypes-doc3.xbgf" />
     <None Include="xbgf\refactorTypes-jls1.xbgf" />
+    <None Include="xbgf\rename-jls2.xbgf" />
   </ItemGroup>
 </Project>
diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -126,7 +126,7 @@
       <perform>refactorClasses-doc2</perform>
       <perform>refactorInterfaces-doc2</perform>
       <perform>refactorDeclarations-doc2</perform>
-      <perform>extend-doc2</perform>
+      <perform>edit-doc2</perform>
     </branch>
   </target>
 
@@ -155,7 +155,7 @@
       <perform>refactorInterfaces-doc3</perform>
       <perform>refactorEnums</perform>
       <perform>refactorDeclarations-doc3</perform>
-      <perform>extend-doc3</perform>
+      <perform>edit-doc3</perform>
     </branch>
   </target>
 

diff --git a/topics/java/lci/xbgf/correct-app1.xbgf b/topics/java/lci/xbgf/correct-app1.xbgf
@@ -2,14 +2,13 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE CORRECT
-  in the extracted version root is undefined -->
+  <!-- in the extracted version root is undefined -->
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
 
-  <!-- ISSUE CORRECT
-  not used in other versions -->
+  <!-- not used in other versions -->
+  <!-- NONISS -->
   <xbgf:eliminate>Goal</xbgf:eliminate>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/correct-app2.xbgf b/topics/java/lci/xbgf/correct-app2.xbgf
@@ -2,8 +2,7 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE CORRECT 
-  in the extracted version root is undefined -->
+  <!-- in the extracted version root is undefined -->
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
@@ -221,8 +220,7 @@
   <xbgf:eliminate>VoidMethodDeclaratorRest</xbgf:eliminate>
   <xbgf:eliminate>VariableDeclaratorsRest</xbgf:eliminate>
 
-  <!-- ISSUE CORRECT SPECERROR
-  undefine lexical term -->
+  <!--   undefine lexical term -->
   <xbgf:undefine>Identifier</xbgf:undefine>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/correct-app3.xbgf b/topics/java/lci/xbgf/correct-app3.xbgf
@@ -2,8 +2,7 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE CORRECT 
-  in the extracted version root is undefined -->
+  <!-- in the extracted version root is undefined -->
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
@@ -19,7 +18,7 @@ Annotation:
     <to>QualifiedIdentifier</to>
   </xbgf:unite>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
   The extractor can't tell if {} are terminals or BNF
 
    - Fail: Block.
@@ -47,7 +46,7 @@ Annotation:
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
    - Fail: AnnotationTypeBody.
       - [], *(?(n(AnnotationTypeElementDeclarations)))
      vs.

diff --git a/topics/java/lci/xbgf/correct-doc1.xbgf b/topics/java/lci/xbgf/correct-doc1.xbgf
@@ -2,8 +2,7 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE CORRECT
-  in the extracted version root is undefined -->
+  <!-- in the extracted version root is undefined -->
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>

diff --git a/topics/java/lci/xbgf/correct-doc2.xbgf b/topics/java/lci/xbgf/correct-doc2.xbgf
@@ -2,8 +2,7 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE CORRECT 
-  in the extracted version root is undefined -->
+  <!-- in the extracted version root is undefined -->
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
@@ -28,7 +27,7 @@
     <to>Identifier</to>
   </xbgf:unite>
 
-  <!--  ISSUE CORRECT EXTRACTERROR
+  <!--  ISSUE EXTRACTERROR
   Error in markup of JLS2
      - Fail: InterfaceBody.
       - [], ,([t({), ?(n(InterfaceMemberDeclarations)), t(})])
@@ -59,7 +58,7 @@
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
    Error in markup of JLS2
      - Fail: ClassBody.
       - [], ,([t({), ?(n(ClassBodyDeclarations)), t(})])
@@ -90,7 +89,7 @@
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
   Error in markup in JLS2
 
      - Fail: ConstructorBody.
@@ -127,7 +126,7 @@
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
      - Fail: Block.
       - [], ,([t({), ?(n(BlockStatements)), t(})])
      vs.
@@ -157,7 +156,7 @@
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
      - Fail: SwitchBlock.
       - [], ,([t({), ?(n(SwitchBlockStatementGroups)), ?(n(SwitchLabels)), t(})])
      vs.
@@ -194,7 +193,7 @@
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
      - Fail: ConstructorBody.
       - [], ,([t({), ?(n(ExplicitConstructorInvocation)), ?(n(BlockStatements)), t(})])
      vs.
@@ -259,7 +258,7 @@
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
   Error in PrimaryNoNewArray undetected by the extractor due to lacking definition -->
   <xbgf:replace>
     <bgf:expression>

diff --git a/topics/java/lci/xbgf/correct-doc3.xbgf b/topics/java/lci/xbgf/correct-doc3.xbgf
@@ -2,8 +2,7 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE CORRECT 
-  in the extracted version root is undefined -->
+  <!--  in the extracted version root is undefined -->
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
@@ -111,7 +110,7 @@
     <to>Identifier</to>
   </xbgf:unite>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
   Bad layout makes the extractor to force line continuation:
    - Fail: NormalInterfaceDeclaration.
       - [], ,([?(n(InterfaceModifiers)), t(interface), n(Identifier), ?(n(ExtendsInterfaces)), n(InterfaceBody)])
@@ -356,7 +355,7 @@
   </xbgf:remove>
   <xbgf:horizontal>TypeName</xbgf:horizontal>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
   Extractor error:
    - Fail: ElementValueArrayInitializer.
       - [], ,([t({), ?(n(ElementValues)), ?(t((,))), t(})])
@@ -394,7 +393,7 @@
     </bgf:production>
   </xbgf:define>
 
-  <!-- ISSUE CORRECT EXTRACTERROR
+  <!-- ISSUE EXTRACTERROR
   extractor's problem -->
   <xbgf:replace>
     <bgf:expression>

diff --git a/topics/java/lci/xbgf/extend-doc2.xbgf → topics/java/lci/xbgf/edit-doc2.xbgf b/topics/java/lci/xbgf/extend-doc2.xbgf → topics/java/lci/xbgf/edit-doc2.xbgf
@@ -17,7 +17,7 @@
   <xbgf:eliminate>ExplicitConstructorInvocation</xbgf:eliminate>
   <xbgf:eliminate>ArgumentList</xbgf:eliminate>
 
-  <!-- ISSUE EXTEND
+  <!-- ISSUE REFACTOR GENERALIZE
    Some productions use a more general QualifiedIdentifierList instead of TypeList
   -->
   <xbgf:introduce>
@@ -46,8 +46,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:introduce>
-
-  <!-- ISSUE REFACTOR GENERALIZE -->
   <xbgf:replace>
     <bgf:expression>
       <nonterminal>TypeList</nonterminal>
@@ -93,7 +91,7 @@
     </in>
   </xbgf:replace>
 
-  <!-- ISSUE EXTEND GENERALIZE
+  <!-- ISSUE REFACTOR BRUTAL?
    - Fail: MethodDeclaratorRest.
       - [], ,([n(FormalParameters), n(BracketsOpt), ?(,([t(throws), n(QualifiedIdentifierList)])), ;([n(MethodBody), t((;))])])
      vs.

diff --git a/topics/java/lci/xbgf/extend-doc3.xbgf → topics/java/lci/xbgf/edit-doc3.xbgf b/topics/java/lci/xbgf/extend-doc3.xbgf → topics/java/lci/xbgf/edit-doc3.xbgf
@@ -2,7 +2,7 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE EXTEND GENERALIZE
+  <!-- ISSUE REFACTOR BRUTAL? GENERALIZE
   NOT semantic-preserving in any way.
 
    - Fail: MethodBody.
@@ -22,7 +22,7 @@
     </bgf:production>
   </xbgf:remove>
 
-  <!-- ISSUE EXTEND
+  <!-- ISSUE REFACTOR BRUTAL - somehow NonWildcardTypeArguments was used anyway
    - Fail: Primary.
       - [], ,([n(NonWildcardTypeArguments), ;([n(ExplicitGenericInvocationSuffix), ,([t(this), n(Arguments)])])])
      vs.

diff --git a/topics/java/lci/xbgf/editExpressions.xbgf b/topics/java/lci/xbgf/editExpressions.xbgf
@@ -45,7 +45,7 @@
     <nonterminal>Primary</nonterminal>
   </xbgf:vertical>
 
-  <!-- ISSUE EXTEND
+  <!-- ISSUE CORRECT
    - Fail: Primary.
       - [], ,([t(this), ?(n(Arguments))])
      vs.