full migration to EXBGF

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@1180 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Mar 6, 2012 · 71d0b40 · 71d0b40
1 parent 867cb40
commit 71d0b40
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 78 deletions.
diff --git a/topics/island/c-iso-9899-tc3/Makefile b/topics/island/c-iso-9899-tc3/Makefile
@@ -5,12 +5,10 @@ c.1.bgf:
 	cp ../../grammars/c/iso-9899-tc3/grammar.bgf c.1.bgf
 
 c.2.bgf: refactor.exbgf c.1.bgf
-	exbgf2xbgf refactor.exbgf refactor.xbgf
-	xbgf refactor.xbgf c.1.bgf c.2.bgf
+	exbgf refactor.exbgf c.1.bgf c.2.bgf
 
-c.3.bgf: skeletify.exbgf c.2.bgf
-	exbgf2xbgf skeletify.exbgf skeletify.xbgf
-	xbgf skeletify.xbgf c.2.bgf c.3.bgf
+c.3.bgf: skeletonise.exbgf c.2.bgf
+	exbgf skeletonise.exbgf c.2.bgf c.3.bgf
 
 c.4.bgf: c.3.bgf
 	subgrammar c.3.bgf translation-unit c.4.bgf
@@ -19,4 +17,4 @@ c.html: c.4.bgf
 	bgf2html c.4.bgf c.html
 
 clean:
-	rm -f ~* *.html *.bgf refactor.xbgf skeletify.xbgf
+	rm -f ~* *.html *.bgf refactor.xbgf skeletonise.xbgf
diff --git a/topics/island/c-iso-9899-tc3/skeletify.exbgf → ...s/island/c-iso-9899-tc3/skeletonise.exbgf b/topics/island/c-iso-9899-tc3/skeletify.exbgf → ...s/island/c-iso-9899-tc3/skeletonise.exbgf
diff --git a/topics/island/csharp-ecma-334-1/Makefile b/topics/island/csharp-ecma-334-1/Makefile
@@ -8,20 +8,16 @@ cs.2.bgf: cs.1.bgf
 	subgrammar cs.1.bgf compilation-unit cs.2.bgf
 
 cs.3.bgf: cs.2.bgf refactor.using.exbgf
-	exbgf2xbgf refactor.using.exbgf refactor.using.xbgf
-	xbgf refactor.using.xbgf cs.2.bgf cs.3.bgf
+	exbgf refactor.using.exbgf cs.2.bgf cs.3.bgf
 
 cs.4.bgf: cs.3.bgf refactor.global.exbgf
-	exbgf2xbgf refactor.global.exbgf refactor.global.xbgf
-	xbgf refactor.global.xbgf cs.3.bgf cs.4.bgf
+	exbgf refactor.global.exbgf cs.3.bgf cs.4.bgf
 
 cs.5.bgf: cs.4.bgf refactor.namespace.exbgf
-	exbgf2xbgf refactor.namespace.exbgf refactor.namespace.xbgf
-	xbgf refactor.namespace.xbgf cs.4.bgf cs.5.bgf
+	exbgf refactor.namespace.exbgf cs.4.bgf cs.5.bgf
 
-cs.6.bgf: cs.5.bgf skeletify.exbgf
-	exbgf2xbgf skeletify.exbgf skeletify.xbgf
-	xbgf skeletify.xbgf cs.5.bgf cs.6.bgf
+cs.6.bgf: cs.5.bgf skeletonise.exbgf
+	exbgf skeletonise.exbgf cs.5.bgf cs.6.bgf
 
 cs.7.bgf: cs.6.bgf
 	subgrammar cs.6.bgf compilation-unit cs.7.bgf

diff --git a/topics/island/csharp-ecma-334-1/refactor.namespace.exbgf b/topics/island/csharp-ecma-334-1/refactor.namespace.exbgf
@@ -23,14 +23,14 @@
 	<exbgf:deyaccifyH>interface-modifiers</exbgf:deyaccifyH>
 	<exbgf:deyaccifyH>enum-modifiers</exbgf:deyaccifyH>
 	<exbgf:deyaccifyH>delegate-modifiers</exbgf:deyaccifyH>
-	<exbgf:uniteMany>
+	<exbgf:unite-many>
 		<add>class-modifier</add>
 		<add>struct-modifier</add>
 		<add>interface-modifier</add>
 		<add>enum-modifier</add>
 		<add>delegate-modifier</add>
 		<yield>modifier</yield>
-	</exbgf:uniteMany>
+	</exbgf:unite-many>
 	<xbgf:horizontal>
 		<nonterminal>modifier</nonterminal>
 	</xbgf:horizontal>

diff --git a/.../island/csharp-ecma-334-1/skeletify.exbgf → ...sland/csharp-ecma-334-1/skeletonise.exbgf b/.../island/csharp-ecma-334-1/skeletify.exbgf → ...sland/csharp-ecma-334-1/skeletonise.exbgf
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <exbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf" xmlns:exbgf="http://planet-sl.org/exbgf">
-	<xbgf:rename>
-		<nonterminal>
+	<exbgf:renameN>
 			<from>using-directive-insides</from>
 			<to>not-semicolon</to>
-		</nonterminal>
-	</xbgf:rename>
+	</exbgf:renameN>
 	<xbgf:undefine>
 		<nonterminal>not-semicolon</nonterminal>
 	</xbgf:undefine>
-	<exbgf:uniteMany>
+	<exbgf:unite-many>
 		<add>global-attribute-section-insides</add>
 		<add>attribute-section-insides</add>
 		<yield>not-right-square-bracket</yield>
-	</exbgf:uniteMany>
+	</exbgf:unite-many>
 	<xbgf:undefine>
 		<nonterminal>not-right-square-bracket</nonterminal>
 	</xbgf:undefine>
@@ -200,65 +198,53 @@
 	<xbgf:horizontal>
 		<nonterminal>namespace-member-declaration</nonterminal>
 	</xbgf:horizontal>
-	<exbgf:uniteMany>
+	<exbgf:unite-many>
 		<add>class-base</add>
 		<add>struct-interfaces</add>
 		<add>interface-base</add>
 		<add>enum-base</add>
 		<yield>not-left-curly</yield>
-	</exbgf:uniteMany>
+	</exbgf:unite-many>
 	<xbgf:undefine>
 		<nonterminal>not-left-curly</nonterminal>
 	</xbgf:undefine>
-	<exbgf:uniteMany>
+	<exbgf:unite-many>
 		<add>enum-body-insides</add>
 		<add>namespace-body-insides</add>
 		<add>class-member-declarations</add>
 		<add>struct-member-declarations</add>
 		<add>interface-member-declarations</add>
 		<add>enum-member-declarations</add>
 		<yield>balanced-curlies</yield>
-	</exbgf:uniteMany>
+	</exbgf:unite-many>
 	<xbgf:undefine>
 		<nonterminal>balanced-curlies</nonterminal>
 	</xbgf:undefine>
-	<xbgf:rename>
-		<nonterminal>
+	<exbgf:renameN>
 			<from>formal-parameter-list</from>
 			<to>not-right-parenthesis</to>
-		</nonterminal>
-	</xbgf:rename>
+
+	</exbgf:renameN>
 	<xbgf:undefine>
 		<nonterminal>not-right-parenthesis</nonterminal>
 	</xbgf:undefine>
-	<exbgf:uniteMany>
+	<exbgf:unite-many>
 		<add>qualified-identifier</add>
 		<add>identifier</add>
 		<add>type</add>
 		<yield>not-whitespace</yield>
-	</exbgf:uniteMany>
+	</exbgf:unite-many>
 	<xbgf:undefine>
 		<nonterminal>not-whitespace</nonterminal>
 	</xbgf:undefine>
-	<xbgf:widen>
-		<bgf:expression>
+	<exbgf:widen12O>
 			<terminal>;</terminal>
-		</bgf:expression>
-		<bgf:expression>
-			<optional>
-				<bgf:expression>
-					<terminal>;</terminal>
-				</bgf:expression>
-			</optional>
-		</bgf:expression>
-		<in>
-			<nonterminal>namespace-member-declaration</nonterminal>
-		</in>
-	</xbgf:widen>
-	<exbgf:massageDouble>
+		<in>namespace-member-declaration</in>
+	</exbgf:widen12O>
+	<exbgf:massage-double>
 		<optional/>
 		<terminal>;</terminal>
-	</exbgf:massageDouble>
+	</exbgf:massage-double>
 	<xbgf:widen>
 		<bgf:expression>
 			<nonterminal>balanced-curlies</nonterminal>
@@ -274,10 +260,10 @@
 			<nonterminal>namespace-member-declaration</nonterminal>
 		</in>
 	</xbgf:widen>
-	<exbgf:massageDouble>
+	<exbgf:massage-double>
 		<optional/>
 		<nonterminal>balanced-curlies</nonterminal>
-	</exbgf:massageDouble>
+	</exbgf:massage-double>
 	<xbgf:factor>
 		<bgf:expression>
 			<choice>

diff --git a/topics/island/fl-rascal/Makefile b/topics/island/fl-rascal/Makefile
@@ -8,11 +8,11 @@ fl.2.bgf: fl.1.bgf
 	../../../shared/generators/reroot2top fl.1.bgf reroot.xbgf
 	xbgf reroot.xbgf fl.1.bgf fl.2.bgf
 
-fl.3.bgf: refactor.xbgf fl.2.bgf
-	xbgf refactor.xbgf fl.2.bgf fl.3.bgf
+fl.3.bgf: refactor.exbgf fl.2.bgf
+	exbgf refactor.exbgf fl.2.bgf fl.3.bgf
 
-fl.4.bgf: skeletify.xbgf fl.3.bgf
-	xbgf skeletify.xbgf fl.3.bgf fl.4.bgf
+fl.4.bgf: skeletonise.exbgf fl.3.bgf
+	exbgf skeletonise.exbgf fl.3.bgf fl.4.bgf
 
 fl.5.bgf: fl.4.bgf
 	subgrammar fl.4.bgf Program fl.5.bgf
@@ -21,4 +21,4 @@ fl.html: fl.5.bgf
 	bgf2html fl.5.bgf fl.html
 
 clean:
-	rm -f ~* *.html *.bgf reroot.xbgf
+	rm -f ~* *.html *.bgf reroot.xbgf
diff --git a/topics/island/fl-rascal/refactor.exbgf b/topics/island/fl-rascal/refactor.exbgf
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<exbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf" xmlns:exbgf="http://planet-sl.org/exbgf">
+	<xbgf:inline>Function</xbgf:inline>
+</exbgf:sequence>
diff --git a/topics/island/fl-rascal/refactor.xbgf b/topics/island/fl-rascal/refactor.xbgf
diff --git a/topics/island/fl-rascal/skeletify.xbgf b/topics/island/fl-rascal/skeletify.xbgf
diff --git a/topics/island/fl-rascal/skeletonise.exbgf b/topics/island/fl-rascal/skeletonise.exbgf
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<exbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf" xmlns:exbgf="http://planet-sl.org/exbgf">
+	<exbgf:renameN>
+		<from>Name</from>
+		<to>NotWhitespace</to>
+	</exbgf:renameN>
+	<exbgf:renameN>
+		<from>Expr</from>
+		<to>NotNewline</to>
+	</exbgf:renameN>
+	<xbgf:undefine>
+		<nonterminal>NotNewline</nonterminal>
+	</xbgf:undefine>
+</exbgf:sequence>