diff --git a/basis/xml/errors/errors.factor b/basis/xml/errors/errors.factor index fea516374d..7ac5c8420e 100644 --- a/basis/xml/errors/errors.factor +++ b/basis/xml/errors/errors.factor @@ -47,12 +47,12 @@ XML-ERROR: no-entity thing ; XML-ERROR: mismatched open close ; -TUPLE: unclosed line column tags ; +ERROR: unclosed line column tags ; : throw-unclosed ( -- * ) get-line get-column xml-stack get rest-slice [ first name>> ] map - \ unclosed boa throw ; + unclosed ; XML-ERROR: bad-uri string ; diff --git a/basis/xml/syntax/syntax.factor b/basis/xml/syntax/syntax.factor index 8113ed7f74..d43c127e1f 100644 --- a/basis/xml/syntax/syntax.factor +++ b/basis/xml/syntax/syntax.factor @@ -10,13 +10,13 @@ IN: xml.syntax alist swap '[ _ no-tag boa throw ] suffix - '[ dup main>> _ case ] ; + >alist swap '[ _ no-tag ] suffix '[ dup main>> _ case ] ; : define-tags ( word effect -- ) [ dup dup "xtable" word-prop compile-tags ] dip define-declared ;