renamings before anything else

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@525 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Apr 1, 2009 · 4639af6 · 4639af6
1 parent 85c2c55
commit 4639af6
Show file tree

Hide file tree

Showing 28 changed files with 571 additions and 269 deletions.
diff --git a/topics/java/lci/java-lci.csproj b/topics/java/lci/java-lci.csproj
@@ -112,6 +112,12 @@
     <None Include="xbgf\refactorTypes-doc2.xbgf" />
     <None Include="xbgf\refactorTypes-doc3.xbgf" />
     <None Include="xbgf\refactorTypes-jls1.xbgf" />
-    <None Include="xbgf\rename-jls2.xbgf" />
+    <None Include="xbgf\rename-app1.xbgf" />
+    <None Include="xbgf\rename-doc1.xbgf" />
+    <None Include="xbgf\rename-doc12.xbgf" />
+    <None Include="xbgf\rename-doc2.xbgf" />
+    <None Include="xbgf\rename-doc3.xbgf" />
+    <None Include="xbgf\rename-jls1.xbgf" />
+    <None Include="xbgf\rename-jls12.xbgf" />
   </ItemGroup>
 </Project>
diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -91,11 +91,13 @@
     <branch>
       <input>app1</input>
       <perform>correct-app1</perform>
+      <perform>rename-app1</perform>
       <perform>refactor-app1</perform>
     </branch>
     <branch>
       <input>doc1</input>
       <perform>correct-doc1</perform>
+      <perform>rename-doc1</perform>
       <perform>generalizeModifiers-doc1</perform>
       <perform>generalizeNames-doc1</perform>
       <perform>refactor-doc1</perform>
@@ -115,6 +117,7 @@
       <input>doc2</input>
       <perform>recover-doc2</perform>
       <perform>correct-doc2</perform>
+      <perform>rename-doc2</perform>
       <perform>generalizeModifiers</perform>
       <perform>generalizeNames</perform>
       <perform>deyaccifyStatements</perform>
@@ -146,6 +149,7 @@
       <input>doc3</input>
       <perform>recover-doc3</perform>
       <perform>correct-doc3</perform>
+      <perform>rename-doc3</perform>
       <perform>generalizeModifiers</perform>
       <perform>generalizeNames</perform>
       <perform>deyaccifyStatements</perform>
@@ -167,6 +171,7 @@
     <name>jls12</name>
     <branch>
       <input>jls1</input>
+      <perform>rename-jls1</perform>
       <perform>refactorStatements-jls1</perform>
       <perform>generalizeStatements</perform>
       <perform>refactorTypes-jls1</perform>
@@ -184,7 +189,7 @@
     <name>jls123</name>
     <branch>
       <input>jls12</input>
-      <perform>rename-jls2</perform>
+      <perform>rename-jls12</perform>
       <perform>extendDeclarations</perform>
       <perform>extendWithAnnotations</perform>
       <perform>extendClassDeclarations</perform>
@@ -218,6 +223,7 @@
     <name>doc123</name>
     <branch>
       <input>doc12</input>
+      <perform>rename-doc12</perform>
       <perform>extendModifiers</perform>
       <perform>extend-doc12</perform>
     </branch>

diff --git a/topics/java/lci/xbgf/deyaccifyStatements.xbgf b/topics/java/lci/xbgf/deyaccifyStatements.xbgf
@@ -9,25 +9,7 @@
       - [], ;([n(SwitchBlockStatementGroup), ,([n(SwitchBlockStatementGroups), n(SwitchBlockStatementGroup)])])
   -->
   <xbgf:deyaccify>SwitchBlockStatementGroups</xbgf:deyaccify>
-  <xbgf:extract>
-    <bgf:production>
-      <nonterminal>SwitchBlockStatementGroupsOptPlus</nonterminal>
-      <bgf:expression>
-        <optional>
-          <bgf:expression>
-            <nonterminal>SwitchBlockStatementGroups</nonterminal>
-          </bgf:expression>
-        </optional>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:extract>
   <xbgf:inline>SwitchBlockStatementGroups</xbgf:inline>
-  <xbgf:rename>
-    <nonterminal>
-      <from>SwitchBlockStatementGroupsOptPlus</from>
-      <to>SwitchBlockStatementGroups</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:massage>
     <bgf:expression>
       <optional>
@@ -48,6 +30,18 @@
       </star>
     </bgf:expression>
   </xbgf:massage>
+  <xbgf:extract>
+    <bgf:production>
+      <nonterminal>SwitchBlockStatementGroups</nonterminal>
+      <bgf:expression>
+        <star>
+          <bgf:expression>
+            <nonterminal>SwitchBlockStatementGroup</nonterminal>
+          </bgf:expression>
+        </star>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:extract>
 
   <!--  
    - Fail: Catches.

diff --git a/topics/java/lci/xbgf/edit-doc3.xbgf b/topics/java/lci/xbgf/edit-doc3.xbgf
@@ -42,8 +42,6 @@
   <!-- finishing touches -->
   <xbgf:eliminate>FormalParameterList</xbgf:eliminate>
   <xbgf:eliminate>LastFormalParameter</xbgf:eliminate>
-  <xbgf:eliminate>Wildcard</xbgf:eliminate>
-  <xbgf:eliminate>WildcardBounds</xbgf:eliminate>
   <xbgf:eliminate>TypeDeclSpecifier</xbgf:eliminate>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/editDeclarations.xbgf b/topics/java/lci/xbgf/editDeclarations.xbgf
@@ -627,7 +627,7 @@
         <bgf:expression>
           <plus>
             <bgf:expression>
-              <nonterminal>InterfaceMemberDeclaration</nonterminal>
+              <nonterminal>InterfaceBodyDeclaration</nonterminal>
             </bgf:expression>
           </plus>
         </bgf:expression>
@@ -636,17 +636,11 @@
     <bgf:expression>
       <star>
         <bgf:expression>
-          <nonterminal>InterfaceMemberDeclaration</nonterminal>
+          <nonterminal>InterfaceBodyDeclaration</nonterminal>
         </bgf:expression>
       </star>
     </bgf:expression>
   </xbgf:massage>
-  <xbgf:rename>
-    <nonterminal>
-      <from>InterfaceMemberDeclaration</from>
-      <to>InterfaceBodyDeclaration</to>
-    </nonterminal>
-  </xbgf:rename>
 
   <!-- 
    - Fail: CompilationUnit.

diff --git a/topics/java/lci/xbgf/editExpressions-doc3.xbgf b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
@@ -369,7 +369,7 @@
   <xbgf:deyaccify>StatementExpressionList</xbgf:deyaccify>
   <xbgf:extract>
     <bgf:production>
-      <nonterminal>MoreStatementExpressions</nonterminal>
+      <nonterminal>Expressions</nonterminal>
       <bgf:expression>
         <star>
           <bgf:expression>
@@ -1054,12 +1054,6 @@
       </bgf:production>
     </vertical>
   </xbgf:remove>
-  <xbgf:rename>
-    <nonterminal>
-      <from>MoreStatementExpressions</from>
-      <to>Expressions</to>
-    </nonterminal>
-  </xbgf:rename>
 
   <!--
    - Fail: ForControl.

diff --git a/topics/java/lci/xbgf/extend-doc12.xbgf b/topics/java/lci/xbgf/extend-doc12.xbgf
@@ -1207,7 +1207,7 @@
           <bgf:expression>
             <optional>
               <bgf:expression>
-                <nonterminal>FormalParameterList</nonterminal>
+                <nonterminal>FormalParameters</nonterminal>
               </bgf:expression>
             </optional>
           </bgf:expression>
@@ -1230,12 +1230,6 @@
       - [], ,([n(Identifier), t((), ?(n(FormalParameterList)), t())])
 
   -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>FormalParameterList</from>
-      <to>FormalParameters</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:horizontal>FormalParameters</xbgf:horizontal>
   <xbgf:unfold>
     <nonterminal>FormalParameters</nonterminal>
@@ -1383,12 +1377,6 @@
      vs.
       - [], ,([t(throws), n(ExceptionTypeList)])
   -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>ClassTypeList</from>
-      <to>ExceptionTypeList</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:upgrade>
     <bgf:production>
       <nonterminal>ExceptionTypeList</nonterminal>

diff --git a/topics/java/lci/xbgf/extendClassDeclarations.xbgf b/topics/java/lci/xbgf/extendClassDeclarations.xbgf
@@ -560,7 +560,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:introduce>
-  <!-- BREFACTOR local rename -->
+  <!-- BREFACTOR local re-name -->
   <xbgf:replace>
     <bgf:expression>
       <nonterminal>MethodDeclaratorRest</nonterminal>

diff --git a/topics/java/lci/xbgf/generalizeModifiers-doc1.xbgf b/topics/java/lci/xbgf/generalizeModifiers-doc1.xbgf
@@ -11,12 +11,6 @@
   -->
 
   <!-- ISSUE PERMISSIVENESS -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>ClassModifier</from>
-      <to>Modifier</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:unite>
     <add>InterfaceModifier</add>
     <to>Modifier</to>
@@ -44,12 +38,6 @@
   </xbgf:unite>
 
   <!-- ISSUE PERMISSIVENESS plural -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>ClassModifiers</from>
-      <to>Modifiers</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:unite>
     <add>ConstantModifiers</add>
     <to>Modifiers</to>

diff --git a/topics/java/lci/xbgf/generalizeModifiers.xbgf b/topics/java/lci/xbgf/generalizeModifiers.xbgf
@@ -55,22 +55,16 @@
   -->
 
   <!-- First the deyaccification -->
+  <xbgf:deyaccify>Modifiers</xbgf:deyaccify>
   <xbgf:deyaccify>AbstractMethodModifiers</xbgf:deyaccify>
   <xbgf:deyaccify>InterfaceModifiers</xbgf:deyaccify>
   <xbgf:deyaccify>MethodModifiers</xbgf:deyaccify>
   <xbgf:deyaccify>FieldModifiers</xbgf:deyaccify>
   <xbgf:deyaccify>ConstructorModifiers</xbgf:deyaccify>
-  <xbgf:deyaccify>ClassModifiers</xbgf:deyaccify>
   <xbgf:deyaccify>ConstantModifiers</xbgf:deyaccify>
 
   <!-- ISSUE PERMISSIVENESS
   Now unification of singulars-->
-  <xbgf:rename>
-    <nonterminal>
-      <from>AbstractMethodModifier</from>
-      <to>Modifier</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:unite>
     <add>InterfaceModifier</add>
     <to>Modifier</to>
@@ -88,7 +82,7 @@
     <to>Modifier</to>
   </xbgf:unite>
   <xbgf:unite>
-    <add>ClassModifier</add>
+    <add>AbstractMethodModifier</add>
     <to>Modifier</to>
   </xbgf:unite>
   <xbgf:unite>
@@ -97,12 +91,12 @@
   </xbgf:unite>
 
   <!-- Getting rid of plurals altogether -->
+  <xbgf:inline>Modifiers</xbgf:inline>
   <xbgf:inline>AbstractMethodModifiers</xbgf:inline>
   <xbgf:inline>InterfaceModifiers</xbgf:inline>
   <xbgf:inline>MethodModifiers</xbgf:inline>
   <xbgf:inline>FieldModifiers</xbgf:inline>
   <xbgf:inline>ConstructorModifiers</xbgf:inline>
-  <xbgf:inline>ClassModifiers</xbgf:inline>
   <xbgf:inline>ConstantModifiers</xbgf:inline>
   <xbgf:massage>
     <bgf:expression>

diff --git a/topics/java/lci/xbgf/generalizeNames-doc1.xbgf b/topics/java/lci/xbgf/generalizeNames-doc1.xbgf
@@ -30,36 +30,23 @@ vs
   -->
 
   <!-- ISSUE PERMISSIVENESS -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>AmbiguousName</from>
-      <to>QualifiedIdentifier</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:unite>
     <add>MethodName</add>
-    <to>QualifiedIdentifier</to>
+    <to>Name</to>
   </xbgf:unite>
   <xbgf:unite>
     <add>TypeName</add>
-    <to>QualifiedIdentifier</to>
+    <to>Name</to>
   </xbgf:unite>
   <xbgf:unite>
     <add>PackageName</add>
-    <to>QualifiedIdentifier</to>
+    <to>Name</to>
   </xbgf:unite>
   <xbgf:unite>
     <add>ExpressionName</add>
-    <to>QualifiedIdentifier</to>
+    <to>Name</to>
   </xbgf:unite>
-  <xbgf:deyaccify>QualifiedIdentifier</xbgf:deyaccify>
-
-  <!-- use another name -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>QualifiedIdentifier</from>
-      <to>Name</to>
-    </nonterminal>
-  </xbgf:rename>
+
+  <xbgf:deyaccify>Name</xbgf:deyaccify>
 
 </xbgf:sequence>
diff --git a/topics/java/lci/xbgf/generalizeNames.xbgf b/topics/java/lci/xbgf/generalizeNames.xbgf
@@ -30,12 +30,6 @@ vs
   -->
 
   <!-- ISSUE PERMISSIVENESS -->
-  <xbgf:rename>
-    <nonterminal>
-      <from>AmbiguousName</from>
-      <to>QualifiedIdentifier</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:unite>
     <add>MethodName</add>
     <to>QualifiedIdentifier</to>

diff --git a/topics/java/lci/xbgf/inlineStatements.xbgf b/topics/java/lci/xbgf/inlineStatements.xbgf
@@ -194,25 +194,7 @@
      vs.
       - [], +n(BlockStatement)
   -->
-  <xbgf:extract>
-    <bgf:production>
-      <nonterminal>BlockStatementsOpt</nonterminal>
-      <bgf:expression>
-        <optional>
-          <bgf:expression>
-            <nonterminal>BlockStatements</nonterminal>
-          </bgf:expression>
-        </optional>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:extract>
   <xbgf:inline>BlockStatements</xbgf:inline>
-  <xbgf:rename>
-    <nonterminal>
-      <from>BlockStatementsOpt</from>
-      <to>BlockStatements</to>
-    </nonterminal>
-  </xbgf:rename>
   <xbgf:massage>
     <bgf:expression>
       <optional>
@@ -233,6 +215,18 @@
       </star>
     </bgf:expression>
   </xbgf:massage>
+  <xbgf:extract>
+    <bgf:production>
+      <nonterminal>BlockStatements</nonterminal>
+      <bgf:expression>
+        <star>
+          <bgf:expression>
+            <nonterminal>BlockStatement</nonterminal>
+          </bgf:expression>
+        </star>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:extract>
 
   <!-- ISSUE CORRECT BRUTAL?
   The collected grammar does not allow interface declarations and labelled statements inside blocks.