From 16699a41710e43b6d75f5863b8763b95ab1787e4 Mon Sep 17 00:00:00 2001
From: grammarware <vadim@grammarware.net>
Date: Wed, 4 Feb 2009 18:50:07 +0000
Subject: [PATCH] introducing markers and the (not yet working) test case for
 terminalize

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@437 ab42f6e0-554d-0410-b580-99e487e6eeb2
---
 shared/xsd/bgf.xsd                            |  7 ++++
 shared/xsd/xbgf.xsd                           | 18 +++++++++
 shared/xsl/bgf2bnf.xslt                       | 10 ++++-
 .../transformation/xbgf/tests/deyaccify1.bgf  | 38 +++++++++----------
 .../xbgf/tests/terminalize.baseline           | 20 ++++++++++
 .../transformation/xbgf/tests/terminalize.bgf | 17 +++++++++
 .../xbgf/tests/terminalize.xbgf               | 27 +++++++++++++
 7 files changed, 116 insertions(+), 21 deletions(-)
 create mode 100644 topics/transformation/xbgf/tests/terminalize.baseline
 create mode 100644 topics/transformation/xbgf/tests/terminalize.bgf
 create mode 100644 topics/transformation/xbgf/tests/terminalize.xbgf

diff --git a/shared/xsd/bgf.xsd b/shared/xsd/bgf.xsd
index 8773a176..e4d71d8d 100644
--- a/shared/xsd/bgf.xsd
+++ b/shared/xsd/bgf.xsd
@@ -78,6 +78,13 @@
             </xsd:sequence>
           </xsd:complexType>
         </xsd:element>
+        <xsd:element name="marked">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element ref="bgf:expression" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
         <xsd:element name="choice">
           <xsd:complexType>
             <xsd:sequence>
diff --git a/shared/xsd/xbgf.xsd b/shared/xsd/xbgf.xsd
index 3abbcc67..52a002eb 100644
--- a/shared/xsd/xbgf.xsd
+++ b/shared/xsd/xbgf.xsd
@@ -58,6 +58,7 @@
       <xsd:element ref="xbgf:reroot"/>
       <xsd:element ref="xbgf:abridge"/>
       <xsd:element ref="xbgf:strip"/>
+      <xsd:element ref="xbgf:terminalize"/>
       <xsd:element ref="xbgf:unchain"/>
       <xsd:element ref="xbgf:undefine"/>
       <xsd:element ref="xbgf:unfold"/>
@@ -648,6 +649,23 @@
     </xsd:complexType>
   </xsd:element>
 
+  <xsd:element name="terminalize">
+    <xsd:annotation>
+      <xsd:documentation>
+        Terminalizing means enriching an existing production by inserting
+        terminals in marked spaces.
+      </xsd:documentation>
+      <xsd:documentation>
+        Terminalize breaks concrete, but not abstract, semantics.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:choice>
+        <xsd:element ref="bgf:production"/>
+      </xsd:choice>
+    </xsd:complexType>
+  </xsd:element>
+  
   <xsd:element name="unchain">
     <xsd:annotation>
       <xsd:documentation>
diff --git a/shared/xsl/bgf2bnf.xslt b/shared/xsl/bgf2bnf.xslt
index 6017b08d..19a50eef 100644
--- a/shared/xsl/bgf2bnf.xslt
+++ b/shared/xsl/bgf2bnf.xslt
@@ -51,13 +51,19 @@
   <xsl:template match="bgf:expression">
     <xsl:apply-templates select="./*"/>
   </xsl:template>
-  
+
+  <xsl:template match="marked">
+    <xsl:text><![CDATA[<]]> </xsl:text>
+    <xsl:apply-templates select="./*"/>
+    <xsl:text><![CDATA[>]]> </xsl:text>
+  </xsl:template>
+
   <xsl:template match="plus">
     <xsl:text>( </xsl:text>
     <xsl:apply-templates select="./*"/>
     <xsl:text>)+ </xsl:text>
   </xsl:template>
-  
+
   <xsl:template match="star">
     <xsl:text>( </xsl:text>
     <xsl:apply-templates select="./*"/>
diff --git a/topics/transformation/xbgf/tests/deyaccify1.bgf b/topics/transformation/xbgf/tests/deyaccify1.bgf
index d9230b08..f5e08a5a 100644
--- a/topics/transformation/xbgf/tests/deyaccify1.bgf
+++ b/topics/transformation/xbgf/tests/deyaccify1.bgf
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xns1:grammar xmlns:xns1="http://planet-sl.org/bgf">
-  <xns1:production>
+<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
+  <bgf:production>
     <nonterminal>decs</nonterminal>
-    <xns1:expression>
+    <bgf:expression>
       <choice>
-	<xns1:expression>
-	  <nonterminal>dec</nonterminal>
-	</xns1:expression>
-	<xns1:expression>
-	  <sequence>
-	    <xns1:expression>
-	      <nonterminal>dec</nonterminal>
-	    </xns1:expression>
-	    <xns1:expression>
-	      <nonterminal>decs</nonterminal>
-	    </xns1:expression>
-	  </sequence>
-	</xns1:expression>
+        <bgf:expression>
+          <nonterminal>dec</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <nonterminal>dec</nonterminal>
+            </bgf:expression>
+            <bgf:expression>
+              <nonterminal>decs</nonterminal>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
       </choice>
-    </xns1:expression>
-  </xns1:production>
-</xns1:grammar>
\ No newline at end of file
+    </bgf:expression>
+  </bgf:production>
+</bgf:grammar>
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/terminalize.baseline b/topics/transformation/xbgf/tests/terminalize.baseline
new file mode 100644
index 00000000..b21538e8
--- /dev/null
+++ b/topics/transformation/xbgf/tests/terminalize.baseline
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
+  <bgf:production>
+    <nonterminal>A</nonterminal>
+    <bgf:expression>
+      <sequence>
+        <bgf:expression>
+          <nonterminal>b</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <terminal>x</terminal>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>c</nonterminal>
+        </bgf:expression>
+      </sequence>
+    </bgf:expression>
+  </bgf:production>
+</bgf:grammar>
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/terminalize.bgf b/topics/transformation/xbgf/tests/terminalize.bgf
new file mode 100644
index 00000000..2b468448
--- /dev/null
+++ b/topics/transformation/xbgf/tests/terminalize.bgf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
+  <bgf:production>
+    <nonterminal>A</nonterminal>
+    <bgf:expression>
+      <sequence>
+        <bgf:expression>
+          <nonterminal>b</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>c</nonterminal>
+        </bgf:expression>
+      </sequence>
+    </bgf:expression>
+  </bgf:production>
+</bgf:grammar>
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/terminalize.xbgf b/topics/transformation/xbgf/tests/terminalize.xbgf
new file mode 100644
index 00000000..0a49e9a5
--- /dev/null
+++ b/topics/transformation/xbgf/tests/terminalize.xbgf
@@ -0,0 +1,27 @@
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+
+  <xbgf:terminalize>
+    <bgf:production>
+      <nonterminal>A</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <nonterminal>b</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <marked>
+              <bgf:expression>
+                <terminal>x</terminal>
+              </bgf:expression>
+            </marked>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>c</nonterminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:terminalize>
+</xbgf:sequence>