separate relaxation from refactoring

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@635 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · May 16, 2009 · af8c7de · af8c7de
1 parent c79fbf9
commit af8c7de
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
@@ -135,7 +135,8 @@
         <perform>rename-read2</perform>
       </nominal-matching>
       <structural-matching>
-        <perform>generalizeModifiers-read2</perform>
+        <perform>deyaccifyModifiers-read2</perform>
+        <perform>generalizeModifiers-read2</perform> <!-- should be moved to relaxation!!! -->
         <perform>generalizeNames</perform>
         <perform>deyaccifyStatements</perform>
         <perform>refactorTypes-read2</perform>

diff --git a/topics/java/lci/xbgf/correct-read3.xbgf b/topics/java/lci/xbgf/correct-read3.xbgf
@@ -32,7 +32,7 @@
 </em></pre></blockquote>
   -->
   <!-- GENERALITY -->
-  <!-- INITCORR -->
+  <!-- POSTEXTR -->
   <xbgf:define>
     <bgf:production>
       <nonterminal>TypeParameters</nonterminal>

diff --git a/topics/java/lci/xbgf/deyaccifyModifiers-read2.xbgf b/topics/java/lci/xbgf/deyaccifyModifiers-read2.xbgf
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+
+  <!-- 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>ConstantModifiers</xbgf:deyaccify>
+
+   <!-- 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>ConstantModifiers</xbgf:inline>
+
+</xbgf:sequence>
diff --git a/topics/java/lci/xbgf/generalizeModifiers-read2.xbgf b/topics/java/lci/xbgf/generalizeModifiers-read2.xbgf
@@ -55,15 +55,6 @@
      ConstantModifiers ConstantModifer
   -->
 
-  <!-- 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>ConstantModifiers</xbgf:deyaccify>
-
   <!-- ISSUE PERMISSIVENESS
   Now unification of singulars-->
   <!-- RELAXATION -->
@@ -97,14 +88,7 @@
     <to>Modifier</to>
   </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>ConstantModifiers</xbgf:inline>
+  <!-- Last bits -->
   <xbgf:massage>
     <bgf:expression>
       <optional>