X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fxpath%2Fast.ml;h=5b322a4af56a28c2d01c596756820aaa7ee4f128;hp=a90a41bd48420156b6059115f45fbf19e9f79f7c;hb=fe2ba1820282783ae8c10fbbbd2b65d3dc4c67f2;hpb=b00bff88c7902e828804c06b7f9dc55222fdc84e diff --git a/src/xpath/ast.ml b/src/xpath/ast.ml index a90a41b..5b322a4 100644 --- a/src/xpath/ast.ml +++ b/src/xpath/ast.ml @@ -13,11 +13,6 @@ (* *) (***********************************************************************) -(* - Time-stamp: -*) - - type path = single_path list and single_path = Absolute of step list | Relative of step list and step = axis * test * expr list @@ -132,15 +127,16 @@ and print_test fmt (ts,kind) = Text -> pp fmt "%s" "text()" | Element | Attribute -> pp fmt "%s" begin - if ts == star then "*" - else QName.to_string (QNameSet.choose ts) + if QNameSet.is_finite ts then + QName.to_string (QNameSet.choose ts) + else "*" end | Comment -> pp fmt "%s" "comment()" | ProcessingInstruction -> pp fmt "processing-instruction(%s)" begin if ts == star then "" - else "'" ^ (QName.to_string (QNameSet.choose ts)) ^ "'" + else "\"" ^ (QName.to_string (QNameSet.choose ts)) ^ "\"" end | Node -> pp fmt "%s" "node()" | Document -> pp fmt "%s" "" @@ -186,4 +182,3 @@ let invert_axis = function | Preceding -> Following | Following -> Preceding ;; -