From 79d4bb04e9c6fa44e9583d225f5d5775a793e576 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Thu, 15 Jan 2009 16:35:55 -0600 Subject: [PATCH 1/3] More descriptive XML errors --- basis/xml/errors/errors-tests.factor | 23 +++++++++------ basis/xml/errors/errors.factor | 42 +++++++++++++++++++--------- basis/xml/tokenize/tokenize.factor | 13 ++++----- basis/xml/xml-docs.factor | 17 ++++++++--- 4 files changed, 61 insertions(+), 34 deletions(-) diff --git a/basis/xml/errors/errors-tests.factor b/basis/xml/errors/errors-tests.factor index e72e465f0d..426ef57736 100644 --- a/basis/xml/errors/errors-tests.factor +++ b/basis/xml/errors/errors-tests.factor @@ -6,22 +6,27 @@ IN: xml.errors.tests '[ _ string>xml ] swap '[ _ = ] must-fail-with ; T{ no-entity f 1 10 "nbsp" } " " xml-error-test -T{ mismatched f 1 8 T{ name f "" "x" "" } T{ name f "" "y" "" } -} "" xml-error-test +T{ mismatched f 1 8 T{ name f "" "x" "" } T{ name f "" "y" "" } } + "" xml-error-test T{ unclosed f 1 4 V{ T{ name f "" "x" "" } } } "" xml-error-test T{ nonexist-ns f 1 5 "x" } "" xml-error-test T{ unopened f 1 5 } "" xml-error-test -T{ not-yes/no f 1 41 "maybe" } "" xml-error-test +T{ not-yes/no f 1 41 "maybe" } + "" xml-error-test T{ extra-attrs f 1 32 V{ T{ name f "" "foo" f } } } "" xml-error-test -T{ bad-version f 1 28 "5 million" } "" xml-error-test +T{ bad-version f 1 28 "5 million" } + "" xml-error-test T{ notags f } "" xml-error-test T{ multitags } "" xml-error-test -T{ bad-prolog f 1 26 T{ prolog f "1.0" "UTF-8" f } -} "" xml-error-test +T{ bad-prolog f 1 26 T{ prolog f "1.0" "UTF-8" f } } + "" xml-error-test T{ capitalized-prolog f 1 6 "XmL" } "" -xml-error-test + xml-error-test T{ pre/post-content f "x" t } "x" xml-error-test T{ versionless-prolog f 1 8 } "" xml-error-test -T{ bad-instruction f 1 11 T{ instruction f "xsl" } -} "" xml-error-test +T{ bad-instruction f 1 11 T{ instruction f "xsl" } } + "" xml-error-test +T{ unclosed-quote f 1 13 } " } "." } @@ -324,6 +321,15 @@ HELP: state-parse HELP: pre/post-content { $class-description "describes the error where a non-whitespace string is used before or after the main tag in an XML document. Contains two slots: string contains the offending string, and pre? is t if it occured before the main tag and f if it occured after" } ; +HELP: unclosed-quote +{ $class-description "describes the error where a quotation for an attribute value is opened but not closed before the end of the document." } ; + +HELP: bad-name +{ $class-description "describes the error where a name is used, for example in an XML tag or attribute key, which is invalid." } ; + +HELP: quoteless-attr +{ $class-description "describes the error where an attribute of an XML tag is missing quotes around a value." } ; + HELP: entities { $description "a hash table from default XML entity names (like & and <) to the characters they represent. This is automatically included when parsing any XML document." } { $see-also html-entities } ; @@ -444,6 +450,9 @@ ARTICLE: { "xml" "errors" } "XML parsing errors" { $subsection expected } { $subsection no-entity } { $subsection pre/post-content } + { $subsection unclosed-quote } + { $subsection bad-name } + { $subsection quoteless-attr } "Additionally, most of these errors delegate to " { $link parsing-error } " in order to provide more information" $nl "Note that, in parsing an XML document, only the first error is reported." ; @@ -456,7 +465,7 @@ ARTICLE: { "xml" "entities" } "XML entities" { $subsection with-html-entities } ; ARTICLE: "xml" "XML parser" -"The " { $vocab-link "xml" } " vocabulary implements the XML 1.1 standard, converting strings of text into XML and vice versa." +"The " { $vocab-link "xml" } " vocabulary implements the XML 1.0 and 1.1 standards, converting strings of text into XML and vice versa." { $subsection { "xml" "reading" } } { $subsection { "xml" "writing" } } { $subsection { "xml" "classes" } } From 11b9dbfcd59129b8f5afe218a39b4fd251738d36 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Thu, 15 Jan 2009 16:46:57 -0600 Subject: [PATCH 2/3] Placating Slava (2) --- basis/unicode/breaks/breaks.factor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index e3e1282676..336d99657e 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -199,8 +199,8 @@ to: word-table : walk-down ( str i -- j ) dupd (walk-down) [ 1- (walk-down) ] [ drop f ] if* ; -: word-break? ( table-entry i str -- ? ) - spin { +: word-break? ( str i table-entry -- ? ) + { { t [ 2drop f ] } { f [ 2drop t ] } { check-letter-after @@ -214,10 +214,10 @@ to: word-table } case ; :: word-break-next ( old-class new-char i str -- next-class ? ) - new-char dup format/extended? - [ drop old-class dup { 1 2 3 } member? ] [ - word-break-prop old-class over word-table-nth - i str word-break? + new-char format/extended? + [ old-class dup { 1 2 3 } member? ] [ + new-char word-break-prop old-class over word-table-nth + [ str i ] dip word-break? ] if ; PRIVATE> From 756464a4871ec7e9a0faf52b0c24e1c2ed257c6b Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Fri, 16 Jan 2009 00:38:18 +0100 Subject: [PATCH 3/3] FUEL: Help browser: Fix for links to articles keyed by string lists. --- extra/fuel/fuel.factor | 2 +- misc/fuel/fuel-eval.el | 1 + misc/fuel/fuel-help.el | 3 ++- misc/fuel/fuel-markup.el | 7 ++++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor index 46d6ba12c7..f52a34ff28 100644 --- a/extra/fuel/fuel.factor +++ b/extra/fuel/fuel.factor @@ -141,7 +141,7 @@ PRIVATE> : fuel-get-article ( name -- ) article fuel-eval-set-result ; -MEMO: fuel-get-article-title ( name -- ) +: fuel-get-article-title ( name -- ) articles get at [ article-title ] [ f ] if* fuel-eval-set-result ; : fuel-word-help ( name -- ) (fuel-word-help) fuel-eval-set-result ; diff --git a/misc/fuel/fuel-eval.el b/misc/fuel/fuel-eval.el index 543d23bd3f..4c34ef17b8 100644 --- a/misc/fuel/fuel-eval.el +++ b/misc/fuel/fuel-eval.el @@ -31,6 +31,7 @@ ((listp sexp) (case (car sexp) (:array (factor--seq 'V{ '} (cdr sexp))) + (:seq (factor--seq '{ '} (cdr sexp))) (:quote (format "\\ %s" (factor `(:factor ,(cadr sexp))))) (:quotation (factor--seq '\[ '\] (cdr sexp))) (:using (factor `(USING: ,@(cdr sexp) :end))) diff --git a/misc/fuel/fuel-help.el b/misc/fuel/fuel-help.el index 705d1469a2..a82de388da 100644 --- a/misc/fuel/fuel-help.el +++ b/misc/fuel/fuel-help.el @@ -137,7 +137,8 @@ (defun fuel-help--get-article (name label) (message "Retrieving article ...") - (let* ((cmd `(:fuel* ((,name fuel-get-article)) "fuel" t)) + (let* ((name (if (listp name) (cons :seq name) name)) + (cmd `(:fuel* ((,name fuel-get-article)) "fuel" t)) (ret (fuel-eval--send/wait cmd)) (res (fuel-eval--retort-result ret))) (if (not res) diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 696e4ff080..6a374cd5c8 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -61,7 +61,7 @@ (defun fuel-markup--insert-button (label link type) (let ((label (format "%s" label)) - (link (format "%s" link))) + (link (if (listp link) link (format "%s" link)))) (insert-text-button label :type 'fuel-markup--button 'markup-link link @@ -70,8 +70,9 @@ 'help-echo (format "%s (%s)" label type)))) (defun fuel-markup--article-title (name) - (fuel-eval--retort-result - (fuel-eval--send/wait `(:fuel* ((,name fuel-get-article-title)) "fuel")))) + (let ((name (if (listp name) (cons :seq name) name))) + (fuel-eval--retort-result + (fuel-eval--send/wait `(:fuel* ((,name fuel-get-article-title)) "fuel"))))) (defun fuel-markup--link-at-point () (let ((button (condition-case nil (forward-button 0) (error nil))))