steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xml.data: eliminate unions in favor of maybe.

db4
John Benediktsson 2012-07-12 19:00:12 -07:00
parent 85a198e68e
commit 3c54f12789
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
basis/xml/data/data.factor
View File

@ -8,12 +8,10 @@ IN: xml.data
TUPLE: interpolated var ; TUPLE: interpolated var ;
C: <interpolated> interpolated C: <interpolated> interpolated
UNION: nullable-string string POSTPONE: f ;
TUPLE: name TUPLE: name
{ space nullable-string } { space maybe{ string } }
{ main string } { main string }
{ url nullable-string } ; { url maybe{ string } } ;
C: <name> name C: <name> name
: ?= ( object/f object/f -- ? ) : ?= ( object/f object/f -- ? )
@ -97,8 +95,6 @@ TUPLE: attlist-decl < directive
{ att-defs string } ; { att-defs string } ;
C: <attlist-decl> attlist-decl C: <attlist-decl> attlist-decl
UNION: boolean t POSTPONE: f ;
TUPLE: entity-decl < directive TUPLE: entity-decl < directive
{ name string } { name string }
{ def string } { def string }
@ -111,20 +107,16 @@ C: <system-id> system-id
TUPLE: public-id { pubid-literal string } { system-literal string } ; TUPLE: public-id { pubid-literal string } { system-literal string } ;
C: <public-id> public-id C: <public-id> public-id
UNION: id system-id public-id POSTPONE: f ;
TUPLE: dtd TUPLE: dtd
{ directives sequence } { directives sequence }
{ entities assoc } { entities assoc }
{ parameter-entities assoc } ; { parameter-entities assoc } ;
C: <dtd> dtd C: <dtd> dtd
UNION: dtd/f dtd POSTPONE: f ;
TUPLE: doctype-decl < directive TUPLE: doctype-decl < directive
{ name string } { name string }
{ external-id id } { external-id maybe{ system-id public-id } }
{ internal-subset dtd/f } ; { internal-subset maybe{ dtd } } ;
C: <doctype-decl> doctype-decl C: <doctype-decl> doctype-decl
TUPLE: notation-decl < directive TUPLE: notation-decl < directive