more renamings of misc. scope

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@509 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Mar 3, 2009 · ad90bf8 · ad90bf8
1 parent c5397dd
commit ad90bf8
Show file tree

Hide file tree

Showing 64 changed files with 357 additions and 141 deletions.
diff --git a/topics/transformation/xbgf/tests/deyaccify5.xbgf b/topics/transformation/xbgf/tests/deyaccify5.xbgf
diff --git a/...sformation/xbgf/tests/deyaccify1.baseline → ...rmation/xbgf/tests/deyaccify_eps.baseline b/...sformation/xbgf/tests/deyaccify1.baseline → ...rmation/xbgf/tests/deyaccify_eps.baseline
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <star>
         <bgf:expression>
-          <terminal>a</terminal>
+          <nonterminal>bar</nonterminal>
         </bgf:expression>
       </star>
     </bgf:expression>

diff --git a/.../transformation/xbgf/tests/deyaccify1.bgf → ...ansformation/xbgf/tests/deyaccify_eps.bgf b/.../transformation/xbgf/tests/deyaccify1.bgf → ...ansformation/xbgf/tests/deyaccify_eps.bgf
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <epsilon/>
     </bgf:expression>
   </bgf:production>
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
         <bgf:expression>
-          <terminal>a</terminal>
+          <nonterminal>bar</nonterminal>
         </bgf:expression>
         <bgf:expression>
-          <nonterminal>N</nonterminal>
+          <nonterminal>foo</nonterminal>
         </bgf:expression>
       </sequence>
     </bgf:expression>

diff --git a/...transformation/xbgf/tests/deyaccify4.xbgf → ...nsformation/xbgf/tests/deyaccify_eps.xbgf b/...transformation/xbgf/tests/deyaccify4.xbgf → ...nsformation/xbgf/tests/deyaccify_eps.xbgf
@@ -2,5 +2,5 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:deyaccify>N</xbgf:deyaccify>
+  <xbgf:deyaccify>foo</xbgf:deyaccify>
 </xbgf:sequence>
diff --git a/...sformation/xbgf/tests/deyaccify4.baseline → ...mation/xbgf/tests/deyaccify_left.baseline b/...sformation/xbgf/tests/deyaccify4.baseline → ...mation/xbgf/tests/deyaccify_left.baseline
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
+        <bgf:expression>
+          <nonterminal>bar</nonterminal>
+        </bgf:expression>
         <bgf:expression>
           <star>
             <bgf:expression>
-              <terminal>b</terminal>
+              <nonterminal>wez</nonterminal>
             </bgf:expression>
           </star>
         </bgf:expression>
-        <bgf:expression>
-          <terminal>a</terminal>
-        </bgf:expression>
       </sequence>
     </bgf:expression>
   </bgf:production>

diff --git a/.../transformation/xbgf/tests/deyaccify4.bgf → ...nsformation/xbgf/tests/deyaccify_left.bgf b/.../transformation/xbgf/tests/deyaccify4.bgf → ...nsformation/xbgf/tests/deyaccify_left.bgf
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
-      <terminal>a</terminal>
+      <nonterminal>bar</nonterminal>
     </bgf:expression>
   </bgf:production>
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
         <bgf:expression>
-          <terminal>b</terminal>
+          <nonterminal>foo</nonterminal>
         </bgf:expression>
         <bgf:expression>
-          <nonterminal>N</nonterminal>
+          <nonterminal>wez</nonterminal>
         </bgf:expression>
       </sequence>
     </bgf:expression>

diff --git a/...transformation/xbgf/tests/deyaccify2.xbgf → ...sformation/xbgf/tests/deyaccify_left.xbgf b/...transformation/xbgf/tests/deyaccify2.xbgf → ...sformation/xbgf/tests/deyaccify_left.xbgf
@@ -2,5 +2,5 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:deyaccify>N</xbgf:deyaccify>
+  <xbgf:deyaccify>foo</xbgf:deyaccify>
 </xbgf:sequence>
diff --git a/...sformation/xbgf/tests/deyaccify3.baseline → ...n/xbgf/tests/deyaccify_left_plus.baseline b/...sformation/xbgf/tests/deyaccify3.baseline → ...n/xbgf/tests/deyaccify_left_plus.baseline
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <plus>
         <bgf:expression>
-          <terminal>a</terminal>
+          <nonterminal>bar</nonterminal>
         </bgf:expression>
       </plus>
     </bgf:expression>

diff --git a/.../transformation/xbgf/tests/deyaccify5.bgf → ...mation/xbgf/tests/deyaccify_left_plus.bgf b/.../transformation/xbgf/tests/deyaccify5.bgf → ...mation/xbgf/tests/deyaccify_left_plus.bgf
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
-      <terminal>a</terminal>
+      <nonterminal>bar</nonterminal>
     </bgf:expression>
   </bgf:production>
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
         <bgf:expression>
-          <nonterminal>N</nonterminal>
+          <nonterminal>foo</nonterminal>
         </bgf:expression>
         <bgf:expression>
-          <terminal>b</terminal>
+          <nonterminal>bar</nonterminal>
         </bgf:expression>
       </sequence>
     </bgf:expression>

diff --git a/...transformation/xbgf/tests/deyaccify1.xbgf → ...ation/xbgf/tests/deyaccify_left_plus.xbgf b/...transformation/xbgf/tests/deyaccify1.xbgf → ...ation/xbgf/tests/deyaccify_left_plus.xbgf
@@ -2,5 +2,5 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:deyaccify>N</xbgf:deyaccify>
+  <xbgf:deyaccify>foo</xbgf:deyaccify>
 </xbgf:sequence>
diff --git a/...sformation/xbgf/tests/deyaccify5.baseline → ...ation/xbgf/tests/deyaccify_right.baseline b/...sformation/xbgf/tests/deyaccify5.baseline → ...ation/xbgf/tests/deyaccify_right.baseline
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
-        <bgf:expression>
-          <terminal>a</terminal>
-        </bgf:expression>
         <bgf:expression>
           <star>
             <bgf:expression>
-              <terminal>b</terminal>
+              <nonterminal>wez</nonterminal>
             </bgf:expression>
           </star>
         </bgf:expression>
+        <bgf:expression>
+          <nonterminal>bar</nonterminal>
+        </bgf:expression>
       </sequence>
     </bgf:expression>
   </bgf:production>

diff --git a/.../transformation/xbgf/tests/deyaccify2.bgf → ...sformation/xbgf/tests/deyaccify_right.bgf b/.../transformation/xbgf/tests/deyaccify2.bgf → ...sformation/xbgf/tests/deyaccify_right.bgf
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
-      <terminal>a</terminal>
+      <nonterminal>bar</nonterminal>
     </bgf:expression>
   </bgf:production>
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
         <bgf:expression>
-          <terminal>a</terminal>
+          <nonterminal>wez</nonterminal>
         </bgf:expression>
         <bgf:expression>
-          <nonterminal>N</nonterminal>
+          <nonterminal>foo</nonterminal>
         </bgf:expression>
       </sequence>
     </bgf:expression>

diff --git a/...transformation/xbgf/tests/deyaccify3.xbgf → ...formation/xbgf/tests/deyaccify_right.xbgf b/...transformation/xbgf/tests/deyaccify3.xbgf → ...formation/xbgf/tests/deyaccify_right.xbgf
@@ -2,5 +2,5 @@
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:deyaccify>N</xbgf:deyaccify>
+  <xbgf:deyaccify>foo</xbgf:deyaccify>
 </xbgf:sequence>
diff --git a/...sformation/xbgf/tests/deyaccify2.baseline → .../xbgf/tests/deyaccify_right_plus.baseline b/...sformation/xbgf/tests/deyaccify2.baseline → .../xbgf/tests/deyaccify_right_plus.baseline
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <plus>
         <bgf:expression>
-          <terminal>a</terminal>
+          <nonterminal>bar</nonterminal>
         </bgf:expression>
       </plus>
     </bgf:expression>

diff --git a/.../transformation/xbgf/tests/deyaccify3.bgf → ...ation/xbgf/tests/deyaccify_right_plus.bgf b/.../transformation/xbgf/tests/deyaccify3.bgf → ...ation/xbgf/tests/deyaccify_right_plus.bgf
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
-      <terminal>a</terminal>
+      <nonterminal>bar</nonterminal>
     </bgf:expression>
   </bgf:production>
   <bgf:production>
-    <nonterminal>N</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
         <bgf:expression>
-          <nonterminal>N</nonterminal>
+          <nonterminal>bar</nonterminal>
         </bgf:expression>
         <bgf:expression>
-          <terminal>a</terminal>
+          <nonterminal>foo</nonterminal>
         </bgf:expression>
       </sequence>
     </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/deyaccify_right_plus.xbgf b/topics/transformation/xbgf/tests/deyaccify_right_plus.xbgf
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+  <xbgf:deyaccify>foo</xbgf:deyaccify>
+</xbgf:sequence>
diff --git a/topics/transformation/xbgf/tests/disappear_q.bgf b/topics/transformation/xbgf/tests/disappear_q.bgf
@@ -10,7 +10,7 @@
         <bgf:expression>
           <optional>
             <bgf:expression>
-              <nonterminal>zap</nonterminal>
+              <nonterminal>qux</nonterminal>
             </bgf:expression>
           </optional>
         </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/disappear_q.xbgf b/topics/transformation/xbgf/tests/disappear_q.xbgf
@@ -14,7 +14,7 @@
               <bgf:expression>
                 <optional>
                   <bgf:expression>
-                    <nonterminal>zap</nonterminal>
+                    <nonterminal>qux</nonterminal>
                   </bgf:expression>
                 </optional>
               </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/disappear_s.baseline b/topics/transformation/xbgf/tests/disappear_s.baseline
@@ -7,7 +7,7 @@
           <nonterminal>bar</nonterminal>
         </bgf:expression>
         <bgf:expression>
-          <nonterminal>zap</nonterminal>
+          <nonterminal>qux</nonterminal>
         </bgf:expression>
       </sequence>
     </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/disappear_s.bgf b/topics/transformation/xbgf/tests/disappear_s.bgf
@@ -10,12 +10,12 @@
         <bgf:expression>
           <star>
             <bgf:expression>
-              <nonterminal>wex</nonterminal>
+              <nonterminal>wez</nonterminal>
             </bgf:expression>
           </star>
         </bgf:expression>
         <bgf:expression>
-          <nonterminal>zap</nonterminal>
+          <nonterminal>qux</nonterminal>
         </bgf:expression>
       </sequence>
     </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/disappear_s.xbgf b/topics/transformation/xbgf/tests/disappear_s.xbgf
@@ -14,14 +14,14 @@
               <bgf:expression>
                 <star>
                   <bgf:expression>
-                    <nonterminal>wex</nonterminal>
+                    <nonterminal>wez</nonterminal>
                   </bgf:expression>
                 </star>
               </bgf:expression>
             </marked>
           </bgf:expression>
           <bgf:expression>
-            <nonterminal>zap</nonterminal>
+            <nonterminal>qux</nonterminal>
           </bgf:expression>
         </sequence>
       </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/distribute_nt.baseline b/topics/transformation/xbgf/tests/distribute_nt.baseline
@@ -1,25 +1,25 @@
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>a</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <choice>
         <bgf:expression>
           <sequence>
             <bgf:expression>
-              <nonterminal>b</nonterminal>
+              <nonterminal>bar</nonterminal>
             </bgf:expression>
             <bgf:expression>
-              <nonterminal>c</nonterminal>
+              <nonterminal>qux</nonterminal>
             </bgf:expression>
           </sequence>
         </bgf:expression>
         <bgf:expression>
           <sequence>
             <bgf:expression>
-              <nonterminal>b</nonterminal>
+              <nonterminal>bar</nonterminal>
             </bgf:expression>
             <bgf:expression>
-              <nonterminal>d</nonterminal>
+              <nonterminal>wez</nonterminal>
             </bgf:expression>
           </sequence>
         </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/distribute_nt.bgf b/topics/transformation/xbgf/tests/distribute_nt.bgf
@@ -1,18 +1,18 @@
 <bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
   <bgf:production>
-    <nonterminal>a</nonterminal>
+    <nonterminal>foo</nonterminal>
     <bgf:expression>
       <sequence>
         <bgf:expression>
-          <nonterminal>b</nonterminal>
+          <nonterminal>bar</nonterminal>
         </bgf:expression>
         <bgf:expression>
           <choice>
             <bgf:expression>
-              <nonterminal>c</nonterminal>
+              <nonterminal>qux</nonterminal>
             </bgf:expression>
             <bgf:expression>
-              <nonterminal>d</nonterminal>
+              <nonterminal>wez</nonterminal>
             </bgf:expression>
           </choice>
         </bgf:expression>

diff --git a/topics/transformation/xbgf/tests/distribute_nt.xbgf b/topics/transformation/xbgf/tests/distribute_nt.xbgf
@@ -2,6 +2,6 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
   <xbgf:distribute>
-    <nonterminal>a</nonterminal>
+    <nonterminal>foo</nonterminal>
   </xbgf:distribute>
 </xbgf:sequence>
diff --git a/...ansformation/xbgf/tests/extract4.baseline → ...nsformation/xbgf/tests/extract_l.baseline b/...ansformation/xbgf/tests/extract4.baseline → ...nsformation/xbgf/tests/extract_l.baseline
diff --git a/...cs/transformation/xbgf/tests/extract4.bgf → ...s/transformation/xbgf/tests/extract_l.bgf b/...cs/transformation/xbgf/tests/extract4.bgf → ...s/transformation/xbgf/tests/extract_l.bgf
diff --git a/...s/transformation/xbgf/tests/extract4.xbgf → .../transformation/xbgf/tests/extract_l.xbgf b/...s/transformation/xbgf/tests/extract4.xbgf → .../transformation/xbgf/tests/extract_l.xbgf
diff --git a/...ansformation/xbgf/tests/extract3.baseline → ...sformation/xbgf/tests/extract_nt.baseline b/...ansformation/xbgf/tests/extract3.baseline → ...sformation/xbgf/tests/extract_nt.baseline
diff --git a/...cs/transformation/xbgf/tests/extract3.bgf → .../transformation/xbgf/tests/extract_nt.bgf b/...cs/transformation/xbgf/tests/extract3.bgf → .../transformation/xbgf/tests/extract_nt.bgf
diff --git a/...s/transformation/xbgf/tests/extract3.xbgf → ...transformation/xbgf/tests/extract_nt.xbgf b/...s/transformation/xbgf/tests/extract3.xbgf → ...transformation/xbgf/tests/extract_nt.xbgf
diff --git a/...ansformation/xbgf/tests/extract1.baseline → ...rmation/xbgf/tests/extract_subch.baseline b/...ansformation/xbgf/tests/extract1.baseline → ...rmation/xbgf/tests/extract_subch.baseline
diff --git a/...cs/transformation/xbgf/tests/extract1.bgf → ...ansformation/xbgf/tests/extract_subch.bgf b/...cs/transformation/xbgf/tests/extract1.bgf → ...ansformation/xbgf/tests/extract_subch.bgf
diff --git a/...s/transformation/xbgf/tests/extract1.xbgf → ...nsformation/xbgf/tests/extract_subch.xbgf b/...s/transformation/xbgf/tests/extract1.xbgf → ...nsformation/xbgf/tests/extract_subch.xbgf
diff --git a/...ansformation/xbgf/tests/extract2.baseline → ...mation/xbgf/tests/extract_subseq.baseline b/...ansformation/xbgf/tests/extract2.baseline → ...mation/xbgf/tests/extract_subseq.baseline
diff --git a/...cs/transformation/xbgf/tests/extract2.bgf → ...nsformation/xbgf/tests/extract_subseq.bgf b/...cs/transformation/xbgf/tests/extract2.bgf → ...nsformation/xbgf/tests/extract_subseq.bgf
diff --git a/...s/transformation/xbgf/tests/extract2.xbgf → ...sformation/xbgf/tests/extract_subseq.xbgf b/...s/transformation/xbgf/tests/extract2.xbgf → ...sformation/xbgf/tests/extract_subseq.xbgf