Skip to content

Commit

Permalink
actualising the outdated parts of the test set; fixing xbgf:equate
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@811 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Jul 11, 2010
1 parent 6d8a632 commit 0ffa7c7
Show file tree
Hide file tree
Showing 19 changed files with 347 additions and 283 deletions.
14 changes: 7 additions & 7 deletions shared/prolog/xsd2bgf.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions topics/transformation/xbgf/tests/deyaccify_eps.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions topics/transformation/xbgf/tests/deyaccify_left.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions topics/transformation/xbgf/tests/deyaccify_left_plus.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions topics/transformation/xbgf/tests/deyaccify_right.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions topics/transformation/xbgf/tests/deyaccify_right_plus.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 5 additions & 4 deletions topics/transformation/xbgf/tests/eliminate.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
19 changes: 19 additions & 0 deletions topics/transformation/xbgf/tests/equate3.baseline
View file
Original file line number Diff line number Diff line change
@@ -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>
35 changes: 35 additions & 0 deletions topics/transformation/xbgf/tests/equate3.bgf
View file
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 7 additions & 0 deletions topics/transformation/xbgf/tests/equate3.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 5 additions & 4 deletions topics/transformation/xbgf/tests/horizontal_l.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 5 additions & 4 deletions topics/transformation/xbgf/tests/horizontal_n.xbgf
View file
Original file line number Diff line number Diff line change
@@ -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>
Loading

0 comments on commit 0ffa7c7

Please sign in to comment.