suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1231 from simmone/xml

Browse Source 
not sort xml attributes
This commit is contained in:
Jay McCarthy 2016-02-03 11:07:02 -05:00
commit ced25315ac
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/racket-test/tests/xml/test.rkt
View File

@ -463,6 +463,12 @@ END
"<a href=\"#\">inner</a>" "<a href=\"#\">inner</a>"
'(a ([href "#"]) "inner")) '(a ([href "#"]) "inner"))
(test-syntax:read-xml/element
"<a c=\"1\" a=\"2\" b=\"3\">inner</a>"
'(a ([c "1"] [a "2"] [b "3"]) "inner"))
(test-syntax:read-xml/element/exn "<a c=\"1\" a=\"2\" c=\"3\">inner</a>" "read-xml: lex-error: at position 1.20/21: duplicated attribute name c")
(test-syntax:read-xml/element (test-syntax:read-xml/element
"<root>&nbsp;</root>" "<root>&nbsp;</root>"
'(root () nbsp)) '(root () nbsp))

15
racket/collects/xml/private/reader.rkt
View File

@ -270,17 +270,16 @@
;; lex-attributes : Input-port (-> Location) -> (listof Attribute) ;; lex-attributes : Input-port (-> Location) -> (listof Attribute)
(define (lex-attributes in pos) (define (lex-attributes in pos)
(sort (let loop () (let* ([result_list
(let loop ()
(skip-space in) (skip-space in)
(cond [(name-start? (peek-char-or-special in)) (cond [(name-start? (peek-char-or-special in))
(cons (lex-attribute in pos) (loop))] (cons (lex-attribute in pos) (loop))]
[else null])) [else null]))]
(lambda (a b) [check_dup (check-duplicates result_list (lambda (a b) (eq? (attribute-name a) (attribute-name b))))])
(let ([na (attribute-name a)] (if check_dup
[nb (attribute-name b)]) (lex-error in pos "duplicated attribute name ~a" (attribute-name check_dup))
(cond result_list)))
[(eq? na nb) (lex-error in pos "duplicated attribute name ~a" na)]
[else (string<? (symbol->string na) (symbol->string nb))])))))
;; lex-attribute : Input-port (-> Location) -> Attribute ;; lex-attribute : Input-port (-> Location) -> Attribute
(define (lex-attribute in pos) (define (lex-attribute in pos)