X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fxpath%2Fxpath_internal_parser.mly;h=6395b6e38b1e366473b13d9d04f1ef33d8e94e33;hp=e5c070070514f811b1cab3e8e18992ba16e8c8c2;hb=fe2ba1820282783ae8c10fbbbd2b65d3dc4c67f2;hpb=fed343e8df1900043dc993ac5458c757d3ac2ee0 diff --git a/src/xpath/xpath_internal_parser.mly b/src/xpath/xpath_internal_parser.mly index e5c0700..6395b6e 100644 --- a/src/xpath/xpath_internal_parser.mly +++ b/src/xpath/xpath_internal_parser.mly @@ -99,12 +99,7 @@ step: axis_test: AXIS COLONCOLON test { let a, (t,k) = $1, $3 in match a with - Attribute when QNameSet.is_finite t -> - [ a, ((QNameSet.fold - (fun t a -> - QNameSet.add - (QName.attribute t) a) - t QNameSet.empty), k) ] + | Attribute -> [ a, (t, NodeKind.Attribute) ] | Preceding|Following -> [ (Descendant true, (t,k)); if a == Preceding then @@ -136,8 +131,7 @@ test: } | PI { (if $1 = "" then star else QNameSet.singleton( - QName.processing_instruction ( - QName.of_string $1) + QName.of_string $1 )), NodeKind.ProcessingInstruction } | TAG { QNameSet.singleton(QName.of_string $1),