From e9bb2f6e28687b1e452e9d8d787da7e5b892ece7 Mon Sep 17 00:00:00 2001
From: grammarware <vadim@grammarware.net>
Date: Sat, 10 Dec 2011 20:25:51 +0000
Subject: [PATCH] fixed it! (was broken after the last update of antlr2bgf)

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@1144 ab42f6e0-554d-0410-b580-99e487e6eeb2
---
 topics/convergence/fl/fl.lcf                  |  12 +-
 .../convergence/fl/xbgf/designate-antlr.xbgf  |  51 ++++++++
 topics/convergence/fl/xbgf/designate-txl.xbgf | 121 ++++++++++++++++++
 topics/convergence/fl/xbgf/designateOps.xbgf  |  31 -----
 topics/convergence/fl/xbgf/preferDcg.xbgf     |  55 --------
 topics/convergence/fl/xbgf/preferSdf.xbgf     |  95 --------------
 topics/convergence/fl/xbgf/rename-antlr.xbgf  |  70 ++++++----
 topics/convergence/fl/xbgf/unchain-antlr.xbgf |  33 +++++
 8 files changed, 259 insertions(+), 209 deletions(-)
 create mode 100644 topics/convergence/fl/xbgf/designate-antlr.xbgf
 create mode 100644 topics/convergence/fl/xbgf/designate-txl.xbgf
 delete mode 100644 topics/convergence/fl/xbgf/designateOps.xbgf
 delete mode 100644 topics/convergence/fl/xbgf/preferDcg.xbgf
 delete mode 100644 topics/convergence/fl/xbgf/preferSdf.xbgf
 create mode 100644 topics/convergence/fl/xbgf/unchain-antlr.xbgf

diff --git a/topics/convergence/fl/fl.lcf b/topics/convergence/fl/fl.lcf
index d19f9d8e..0fa63627 100644
--- a/topics/convergence/fl/fl.lcf
+++ b/topics/convergence/fl/fl.lcf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <lcf:configuration xmlns:lcf="http://planet-sl.org/lcf">
 	<shortcut>
 		<name>slps</name>
@@ -159,7 +159,7 @@
       </extraction>
 		</grammar>
 	</source>
-<!--
+	<!--
   <source>
     <name>ldf</name>
     <grammar>
@@ -177,11 +177,12 @@
 		<branch>
 			<input>antlr</input>
 			<nominal-matching>
+				<perform>anonymize-antlr</perform>
 				<perform>rename-antlr</perform>
 			</nominal-matching>
 			<structural-matching>
-				<perform>preferDcg</perform>
-				<perform>designateOps</perform>
+				<perform>unchain-antlr</perform>
+				<perform>designate-antlr</perform>
 			</structural-matching>
 		</branch>
 	</target>
@@ -220,8 +221,7 @@
 				<perform>rename-txl</perform>
 			</nominal-matching>
 			<structural-matching>
-				<perform>preferSdf</perform>
-				<perform>designateOps</perform>
+				<perform>designate-txl</perform>
 			</structural-matching>
 			<relaxation>
 				<perform>multipleNewlines</perform>
diff --git a/topics/convergence/fl/xbgf/designate-antlr.xbgf b/topics/convergence/fl/xbgf/designate-antlr.xbgf
new file mode 100644
index 00000000..02532c86
--- /dev/null
+++ b/topics/convergence/fl/xbgf/designate-antlr.xbgf
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+	<xbgf:designate>
+		<bgf:production>
+			<label>literal</label>
+			<nonterminal>atom</nonterminal>
+			<bgf:expression>
+				<nonterminal>int</nonterminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>argument</label>
+			<nonterminal>atom</nonterminal>
+			<bgf:expression>
+				<nonterminal>name</nonterminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:vertical>
+		<nonterminal>ops</nonterminal>
+	</xbgf:vertical>
+	<xbgf:designate>
+		<bgf:production>
+			<label>equal</label>
+			<nonterminal>ops</nonterminal>
+			<bgf:expression>
+				<terminal>==</terminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>plus</label>
+			<nonterminal>ops</nonterminal>
+			<bgf:expression>
+				<terminal>+</terminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>minus</label>
+			<nonterminal>ops</nonterminal>
+			<bgf:expression>
+				<terminal>-</terminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+</xbgf:sequence>
diff --git a/topics/convergence/fl/xbgf/designate-txl.xbgf b/topics/convergence/fl/xbgf/designate-txl.xbgf
new file mode 100644
index 00000000..8faf1dd2
--- /dev/null
+++ b/topics/convergence/fl/xbgf/designate-txl.xbgf
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+	<xbgf:vertical>
+		<nonterminal>expr</nonterminal>
+	</xbgf:vertical>
+	<xbgf:designate>
+		<bgf:production>
+			<label>literal</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<nonterminal>int</nonterminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>argument</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<nonterminal>name</nonterminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>ifThenElse</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<sequence>
+					<bgf:expression>
+						<terminal>if</terminal>
+					</bgf:expression>
+					<bgf:expression>
+						<nonterminal>expr</nonterminal>
+					</bgf:expression>
+					<bgf:expression>
+						<terminal>then</terminal>
+					</bgf:expression>
+					<bgf:expression>
+						<nonterminal>expr</nonterminal>
+					</bgf:expression>
+					<bgf:expression>
+						<terminal>else</terminal>
+					</bgf:expression>
+					<bgf:expression>
+						<nonterminal>expr</nonterminal>
+					</bgf:expression>
+				</sequence>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>apply</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<sequence>
+					<bgf:expression>
+						<nonterminal>name</nonterminal>
+					</bgf:expression>
+					<bgf:expression>
+						<plus>
+							<bgf:expression>
+								<nonterminal>expr</nonterminal>
+							</bgf:expression>
+						</plus>
+					</bgf:expression>
+				</sequence>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>binary</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<sequence>
+					<bgf:expression>
+						<nonterminal>expr</nonterminal>
+					</bgf:expression>
+					<bgf:expression>
+						<nonterminal>ops</nonterminal>
+					</bgf:expression>
+					<bgf:expression>
+						<nonterminal>expr</nonterminal>
+					</bgf:expression>
+				</sequence>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:vertical>
+		<nonterminal>ops</nonterminal>
+	</xbgf:vertical>
+	<xbgf:designate>
+		<bgf:production>
+			<label>equal</label>
+			<nonterminal>ops</nonterminal>
+			<bgf:expression>
+				<terminal>==</terminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>plus</label>
+			<nonterminal>ops</nonterminal>
+			<bgf:expression>
+				<terminal>+</terminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+	<xbgf:designate>
+		<bgf:production>
+			<label>minus</label>
+			<nonterminal>ops</nonterminal>
+			<bgf:expression>
+				<terminal>-</terminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:designate>
+</xbgf:sequence>
diff --git a/topics/convergence/fl/xbgf/designateOps.xbgf b/topics/convergence/fl/xbgf/designateOps.xbgf
deleted file mode 100644
index 210129d2..00000000
--- a/topics/convergence/fl/xbgf/designateOps.xbgf
+++ /dev/null
@@ -1,31 +0,0 @@
-<xbgf:sequence
-  xmlns:bgf="http://planet-sl.org/bgf"
-  xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:designate>
-    <bgf:production>
-      <label>equal</label>
-      <nonterminal>ops</nonterminal>
-      <bgf:expression>
-        <terminal>==</terminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>plus</label>
-      <nonterminal>ops</nonterminal>
-      <bgf:expression>
-        <terminal>+</terminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>minus</label>
-      <nonterminal>ops</nonterminal>
-      <bgf:expression>
-        <terminal>-</terminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/convergence/fl/xbgf/preferDcg.xbgf b/topics/convergence/fl/xbgf/preferDcg.xbgf
deleted file mode 100644
index cb9be740..00000000
--- a/topics/convergence/fl/xbgf/preferDcg.xbgf
+++ /dev/null
@@ -1,55 +0,0 @@
-<xbgf:sequence
-  xmlns:bgf="http://planet-sl.org/bgf"
-  xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:vertical>
-    <nonterminal>expr</nonterminal>
-  </xbgf:vertical>
-  <xbgf:unchain>
-    <bgf:production>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <nonterminal>apply</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:unchain>
-  <xbgf:unchain>
-    <bgf:production>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <nonterminal>binary</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:unchain>
-  <xbgf:unchain>
-    <bgf:production>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <nonterminal>ifThenElse</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:unchain>
-  <xbgf:vertical>
-    <nonterminal>atom</nonterminal>
-  </xbgf:vertical>
-  <xbgf:designate>
-    <bgf:production>
-      <label>literal</label>
-      <nonterminal>atom</nonterminal>
-      <bgf:expression>
-        <nonterminal>int</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>argument</label>
-      <nonterminal>atom</nonterminal>
-      <bgf:expression>
-        <nonterminal>name</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:vertical>
-    <nonterminal>ops</nonterminal>
-  </xbgf:vertical>
-</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/convergence/fl/xbgf/preferSdf.xbgf b/topics/convergence/fl/xbgf/preferSdf.xbgf
deleted file mode 100644
index 8f648282..00000000
--- a/topics/convergence/fl/xbgf/preferSdf.xbgf
+++ /dev/null
@@ -1,95 +0,0 @@
-<xbgf:sequence
-  xmlns:bgf="http://planet-sl.org/bgf"
-  xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:vertical>
-    <nonterminal>expr</nonterminal>
-  </xbgf:vertical>
-  <xbgf:vertical>
-    <nonterminal>ops</nonterminal>
-  </xbgf:vertical>
-  <xbgf:designate>
-    <bgf:production>
-      <label>literal</label>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <nonterminal>int</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>argument</label>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <nonterminal>name</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>ifThenElse</label>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>if</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>expr</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>then</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>expr</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>else</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>expr</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>apply</label>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>name</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <plus>
-              <bgf:expression>
-                <nonterminal>expr</nonterminal>
-              </bgf:expression>
-            </plus>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>binary</label>
-      <nonterminal>expr</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>expr</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>ops</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>expr</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/convergence/fl/xbgf/rename-antlr.xbgf b/topics/convergence/fl/xbgf/rename-antlr.xbgf
index ea1e7c24..8dc25d6b 100644
--- a/topics/convergence/fl/xbgf/rename-antlr.xbgf
+++ b/topics/convergence/fl/xbgf/rename-antlr.xbgf
@@ -1,22 +1,48 @@
-<xbgf:sequence
-  xmlns:bgf="http://planet-sl.org/bgf"
-  xmlns:xbgf="http://planet-sl.org/xbgf">
-  <xbgf:rename>
-    <nonterminal>
-      <from>NEWLINE</from>
-      <to>newline</to>
-    </nonterminal>
-  </xbgf:rename>
-  <xbgf:rename>
-    <nonterminal>
-      <from>ID</from>
-      <to>name</to>
-    </nonterminal>
-  </xbgf:rename>
-  <xbgf:rename>
-    <nonterminal>
-      <from>INT</from>
-      <to>int</to>
-    </nonterminal>
-  </xbgf:rename>
-</xbgf:sequence>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+	<xbgf:rename>
+		<nonterminal>
+			<from>NEWLINE</from>
+			<to>newline</to>
+		</nonterminal>
+	</xbgf:rename>
+	<xbgf:rename>
+		<nonterminal>
+			<from>ID</from>
+			<to>name</to>
+		</nonterminal>
+	</xbgf:rename>
+	<xbgf:rename>
+		<nonterminal>
+			<from>INT</from>
+			<to>int</to>
+		</nonterminal>
+	</xbgf:rename>
+	<xbgf:rename>
+		<selector>
+			<from>b</from>
+			<to>binary</to>
+		</selector>
+		<in>
+			<nonterminal>expr</nonterminal>
+		</in>
+	</xbgf:rename>
+	<xbgf:rename>
+		<selector>
+			<from>a</from>
+			<to>apply</to>
+		</selector>
+		<in>
+			<nonterminal>expr</nonterminal>
+		</in>
+	</xbgf:rename>
+	<xbgf:rename>
+		<selector>
+			<from>i</from>
+			<to>ifThenElse</to>
+		</selector>
+		<in>
+			<nonterminal>expr</nonterminal>
+		</in>
+	</xbgf:rename>
+</xbgf:sequence>
diff --git a/topics/convergence/fl/xbgf/unchain-antlr.xbgf b/topics/convergence/fl/xbgf/unchain-antlr.xbgf
new file mode 100644
index 00000000..471bd9aa
--- /dev/null
+++ b/topics/convergence/fl/xbgf/unchain-antlr.xbgf
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+	<xbgf:vertical>
+		<nonterminal>expr</nonterminal>
+	</xbgf:vertical>
+	<xbgf:unchain>
+		<bgf:production>
+			<label>apply</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<nonterminal>apply</nonterminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:unchain>
+	<xbgf:unchain>
+		<bgf:production>
+			<label>binary</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<nonterminal>binary</nonterminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:unchain>
+	<xbgf:unchain>
+		<bgf:production>
+			<label>ifThenElse</label>
+			<nonterminal>expr</nonterminal>
+			<bgf:expression>
+				<nonterminal>ifThenElse</nonterminal>
+			</bgf:expression>
+		</bgf:production>
+	</xbgf:unchain>
+</xbgf:sequence>