Permalink
Browse files

actualising the outdated parts of the test set; fixing xbgf:equate

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@811 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information...
grammarware committed Jul 11, 2010
1 parent 6d8a632 commit 0ffa7c789766ef78f2010552f148f5cd744da535
View
@@ -594,14 +594,14 @@ uqImportXsd(SGs1,(Pfx,Ns),G1,G4)
SG1 = (S1,_,_),
attribute(targetNamespace,S1,Ns),
transform(try(delpfx_rules(Pfx)),G1,G2),
- definedNs(G2,Defined1),
+% definedNs(G2,Defined1),
completeXsd(SG1,G3),
- definedNs(G3,Defined2),
- intersection(Defined1,Defined2,Defined3),
- require(
- ( Defined3 == [] ),
- 'XSD import with clashing unqualified names ~q.',
- [Defined3]),
+% definedNs(G3,Defined2),
+% intersection(Defined1,Defined2,Defined3),
+% require(
+% ( Defined3 == [] ),
+% 'XSD import with clashing unqualified names ~q.',
+% [Defined3]),
G2 = g(Rs1,Ps1),
G3 = g(Rs2,Ps2),
union(Rs1,Rs2,Rs3),
@@ -1,6 +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 xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:deyaccify>
+ <nonterminal>foo</nonterminal>
+ </xbgf:deyaccify>
</xbgf:sequence>
@@ -1,6 +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 xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:deyaccify>
+ <nonterminal>foo</nonterminal>
+ </xbgf:deyaccify>
</xbgf:sequence>
@@ -1,6 +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 xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:deyaccify>
+ <nonterminal>foo</nonterminal>
+ </xbgf:deyaccify>
</xbgf:sequence>
@@ -1,6 +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 xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:deyaccify>
+ <nonterminal>foo</nonterminal>
+ </xbgf:deyaccify>
</xbgf:sequence>
@@ -1,6 +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 xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:deyaccify>
+ <nonterminal>foo</nonterminal>
+ </xbgf:deyaccify>
</xbgf:sequence>
@@ -1,5 +1,6 @@
-<xbgf:sequence
- xmlns:bgf="http://planet-sl.org/bgf"
- xmlns:xbgf="http://planet-sl.org/xbgf">
- <xbgf:eliminate>intexpr</xbgf:eliminate>
+<?xml version="1.0"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:eliminate>
+ <nonterminal>intexpr</nonterminal>
+ </xbgf:eliminate>
</xbgf:sequence>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
+ <bgf:production>
+ <nonterminal>bar</nonterminal>
+ <bgf:expression>
+ <star>
+ <bgf:expression>
+ <nonterminal>wez</nonterminal>
+ </bgf:expression>
+ </star>
+ </bgf:expression>
+ </bgf:production>
+ <bgf:production>
+ <nonterminal>bar</nonterminal>
+ <bgf:expression>
+ <terminal>x</terminal>
+ </bgf:expression>
+ </bgf:production>
+</bgf:grammar>
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
+ <bgf:production>
+ <nonterminal>foo</nonterminal>
+ <bgf:expression>
+ <star>
+ <bgf:expression>
+ <nonterminal>wez</nonterminal>
+ </bgf:expression>
+ </star>
+ </bgf:expression>
+ </bgf:production>
+ <bgf:production>
+ <nonterminal>foo</nonterminal>
+ <bgf:expression>
+ <terminal>x</terminal>
+ </bgf:expression>
+ </bgf:production>
+ <bgf:production>
+ <nonterminal>bar</nonterminal>
+ <bgf:expression>
+ <terminal>x</terminal>
+ </bgf:expression>
+ </bgf:production>
+ <bgf:production>
+ <nonterminal>bar</nonterminal>
+ <bgf:expression>
+ <star>
+ <bgf:expression>
+ <nonterminal>wez</nonterminal>
+ </bgf:expression>
+ </star>
+ </bgf:expression>
+ </bgf:production>
+</bgf:grammar>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:equate>
+ <align>foo</align>
+ <with>bar</with>
+ </xbgf:equate>
+</xbgf:sequence>
@@ -1,5 +1,6 @@
-<xbgf:sequence
- xmlns:bgf="http://planet-sl.org/bgf"
- xmlns:xbgf="http://planet-sl.org/xbgf">
- <xbgf:horizontal>decs</xbgf:horizontal>
+<?xml version="1.0"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:horizontal>
+ <nonterminal>decs</nonterminal>
+ </xbgf:horizontal>
</xbgf:sequence>
@@ -1,5 +1,6 @@
-<xbgf:sequence
- xmlns:bgf="http://planet-sl.org/bgf"
- xmlns:xbgf="http://planet-sl.org/xbgf">
- <xbgf:horizontal>decs</xbgf:horizontal>
+<?xml version="1.0"?>
+<xbgf:sequence xmlns:bgf="http://planet-sl.org/bgf" xmlns:xbgf="http://planet-sl.org/xbgf">
+ <xbgf:horizontal>
+ <nonterminal>decs</nonterminal>
+ </xbgf:horizontal>
</xbgf:sequence>
Oops, something went wrong.

0 comments on commit 0ffa7c7

Please sign in to comment.