genshi/mirror: genshi/path.py annotate

annotate genshi/path.py @ 518:c1f2a859fd75 trunk

Attributes selected with an XPath are now returned as an `Attrs()` object in all cases. Incidentally this also required adding explicit type coercion to the parser in `genshi.path`.

author	athomas
date	Thu, 07 Jun 2007 13:52:13 +0000
parents	317a7f4e3c69
children	57b5d5138f1a

rev	line source
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	1 # -- coding: utf-8 --
5479aae32f5a Initial import. cmlenz parents: diff changeset	2 #
66 59eb24184e9c Switch copyright to Edgewall and URLs to markup.edgewall.org. cmlenz parents: 61 diff changeset	3 # Copyright (C) 2006 Edgewall Software
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	4 # All rights reserved.
5479aae32f5a Initial import. cmlenz parents: diff changeset	5 #
5479aae32f5a Initial import. cmlenz parents: diff changeset	6 # This software is licensed as described in the file COPYING, which
5479aae32f5a Initial import. cmlenz parents: diff changeset	7 # you should have received as part of this distribution. The terms
230 84168828b074 Renamed Markup to Genshi in repository. cmlenz parents: 228 diff changeset	8 # are also available at http://genshi.edgewall.org/wiki/License.
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	9 #
5479aae32f5a Initial import. cmlenz parents: diff changeset	10 # This software consists of voluntary contributions made by many
5479aae32f5a Initial import. cmlenz parents: diff changeset	11 # individuals. For the exact contribution history, see the revision
230 84168828b074 Renamed Markup to Genshi in repository. cmlenz parents: 228 diff changeset	12 # history and logs, available at http://genshi.edgewall.org/log/.
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	13
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	14 """Basic support for evaluating XPath expressions against streams.
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	15
230 84168828b074 Renamed Markup to Genshi in repository. cmlenz parents: 228 diff changeset	16 >>> from genshi.input import XML
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	17 >>> doc = XML('''<doc>
516 317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	18 ... <items count="4">
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	19 ... <item status="new">
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	20 ... <summary>Foo</summary>
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	21 ... </item>
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	22 ... <item status="closed">
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	23 ... <summary>Bar</summary>
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	24 ... </item>
516 317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	25 ... <item status="closed" resolution="invalid">
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	26 ... <summary>Baz</summary>
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	27 ... </item>
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	28 ... <item status="closed" resolution="fixed">
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	29 ... <summary>Waz</summary>
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	30 ... </item>
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	31 ... </items>
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	32 ... </doc>''')
516 317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	33 >>> print doc.select('items/item[@status="closed" and '
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	34 ... '(@resolution="invalid" or not(@resolution))]/summary/text()')
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	35 BarBaz
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	36
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	37 Because the XPath engine operates on markup streams (as opposed to tree
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	38 structures), it only implements a subset of the full XPath 1.0 language.
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	39 """
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	40
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	41 from math import ceil, floor
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	42 import re
5479aae32f5a Initial import. cmlenz parents: diff changeset	43
230 84168828b074 Renamed Markup to Genshi in repository. cmlenz parents: 228 diff changeset	44 from genshi.core import Stream, Attrs, Namespace, QName
84168828b074 Renamed Markup to Genshi in repository. cmlenz parents: 228 diff changeset	45 from genshi.core import START, END, TEXT, COMMENT, PI
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	46
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	47 __all__ = ['Path', 'PathSyntaxError']
425 073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	48 __docformat__ = 'restructuredtext en'
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	49
5479aae32f5a Initial import. cmlenz parents: diff changeset	50
114 4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	51 class Axis(object):
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	52 """Defines constants for the various supported XPath axes."""
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	53
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	54 ATTRIBUTE = 'attribute'
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	55 CHILD = 'child'
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	56 DESCENDANT = 'descendant'
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	57 DESCENDANT_OR_SELF = 'descendant-or-self'
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	58 SELF = 'self'
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	59
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	60 def forname(cls, name):
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	61 """Return the axis constant for the given name, or `None` if no such
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	62 axis was defined.
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	63 """
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	64 return getattr(cls, name.upper().replace('-', '_'), None)
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	65 forname = classmethod(forname)
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	66
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	67
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	68 ATTRIBUTE = Axis.ATTRIBUTE
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	69 CHILD = Axis.CHILD
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	70 DESCENDANT = Axis.DESCENDANT
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	71 DESCENDANT_OR_SELF = Axis.DESCENDANT_OR_SELF
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	72 SELF = Axis.SELF
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	73
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	74
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	75 class Path(object):
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	76 """Implements basic XPath support on streams.
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	77
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	78 Instances of this class represent a "compiled" XPath expression, and provide
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	79 methods for testing the path against a stream, as well as extracting a
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	80 substream matching that path.
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	81 """
5479aae32f5a Initial import. cmlenz parents: diff changeset	82
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	83 def __init__(self, text, filename=None, lineno=-1):
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	84 """Create the path object from a string.
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	85
425 073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	86 :param text: the path expression
498 700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	87 :param filename: the name of the file in which the path expression was
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	88 found (used in error messages)
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	89 :param lineno: the line on which the expression was found
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	90 """
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	91 self.source = text
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	92 self.paths = PathParser(text, filename, lineno).parse()
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	93
5479aae32f5a Initial import. cmlenz parents: diff changeset	94 def __repr__(self):
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	95 paths = []
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	96 for path in self.paths:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	97 steps = []
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	98 for axis, nodetest, predicates in path:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	99 steps.append('%s::%s' % (axis, nodetest))
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	100 for predicate in predicates:
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	101 steps[-1] += '[%s]' % predicate
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	102 paths.append('/'.join(steps))
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	103 return '<%s "%s">' % (self.__class__.__name__, '\|'.join(paths))
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	104
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	105 def select(self, stream, namespaces=None, variables=None):
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	106 """Returns a substream of the given stream that matches the path.
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	107
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	108 If there are no matches, this method returns an empty stream.
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	109
230 84168828b074 Renamed Markup to Genshi in repository. cmlenz parents: 228 diff changeset	110 >>> from genshi.input import XML
33 1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	111 >>> xml = XML('<root><elem><child>Text</child></elem></root>')
61 448792ab1303 Use a different namespace than Kid uses. cmlenz parents: 38 diff changeset	112
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	113 >>> print Path('.//child').select(xml)
33 1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	114 <child>Text</child>
1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	115
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	116 >>> print Path('.//child/text()').select(xml)
33 1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	117 Text
1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	118
425 073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	119 :param stream: the stream to select from
073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	120 :param namespaces: (optional) a mapping of namespace prefixes to URIs
073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	121 :param variables: (optional) a mapping of variable names to values
073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	122 :return: the substream matching the path, or an empty stream
498 700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	123 :rtype: `Stream`
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	124 """
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	125 if namespaces is None:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	126 namespaces = {}
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	127 if variables is None:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	128 variables = {}
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	129 stream = iter(stream)
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	130 def _generate():
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	131 test = self.test()
305 60111a041e7c Various performance-oriented tweaks. cmlenz parents: 282 diff changeset	132 for event in stream:
60111a041e7c Various performance-oriented tweaks. cmlenz parents: 282 diff changeset	133 result = test(event, namespaces, variables)
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	134 if result is True:
305 60111a041e7c Various performance-oriented tweaks. cmlenz parents: 282 diff changeset	135 yield event
330 3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	136 if event[0] is START:
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	137 depth = 1
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	138 while depth > 0:
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	139 subevent = stream.next()
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	140 if subevent[0] is START:
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	141 depth += 1
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	142 elif subevent[0] is END:
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	143 depth -= 1
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	144 yield subevent
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	145 test(subevent, namespaces, variables,
3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	146 updateonly=True)
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	147 elif result:
5479aae32f5a Initial import. cmlenz parents: diff changeset	148 yield result
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	149 return Stream(_generate())
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	150
38 ee669cb9cccc Fix for #2 (incorrect context node in path expressions). Still some paths that produce incorrect results, but the common case seems to work now. cmlenz parents: 37 diff changeset	151 def test(self, ignore_context=False):
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	152 """Returns a function that can be used to track whether the path matches
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	153 a specific stream event.
3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	154
425 073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	155 The function returned expects the positional arguments ``event``,
073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	156 ``namespaces`` and ``variables``. The first is a stream event, while the
305 60111a041e7c Various performance-oriented tweaks. cmlenz parents: 282 diff changeset	157 latter two are a mapping of namespace prefixes to URIs, and a mapping
306 095a754f95a8 Minor optimization for XPath evaluation. cmlenz parents: 305 diff changeset	158 of variable names to values, respectively. In addition, the function
425 073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	159 accepts an ``updateonly`` keyword argument that default to ``False``. If
073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	160 it is set to ``True``, the function only updates its internal state,
306 095a754f95a8 Minor optimization for XPath evaluation. cmlenz parents: 305 diff changeset	161 but does not perform any tests or return a result.
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	162
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	163 If the path matches the event, the function returns the match (for
425 073640758a42 Try to use proper reStructuredText for docstrings throughout. cmlenz parents: 386 diff changeset	164 example, a `START` or `TEXT` event.) Otherwise, it returns ``None``.
33 1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	165
230 84168828b074 Renamed Markup to Genshi in repository. cmlenz parents: 228 diff changeset	166 >>> from genshi.input import XML
33 1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	167 >>> xml = XML('<root><elem><child id="1"/></elem><child id="2"/></root>')
1fdb7054fb42 Add doctests for path module. cmlenz parents: 27 diff changeset	168 >>> test = Path('child').test()
305 60111a041e7c Various performance-oriented tweaks. cmlenz parents: 282 diff changeset	169 >>> for event in xml:
60111a041e7c Various performance-oriented tweaks. cmlenz parents: 282 diff changeset	170 ... if test(event, {}, {}):
386 c66370dfc41b Unit test fixes for Python 2.3. cmlenz parents: 384 diff changeset	171 ... print event[0], repr(event[1])
c66370dfc41b Unit test fixes for Python 2.3. cmlenz parents: 384 diff changeset	172 START (QName(u'child'), Attrs([(QName(u'id'), u'2')]))
498 700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	173
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	174 :param ignore_context: if `True`, the path is interpreted like a pattern
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	175 in XSLT, meaning for example that it will match
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	176 at any depth
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	177 :return: a function that can be used to test individual events in a
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	178 stream against the path
700e7b47bf2b A couple of minor doc refinements. cmlenz parents: 425 diff changeset	179 :rtype: ``function``
26 3c1a022be04c * Split out the XPath tests into a separate `unittest`-based file. cmlenz parents: 25 diff changeset	180 """
333 e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	181 paths = [(p, len(p), [0], [], [0] * len(p)) for p in [
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	182 (ignore_context and [_DOTSLASHSLASH] or []) + p for p in self.paths
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	183 ]]
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	184
306 095a754f95a8 Minor optimization for XPath evaluation. cmlenz parents: 305 diff changeset	185 def _test(event, namespaces, variables, updateonly=False):
330 3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	186 kind, data, pos = event[:3]
259 fe8dbe9066c1 Fix bug in evaluating XPath expressions using the union operator `\|`, which caused any path but the first to get out of sync with the event stream, and the whole thing returning too few results. cmlenz parents: 250 diff changeset	187 retval = None
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	188 for steps, size, cursors, cutoff, counter in paths:
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	189 # Manage the stack that tells us "where we are" in the stream
211 e5151983df0d Fix another regression introduced in [258]: some kinds of cascaded match templates were broken, for example in the TurboGears example app. cmlenz parents: 179 diff changeset	190 if kind is END:
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	191 if cursors:
a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	192 cursors.pop()
211 e5151983df0d Fix another regression introduced in [258]: some kinds of cascaded match templates were broken, for example in the TurboGears example app. cmlenz parents: 179 diff changeset	193 continue
223 9c199fcb9f31 Fix typo introduced in [272]. cmlenz parents: 217 diff changeset	194 elif kind is START:
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	195 cursors.append(cursors and cursors[-1] or 0)
259 fe8dbe9066c1 Fix bug in evaluating XPath expressions using the union operator `\|`, which caused any path but the first to get out of sync with the event stream, and the whole thing returning too few results. cmlenz parents: 250 diff changeset	196
306 095a754f95a8 Minor optimization for XPath evaluation. cmlenz parents: 305 diff changeset	197 if updateonly or retval or not cursors:
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	198 continue
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	199 cursor = cursors[-1]
a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	200 depth = len(cursors)
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	201
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	202 if cutoff and depth + int(kind is not START) > cutoff[0]:
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	203 continue
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	204
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	205 ctxtnode = not ignore_context and kind is START \
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	206 and depth == 2
259 fe8dbe9066c1 Fix bug in evaluating XPath expressions using the union operator `\|`, which caused any path but the first to get out of sync with the event stream, and the whole thing returning too few results. cmlenz parents: 250 diff changeset	207 matched = None
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	208 while 1:
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	209 # Fetch the next location step
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	210 axis, nodetest, predicates = steps[cursor]
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	211
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	212 # If this is the start event for the context node, and the
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	213 # axis of the location step doesn't include the current
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	214 # element, skip the test
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	215 if ctxtnode and (axis is CHILD or axis is DESCENDANT):
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	216 break
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	217
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	218 # Is this the last step of the location path?
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	219 last_step = cursor + 1 == size
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	220
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	221 # Perform the actual node test
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	222 matched = nodetest(kind, data, pos, namespaces, variables)
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	223
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	224 # The node test matched
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	225 if matched:
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	226
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	227 # Check all the predicates for this step
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	228 if predicates:
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	229 for predicate in predicates:
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	230 pretval = predicate(kind, data, pos, namespaces,
a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	231 variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	232 if type(pretval) is float: # FIXME <- need to
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	233 # check this for
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	234 # other types that
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	235 # can be coerced to
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	236 # float
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	237 counter[cursor] += 1
a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	238 if counter[cursor] != int(pretval):
a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	239 pretval = False
a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	240 if not pretval:
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	241 matched = None
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	242 break
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	243
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	244 # Both the node test and the predicates matched
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	245 if matched:
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	246 if last_step:
217 f150cff4da18 Fix `py:match` directive which would screw up in some scenarios due to incorrect handling of the substream. Closes #49. cmlenz parents: 216 diff changeset	247 if not ctxtnode or kind is not START \
f150cff4da18 Fix `py:match` directive which would screw up in some scenarios due to incorrect handling of the substream. Closes #49. cmlenz parents: 216 diff changeset	248 or axis is ATTRIBUTE or axis is SELF:
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	249 retval = matched
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	250 elif not ctxtnode or axis is SELF \
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	251 or axis is DESCENDANT_OR_SELF:
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	252 cursor += 1
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	253 cursors[-1] = cursor
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	254 cutoff[:] = []
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	255
333 e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	256 if kind is START:
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	257 if last_step and not (axis is DESCENDANT or
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	258 axis is DESCENDANT_OR_SELF):
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	259 cutoff[:] = [depth]
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	260
333 e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	261 elif steps[cursor][0] is ATTRIBUTE:
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	262 # If the axis of the next location step is the
363 37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 333 diff changeset	263 # attribute axis, we need to move on to processing
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 333 diff changeset	264 # that step without waiting for the next markup
37e4b4bb0b53 Parse template includes at parse time to avoid some runtime overhead. cmlenz parents: 333 diff changeset	265 # event
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	266 continue
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	267
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	268 # We're done with this step if it's the last step or the
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	269 # axis isn't "self"
384 5b6e4335ee21 Fix for infinite loop in XPath test. Closes #82. cmlenz parents: 364 diff changeset	270 if not matched or last_step or not (
5b6e4335ee21 Fix for infinite loop in XPath test. Closes #82. cmlenz parents: 364 diff changeset	271 axis is SELF or axis is DESCENDANT_OR_SELF):
216 636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	272 break
636fe6766b4d Many fixes to XPath evaluation. Among other things, this should get rid of the bug that attributes were getting ?pulled up? by `py:match` directives using `py:attrs="select('@')"` (see #50). cmlenz* parents: 215 diff changeset	273
333 e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	274 if (retval or not matched) and kind is START and \
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	275 not (axis is DESCENDANT or axis is DESCENDANT_OR_SELF):
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	276 # If this step is not a closure, it cannot be matched until
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	277 # the current element is closed... so we need to move the
114 4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	278 # cursor back to the previous closure and retest that
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	279 # against the current element
333 e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	280 backsteps = [(i, k, d, p) for i, (k, d, p)
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	281 in enumerate(steps[:cursor])
215 94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	282 if k is DESCENDANT or k is DESCENDANT_OR_SELF]
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	283 backsteps.reverse()
333 e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	284 for cursor, axis, nodetest, predicates in backsteps:
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	285 if nodetest(kind, data, pos, namespaces, variables):
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	286 cutoff[:] = []
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	287 break
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	288 cursors[-1] = cursor
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	289
259 fe8dbe9066c1 Fix bug in evaluating XPath expressions using the union operator `\|`, which caused any path but the first to get out of sync with the event stream, and the whole thing returning too few results. cmlenz parents: 250 diff changeset	290 return retval
1 5479aae32f5a Initial import. cmlenz parents: diff changeset	291
5479aae32f5a Initial import. cmlenz parents: diff changeset	292 return _test
5479aae32f5a Initial import. cmlenz parents: diff changeset	293
5479aae32f5a Initial import. cmlenz parents: diff changeset	294
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	295 class PathSyntaxError(Exception):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	296 """Exception raised when an XPath expression is syntactically incorrect."""
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	297
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	298 def __init__(self, message, filename=None, lineno=-1, offset=-1):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	299 if filename:
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	300 message = '%s (%s, line %d)' % (message, filename, lineno)
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	301 Exception.__init__(self, message)
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	302 self.filename = filename
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	303 self.lineno = lineno
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	304 self.offset = offset
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	305
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	306
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	307 class PathParser(object):
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	308 """Tokenizes and parses an XPath expression."""
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	309
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	310 _QUOTES = (("'", "'"), ('"', '"'))
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	311 _TOKENS = ('::', ':', '..', '.', '//', '/', '[', ']', '()', '(', ')', '@',
179 13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	312 '=', '!=', '!', '\|', ',', '>=', '>', '<=', '<', '$')
163 9c023c395e44 Support for XPath number literals including decimal places. cmlenz parents: 162 diff changeset	313 _tokenize = re.compile('("[^"]")\|(\'[^\']\')\|((?:\d+)?\.\d+)\|(%s)\|([^%s\s]+)\|\s+' % (
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	314 '\|'.join([re.escape(t) for t in _TOKENS]),
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	315 ''.join([re.escape(t[0]) for t in _TOKENS]))).findall
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	316
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	317 def __init__(self, text, filename=None, lineno=-1):
8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	318 self.filename = filename
8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	319 self.lineno = lineno
163 9c023c395e44 Support for XPath number literals including decimal places. cmlenz parents: 162 diff changeset	320 self.tokens = filter(None, [dqstr or sqstr or number or token or name
9c023c395e44 Support for XPath number literals including decimal places. cmlenz parents: 162 diff changeset	321 for dqstr, sqstr, number, token, name in
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	322 self._tokenize(text)])
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	323 self.pos = 0
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	324
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	325 # Tokenizer
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	326
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	327 at_end = property(lambda self: self.pos == len(self.tokens) - 1)
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	328 cur_token = property(lambda self: self.tokens[self.pos])
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	329
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	330 def next_token(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	331 self.pos += 1
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	332 return self.tokens[self.pos]
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	333
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	334 def peek_token(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	335 if not self.at_end:
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	336 return self.tokens[self.pos + 1]
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	337 return None
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	338
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	339 # Recursive descent parser
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	340
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	341 def parse(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	342 """Parses the XPath expression and returns a list of location path
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	343 tests.
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	344
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	345 For union expressions (such as `*\|text()`), this function returns one
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	346 test for each operand in the union. For patch expressions that don't
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	347 use the union operator, the function always returns a list of size 1.
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	348
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	349 Each path test in turn is a sequence of tests that correspond to the
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	350 location steps, each tuples of the form `(axis, testfunc, predicates)`
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	351 """
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	352 paths = [self._location_path()]
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	353 while self.cur_token == '\|':
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	354 self.next_token()
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	355 paths.append(self._location_path())
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	356 if not self.at_end:
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	357 raise PathSyntaxError('Unexpected token %r after end of expression'
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	358 % self.cur_token, self.filename, self.lineno)
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	359 return paths
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	360
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	361 def _location_path(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	362 steps = []
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	363 while True:
215 94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	364 if self.cur_token.startswith('/'):
94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	365 if self.cur_token == '//':
94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	366 steps.append((DESCENDANT_OR_SELF, NodeTest(), []))
94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	367 elif not steps:
94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	368 raise PathSyntaxError('Absolute location paths not '
94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	369 'supported', self.filename,
94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	370 self.lineno)
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	371 self.next_token()
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	372
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	373 axis, nodetest, predicates = self._location_step()
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	374 if not axis:
145 47bbd9d2a5af * Fix error in expression evaluation when the expression evaluates to an iterable that does not produce event tuples. cmlenz parents: 139 diff changeset	375 axis = CHILD
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	376 steps.append((axis, nodetest, predicates))
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	377
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	378 if self.at_end or not self.cur_token.startswith('/'):
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	379 break
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	380
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	381 return steps
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	382
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	383 def _location_step(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	384 if self.cur_token == '@':
114 4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	385 axis = ATTRIBUTE
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	386 self.next_token()
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	387 elif self.cur_token == '.':
114 4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	388 axis = SELF
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	389 elif self.cur_token == '..':
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	390 raise PathSyntaxError('Unsupported axis "parent"', self.filename,
8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	391 self.lineno)
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	392 elif self.peek_token() == '::':
114 4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	393 axis = Axis.forname(self.cur_token)
4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	394 if axis is None:
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	395 raise PathSyntaxError('Unsupport axis "%s"' % axis,
8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	396 self.filename, self.lineno)
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	397 self.next_token()
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	398 self.next_token()
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	399 else:
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	400 axis = None
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	401 nodetest = self._node_test(axis or CHILD)
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	402 predicates = []
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	403 while self.cur_token == '[':
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	404 predicates.append(self._predicate())
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	405 return axis, nodetest, predicates
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	406
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	407 def _node_test(self, axis=None):
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	408 test = prefix = None
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	409 next_token = self.peek_token()
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	410 if next_token in ('(', '()'): # Node type test
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	411 test = self._node_type()
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	412
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	413 elif next_token == ':': # Namespace prefix
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	414 prefix = self.cur_token
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	415 self.next_token()
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	416 localname = self.next_token()
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	417 if localname == '*':
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	418 test = QualifiedPrincipalTypeTest(axis, prefix)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	419 else:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	420 test = QualifiedNameTest(axis, prefix, localname)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	421
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	422 else: # Name test
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	423 if self.cur_token == '*':
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	424 test = PrincipalTypeTest(axis)
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	425 elif self.cur_token == '.':
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	426 test = NodeTest()
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	427 else:
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	428 test = LocalNameTest(axis, self.cur_token)
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	429
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	430 if not self.at_end:
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	431 self.next_token()
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	432 return test
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	433
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	434 def _node_type(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	435 name = self.cur_token
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	436 self.next_token()
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	437
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	438 args = []
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	439 if self.cur_token != '()':
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	440 # The processing-instruction() function optionally accepts the
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	441 # name of the PI as argument, which must be a literal string
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	442 self.next_token() # (
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	443 if self.cur_token != ')':
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	444 string = self.cur_token
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	445 if (string[0], string[-1]) in self._QUOTES:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	446 string = string[1:-1]
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	447 args.append(string)
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	448
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	449 cls = _nodetest_map.get(name)
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	450 if not cls:
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	451 raise PathSyntaxError('%s() not allowed here' % name, self.filename,
8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	452 self.lineno)
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	453 return cls(*args)
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	454
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	455 def _predicate(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	456 assert self.cur_token == '['
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	457 self.next_token()
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	458 expr = self._or_expr()
121 062e51ad7b19 Added support for the XPath functions `name()`, `namespace-uri()`, `local-name()`, and `not()`. cmlenz parents: 114 diff changeset	459 if self.cur_token != ']':
062e51ad7b19 Added support for the XPath functions `name()`, `namespace-uri()`, `local-name()`, and `not()`. cmlenz parents: 114 diff changeset	460 raise PathSyntaxError('Expected "]" to close predicate, '
139 8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	461 'but found "%s"' % self.cur_token,
8332287b5508 Implement position reporting for XPath syntax errors. Closes #20. cmlenz parents: 137 diff changeset	462 self.filename, self.lineno)
111 2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	463 if not self.at_end:
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	464 self.next_token()
2368c3becc52 Some fixes and more unit tests for the XPath engine. cmlenz parents: 106 diff changeset	465 return expr
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	466
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	467 def _or_expr(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	468 expr = self._and_expr()
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	469 while self.cur_token == 'or':
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	470 self.next_token()
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	471 expr = OrOperator(expr, self._and_expr())
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	472 return expr
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	473
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	474 def _and_expr(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	475 expr = self._equality_expr()
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	476 while self.cur_token == 'and':
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	477 self.next_token()
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	478 expr = AndOperator(expr, self._equality_expr())
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	479 return expr
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	480
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	481 def _equality_expr(self):
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	482 expr = self._relational_expr()
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	483 while self.cur_token in ('=', '!='):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	484 op = _operator_map[self.cur_token]
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	485 self.next_token()
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	486 expr = op(expr, self._relational_expr())
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	487 return expr
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	488
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	489 def _relational_expr(self):
516 317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	490 expr = self._sub_expr()
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	491 while self.cur_token in ('>', '>=', '<', '>='):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	492 op = _operator_map[self.cur_token]
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	493 self.next_token()
516 317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	494 expr = op(expr, self._sub_expr())
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	495 return expr
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	496
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	497 def _sub_expr(self):
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	498 token = self.cur_token
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	499 if token != '(':
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	500 return self._primary_expr()
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	501 self.next_token()
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	502 expr = self._or_expr()
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	503 if self.cur_token != ')':
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	504 raise PathSyntaxError('Expected ")" to close sub-expression, '
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	505 'but found "%s"' % self.cur_token,
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	506 self.filename, self.lineno)
317a7f4e3c69 Implemented XPath sub-expressions. athomas parents: 498 diff changeset	507 self.next_token()
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	508 return expr
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	509
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	510 def _primary_expr(self):
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	511 token = self.cur_token
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	512 if len(token) > 1 and (token[0], token[-1]) in self._QUOTES:
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	513 self.next_token()
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	514 return StringLiteral(token[1:-1])
163 9c023c395e44 Support for XPath number literals including decimal places. cmlenz parents: 162 diff changeset	515 elif token[0].isdigit() or token[0] == '.':
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	516 self.next_token()
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	517 return NumberLiteral(as_float(token))
179 13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	518 elif token == '$':
13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	519 token = self.next_token()
13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	520 self.next_token()
13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	521 return VariableReference(token)
121 062e51ad7b19 Added support for the XPath functions `name()`, `namespace-uri()`, `local-name()`, and `not()`. cmlenz parents: 114 diff changeset	522 elif not self.at_end and self.peek_token().startswith('('):
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	523 return self._function_call()
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	524 else:
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	525 axis = None
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	526 if token == '@':
114 4c4e81d12649 Use constants for axes in XPath engine. cmlenz parents: 111 diff changeset	527 axis = ATTRIBUTE
106 f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	528 self.next_token()
f9473bdc93b2 Complete rewrite of the XPath parsing, which was a mess before. Closes #19. cmlenz parents: 77 diff changeset	529 return self._node_test(axis)
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	530
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	531 def _function_call(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	532 name = self.cur_token
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	533 if self.next_token() == '()':
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	534 args = []
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	535 else:
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	536 assert self.cur_token == '('
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	537 self.next_token()
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	538 args = [self._or_expr()]
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	539 while self.cur_token == ',':
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	540 self.next_token()
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	541 args.append(self._or_expr())
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	542 if not self.cur_token == ')':
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	543 raise PathSyntaxError('Expected ")" to close function argument '
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	544 'list, but found "%s"' % self.cur_token,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	545 self.filename, self.lineno)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	546 self.next_token()
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	547 cls = _function_map.get(name)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	548 if not cls:
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	549 raise PathSyntaxError('Unsupported function "%s"' % name,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	550 self.filename, self.lineno)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	551 return cls(*args)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	552
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	553
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	554 # Type coercion
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	555
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	556 def as_scalar(value):
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	557 """Convert value to a scalar. If a single element Attrs() object is passed
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	558 the value of the single attribute will be returned."""
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	559 if isinstance(value, Attrs):
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	560 assert len(value) == 1
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	561 return value[0][1]
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	562 else:
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	563 return value
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	564
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	565 def as_float(value):
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	566 # FIXME - if value is a bool it will be coerced to 0.0 and consequently
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	567 # compared as a float. This is probably not ideal.
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	568 return float(as_scalar(value))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	569
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	570 def as_long(value):
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	571 return long(as_scalar(value))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	572
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	573 def as_string(value):
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	574 value = as_scalar(value)
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	575 if value is False:
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	576 return u''
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	577 return unicode(value)
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	578
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	579 def as_bool(value):
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	580 return bool(as_scalar(value))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	581
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	582
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	583 # Node tests
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	584
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	585 class PrincipalTypeTest(object):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	586 """Node test that matches any event with the given principal type."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	587 __slots__ = ['principal_type']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	588 def __init__(self, principal_type):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	589 self.principal_type = principal_type
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	590 def __call__(self, kind, data, pos, namespaces, variables):
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	591 if kind is START:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	592 if self.principal_type is ATTRIBUTE:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	593 return data[1] or None
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	594 else:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	595 return True
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	596 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	597 return '*'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	598
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	599 class QualifiedPrincipalTypeTest(object):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	600 """Node test that matches any event with the given principal type in a
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	601 specific namespace."""
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	602 __slots__ = ['principal_type', 'prefix']
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	603 def __init__(self, principal_type, prefix):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	604 self.principal_type = principal_type
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	605 self.prefix = prefix
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	606 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	607 namespace = Namespace(namespaces.get(self.prefix))
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	608 if kind is START:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	609 if self.principal_type is ATTRIBUTE and data[1]:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	610 return Attrs([(name, value) for name, value in data[1]
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	611 if name in namespace]) or None
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	612 else:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	613 return data[0] in namespace
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	614 def __repr__(self):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	615 return '%s:*' % self.prefix
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	616
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	617 class LocalNameTest(object):
364 7dabedbb53fb Fix for #77: match templates were matching their own output. cmlenz parents: 363 diff changeset	618 """Node test that matches any event with the given principal type and
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	619 local name.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	620 """
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	621 __slots__ = ['principal_type', 'name']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	622 def __init__(self, principal_type, name):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	623 self.principal_type = principal_type
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	624 self.name = name
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	625 def __call__(self, kind, data, pos, namespaces, variables):
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	626 if kind is START:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	627 if self.principal_type is ATTRIBUTE and self.name in data[1]:
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	628 return Attrs([(self.name, data[1].get(self.name))])
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	629 else:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	630 return data[0].localname == self.name
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	631 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	632 return self.name
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	633
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	634 class QualifiedNameTest(object):
364 7dabedbb53fb Fix for #77: match templates were matching their own output. cmlenz parents: 363 diff changeset	635 """Node test that matches any event with the given principal type and
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	636 qualified name.
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	637 """
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	638 __slots__ = ['principal_type', 'prefix', 'name']
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	639 def __init__(self, principal_type, prefix, name):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	640 self.principal_type = principal_type
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	641 self.prefix = prefix
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	642 self.name = name
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	643 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	644 qname = QName('%s}%s' % (namespaces.get(self.prefix), self.name))
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	645 if kind is START:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	646 if self.principal_type is ATTRIBUTE and qname in data[1]:
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	647 return Attrs([(self.name, data[1].get(self.name))])
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	648 else:
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	649 return data[0] == qname
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	650 def __repr__(self):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	651 return '%s:%s' % (self.prefix, self.name)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	652
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	653 class CommentNodeTest(object):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	654 """Node test that matches any comment events."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	655 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	656 def __call__(self, kind, data, pos, namespaces, variables):
330 3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	657 return kind is COMMENT
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	658 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	659 return 'comment()'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	660
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	661 class NodeTest(object):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	662 """Node test that matches any node."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	663 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	664 def __call__(self, kind, data, pos, namespaces, variables):
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	665 if kind is START:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	666 return True
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	667 return kind, data, pos
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	668 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	669 return 'node()'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	670
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	671 class ProcessingInstructionNodeTest(object):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	672 """Node test that matches any processing instruction event."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	673 __slots__ = ['target']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	674 def __init__(self, target=None):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	675 self.target = target
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	676 def __call__(self, kind, data, pos, namespaces, variables):
330 3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	677 return kind is PI and (not self.target or data[0] == self.target)
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	678 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	679 arg = ''
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	680 if self.target:
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	681 arg = '"' + self.target + '"'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	682 return 'processing-instruction(%s)' % arg
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	683
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	684 class TextNodeTest(object):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	685 """Node test that matches any text event."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	686 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	687 def __call__(self, kind, data, pos, namespaces, variables):
330 3e749eaa3100 XPath tests should never return event tuples, just values or booleans. cmlenz parents: 326 diff changeset	688 return kind is TEXT
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	689 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	690 return 'text()'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	691
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	692 _nodetest_map = {'comment': CommentNodeTest, 'node': NodeTest,
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	693 'processing-instruction': ProcessingInstructionNodeTest,
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	694 'text': TextNodeTest}
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	695
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	696 # Functions
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	697
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	698 class Function(object):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	699 """Base class for function nodes in XPath expressions."""
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	700
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	701 class BooleanFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	702 """The `boolean` function, which converts its argument to a boolean
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	703 value.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	704 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	705 __slots__ = ['expr']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	706 def __init__(self, expr):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	707 self.expr = expr
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	708 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	709 val = self.expr(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	710 return as_bool(val)
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	711 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	712 return 'boolean(%r)' % self.expr
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	713
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	714 class CeilingFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	715 """The `ceiling` function, which returns the nearest lower integer number
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	716 for the given number.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	717 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	718 __slots__ = ['number']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	719 def __init__(self, number):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	720 self.number = number
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	721 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	722 number = self.number(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	723 return ceil(as_float(number))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	724 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	725 return 'ceiling(%r)' % self.number
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	726
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	727 class ConcatFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	728 """The `concat` function, which concatenates (joins) the variable number of
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	729 strings it gets as arguments.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	730 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	731 __slots__ = ['exprs']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	732 def __init__(self, *exprs):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	733 self.exprs = exprs
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	734 def __call__(self, kind, data, pos, namespaces, variables):
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	735 strings = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	736 for item in [expr(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	737 for expr in self.exprs]:
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	738 strings.append(as_string(item))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	739 return u''.join(strings)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	740 def __repr__(self):
169 dc6676d3b697 Fix syntax error in `path` module. cmlenz parents: 164 diff changeset	741 return 'concat(%s)' % ', '.join([repr(expr) for expr in self.exprs])
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	742
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	743 class ContainsFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	744 """The `contains` function, which returns whether a string contains a given
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	745 substring.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	746 """
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	747 __slots__ = ['string1', 'string2']
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	748 def __init__(self, string1, string2):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	749 self.string1 = string1
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	750 self.string2 = string2
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	751 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	752 string1 = self.string1(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	753 string2 = self.string2(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	754 return as_string(string2) in as_string(string1)
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	755 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	756 return 'contains(%r, %r)' % (self.string1, self.string2)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	757
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	758 class FalseFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	759 """The `false` function, which always returns the boolean `false` value."""
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	760 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	761 def __call__(self, kind, data, pos, namespaces, variables):
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	762 return False
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	763 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	764 return 'false()'
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	765
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	766 class FloorFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	767 """The `ceiling` function, which returns the nearest higher integer number
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	768 for the given number.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	769 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	770 __slots__ = ['number']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	771 def __init__(self, number):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	772 self.number = number
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	773 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	774 number = self.number(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	775 return floor(as_float(number))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	776 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	777 return 'floor(%r)' % self.number
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	778
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	779 class LocalNameFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	780 """The `local-name` function, which returns the local name of the current
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	781 element.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	782 """
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	783 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	784 def __call__(self, kind, data, pos, namespaces, variables):
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	785 if kind is START:
234 39c424b80edd * Minor simplification of XPath engine. cmlenz parents: 230 diff changeset	786 return data[0].localname
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	787 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	788 return 'local-name()'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	789
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	790 class NameFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	791 """The `name` function, which returns the qualified name of the current
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	792 element.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	793 """
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	794 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	795 def __call__(self, kind, data, pos, namespaces, variables):
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	796 if kind is START:
234 39c424b80edd * Minor simplification of XPath engine. cmlenz parents: 230 diff changeset	797 return data[0]
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	798 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	799 return 'name()'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	800
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	801 class NamespaceUriFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	802 """The `namespace-uri` function, which returns the namespace URI of the
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	803 current element.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	804 """
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	805 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	806 def __call__(self, kind, data, pos, namespaces, variables):
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	807 if kind is START:
234 39c424b80edd * Minor simplification of XPath engine. cmlenz parents: 230 diff changeset	808 return data[0].namespace
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	809 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	810 return 'namespace-uri()'
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	811
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	812 class NotFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	813 """The `not` function, which returns the negated boolean value of its
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	814 argument.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	815 """
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	816 __slots__ = ['expr']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	817 def __init__(self, expr):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	818 self.expr = expr
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	819 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	820 return not as_bool(self.expr(kind, data, pos, namespaces, variables))
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	821 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	822 return 'not(%s)' % self.expr
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	823
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	824 class NormalizeSpaceFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	825 """The `normalize-space` function, which removes leading and trailing
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	826 whitespace in the given string, and replaces multiple adjacent whitespace
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	827 characters inside the string with a single space.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	828 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	829 __slots__ = ['expr']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	830 _normalize = re.compile(r'\s{2,}').sub
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	831 def __init__(self, expr):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	832 self.expr = expr
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	833 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	834 string = self.expr(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	835 return self._normalize(' ', as_string(string).strip())
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	836 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	837 return 'normalize-space(%s)' % repr(self.expr)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	838
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	839 class NumberFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	840 """The `number` function that converts its argument to a number."""
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	841 __slots__ = ['expr']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	842 def __init__(self, expr):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	843 self.expr = expr
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	844 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	845 val = self.expr(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	846 return as_float(val)
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	847 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	848 return 'number(%r)' % self.expr
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	849
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	850 class RoundFunction(Function):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	851 """The `round` function, which returns the nearest integer number for the
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	852 given number.
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	853 """
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	854 __slots__ = ['number']
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	855 def __init__(self, number):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	856 self.number = number
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	857 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	858 number = self.number(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	859 return round(as_float(number))
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	860 def __repr__(self):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	861 return 'round(%r)' % self.number
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	862
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	863 class StartsWithFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	864 """The `starts-with` function that returns whether one string starts with
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	865 a given substring.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	866 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	867 __slots__ = ['string1', 'string2']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	868 def __init__(self, string1, string2):
282 24b3cbbc1b1b Fix `starts-with()` XPath function so that it actually compares the two strings. Closes #61. cmlenz parents: 259 diff changeset	869 self.string1 = string1
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	870 self.string2 = string2
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	871 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	872 string1 = self.string1(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	873 string2 = self.string2(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	874 return as_string(string1).startswith(as_string(string2))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	875 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	876 return 'starts-with(%r, %r)' % (self.string1, self.string2)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	877
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	878 class StringLengthFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	879 """The `string-length` function that returns the length of the given
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	880 string.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	881 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	882 __slots__ = ['expr']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	883 def __init__(self, expr):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	884 self.expr = expr
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	885 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	886 string = self.expr(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	887 return len(as_string(string))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	888 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	889 return 'string-length(%r)' % self.expr
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	890
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	891 class SubstringFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	892 """The `substring` function that returns the part of a string that starts
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	893 at the given offset, and optionally limited to the given length.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	894 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	895 __slots__ = ['string', 'start', 'length']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	896 def __init__(self, string, start, length=None):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	897 self.string = string
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	898 self.start = start
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	899 self.length = length
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	900 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	901 string = self.string(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	902 start = self.start(kind, data, pos, namespaces, variables)
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	903 length = 0
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	904 if self.length is not None:
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	905 length = self.length(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	906 return string[as_long(start):len(as_string(string)) - as_long(length)]
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	907 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	908 if self.length is not None:
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	909 return 'substring(%r, %r, %r)' % (self.string, self.start,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	910 self.length)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	911 else:
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	912 return 'substring(%r, %r)' % (self.string, self.start)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	913
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	914 class SubstringAfterFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	915 """The `substring-after` function that returns the part of a string that
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	916 is found after the given substring.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	917 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	918 __slots__ = ['string1', 'string2']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	919 def __init__(self, string1, string2):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	920 self.string1 = string1
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	921 self.string2 = string2
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	922 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	923 string1 = as_string(self.string1(kind, data, pos, namespaces, variables))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	924 string2 = as_string(self.string2(kind, data, pos, namespaces, variables))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	925 index = string1.find(string2)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	926 if index >= 0:
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	927 return string1[index + len(string2):]
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	928 return u''
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	929 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	930 return 'substring-after(%r, %r)' % (self.string1, self.string2)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	931
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	932 class SubstringBeforeFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	933 """The `substring-before` function that returns the part of a string that
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	934 is found before the given substring.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	935 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	936 __slots__ = ['string1', 'string2']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	937 def __init__(self, string1, string2):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	938 self.string1 = string1
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	939 self.string2 = string2
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	940 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	941 string1 = as_string(self.string1(kind, data, pos, namespaces, variables))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	942 string2 = as_string(self.string2(kind, data, pos, namespaces, variables))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	943 index = string1.find(string2)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	944 if index >= 0:
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	945 return string1[:index]
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	946 return u''
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	947 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	948 return 'substring-after(%r, %r)' % (self.string1, self.string2)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	949
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	950 class TranslateFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	951 """The `translate` function that translates a set of characters in a
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	952 string to target set of characters.
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	953 """
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	954 __slots__ = ['string', 'fromchars', 'tochars']
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	955 def __init__(self, string, fromchars, tochars):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	956 self.string = string
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	957 self.fromchars = fromchars
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	958 self.tochars = tochars
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	959 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	960 string = as_string(self.string(kind, data, pos, namespaces, variables))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	961 fromchars = as_string(self.fromchars(kind, data, pos, namespaces, variables))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	962 tochars = as_string(self.tochars(kind, data, pos, namespaces, variables))
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	963 table = dict(zip([ord(c) for c in fromchars],
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	964 [ord(c) for c in tochars]))
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	965 return string.translate(table)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	966 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	967 return 'translate(%r, %r, %r)' % (self.string, self.fromchars,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	968 self.tochars)
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	969
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	970 class TrueFunction(Function):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	971 """The `true` function, which always returns the boolean `true` value."""
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	972 __slots__ = []
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	973 def __call__(self, kind, data, pos, namespaces, variables):
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	974 return True
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	975 def __repr__(self):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	976 return 'true()'
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	977
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	978 _function_map = {'boolean': BooleanFunction, 'ceiling': CeilingFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	979 'concat': ConcatFunction, 'contains': ContainsFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	980 'false': FalseFunction, 'floor': FloorFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	981 'local-name': LocalNameFunction, 'name': NameFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	982 'namespace-uri': NamespaceUriFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	983 'normalize-space': NormalizeSpaceFunction, 'not': NotFunction,
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	984 'number': NumberFunction, 'round': RoundFunction,
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	985 'starts-with': StartsWithFunction,
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	986 'string-length': StringLengthFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	987 'substring': SubstringFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	988 'substring-after': SubstringAfterFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	989 'substring-before': SubstringBeforeFunction,
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	990 'translate': TranslateFunction, 'true': TrueFunction}
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	991
179 13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	992 # Literals & Variables
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	993
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	994 class Literal(object):
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	995 """Abstract base class for literal nodes."""
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	996
9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	997 class StringLiteral(Literal):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	998 """A string literal node."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	999 __slots__ = ['text']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1000 def __init__(self, text):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1001 self.text = text
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1002 def __call__(self, kind, data, pos, namespaces, variables):
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	1003 return self.text
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1004 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1005 return '"%s"' % self.text
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1006
155 9a5aedda1099 * String literals in XPath expressions that contains spaces are now tokenizes correctly. cmlenz parents: 145 diff changeset	1007 class NumberLiteral(Literal):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1008 """A number literal node."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1009 __slots__ = ['number']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1010 def __init__(self, number):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1011 self.number = number
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1012 def __call__(self, kind, data, pos, namespaces, variables):
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	1013 return self.number
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1014 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1015 return str(self.number)
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1016
179 13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	1017 class VariableReference(Literal):
13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	1018 """A variable reference node."""
13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	1019 __slots__ = ['name']
13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	1020 def __init__(self, name):
13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	1021 self.name = name
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1022 def __call__(self, kind, data, pos, namespaces, variables):
228 a5b38b459cbb Add support for position predicates in XPath expressions. cmlenz parents: 224 diff changeset	1023 return variables.get(self.name)
179 13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	1024 def __repr__(self):
215 94120e6b0ce4 A couple of minor XPath fixes. cmlenz parents: 211 diff changeset	1025 return str(self.name)
179 13909179e5e1 Implemented support for XPath variables in predicates (#31). cmlenz parents: 169 diff changeset	1026
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1027 # Operators
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1028
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1029 class AndOperator(object):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1030 """The boolean operator `and`."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1031 __slots__ = ['lval', 'rval']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1032 def __init__(self, lval, rval):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1033 self.lval = lval
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1034 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1035 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1036 lval = as_bool(self.lval(kind, data, pos, namespaces, variables))
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1037 if not lval:
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1038 return False
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1039 rval = self.rval(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1040 return as_bool(rval)
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1041 def __repr__(self):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1042 return '%s and %s' % (self.lval, self.rval)
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1043
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1044 class EqualsOperator(object):
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1045 """The equality operator `=`."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1046 __slots__ = ['lval', 'rval']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1047 def __init__(self, lval, rval):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1048 self.lval = lval
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1049 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1050 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1051 lval = as_scalar(self.lval(kind, data, pos, namespaces, variables))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1052 rval = as_scalar(self.rval(kind, data, pos, namespaces, variables))
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1053 return lval == rval
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1054 def __repr__(self):
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1055 return '%s=%s' % (self.lval, self.rval)
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1056
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1057 class NotEqualsOperator(object):
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1058 """The equality operator `!=`."""
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1059 __slots__ = ['lval', 'rval']
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1060 def __init__(self, lval, rval):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1061 self.lval = lval
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1062 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1063 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1064 lval = as_scalar(self.lval(kind, data, pos, namespaces, variables))
c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1065 rval = as_scalar(self.rval(kind, data, pos, namespaces, variables))
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1066 return lval != rval
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1067 def __repr__(self):
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1068 return '%s!=%s' % (self.lval, self.rval)
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1069
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1070 class OrOperator(object):
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1071 """The boolean operator `or`."""
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1072 __slots__ = ['lval', 'rval']
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1073 def __init__(self, lval, rval):
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1074 self.lval = lval
7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1075 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1076 def __call__(self, kind, data, pos, namespaces, variables):
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1077 lval = as_bool(self.lval(kind, data, pos, namespaces, variables))
161 7b1f07496bf7 Various docstring additions and other cosmetic changes. cmlenz parents: 156 diff changeset	1078 if lval:
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1079 return True
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1080 rval = self.rval(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1081 return as_bool(rval)
137 ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1082 def __repr__(self):
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1083 return '%s or %s' % (self.lval, self.rval)
ac0bc4a6aeba Further cleanup of XPath engine. cmlenz parents: 122 diff changeset	1084
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1085 class GreaterThanOperator(object):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1086 """The relational operator `>` (greater than)."""
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1087 __slots__ = ['lval', 'rval']
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1088 def __init__(self, lval, rval):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1089 self.lval = lval
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1090 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1091 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1092 lval = self.lval(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1093 rval = self.rval(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1094 return as_float(lval) > as_float(rval)
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1095 def __repr__(self):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1096 return '%s>%s' % (self.lval, self.rval)
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1097
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1098 class GreaterThanOrEqualOperator(object):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1099 """The relational operator `>=` (greater than or equal)."""
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1100 __slots__ = ['lval', 'rval']
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1101 def __init__(self, lval, rval):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1102 self.lval = lval
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1103 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1104 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1105 lval = self.lval(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1106 rval = self.rval(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1107 return as_float(lval) >= as_float(rval)
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1108 def __repr__(self):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1109 return '%s>=%s' % (self.lval, self.rval)
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1110
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1111 class LessThanOperator(object):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1112 """The relational operator `<` (less than)."""
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1113 __slots__ = ['lval', 'rval']
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1114 def __init__(self, lval, rval):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1115 self.lval = lval
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1116 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1117 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1118 lval = self.lval(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1119 rval = self.rval(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1120 return as_float(lval) < as_float(rval)
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1121 def __repr__(self):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1122 return '%s<%s' % (self.lval, self.rval)
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1123
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1124 class LessThanOrEqualOperator(object):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1125 """The relational operator `<=` (less than or equal)."""
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1126 __slots__ = ['lval', 'rval']
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1127 def __init__(self, lval, rval):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1128 self.lval = lval
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1129 self.rval = rval
224 90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1130 def __call__(self, kind, data, pos, namespaces, variables):
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1131 lval = self.lval(kind, data, pos, namespaces, variables)
90d62225f411 Implement support for namespace prefixes in XPath expressions. cmlenz parents: 223 diff changeset	1132 rval = self.rval(kind, data, pos, namespaces, variables)
518 c1f2a859fd75 Attributes selected with an XPath are now returned as an `Attrs()` object in athomas parents: 516 diff changeset	1133 return as_float(lval) <= as_float(rval)
162 456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1134 def __repr__(self):
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1135 return '%s<=%s' % (self.lval, self.rval)
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1136
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1137 _operator_map = {'=': EqualsOperator, '!=': NotEqualsOperator,
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1138 '>': GreaterThanOperator, '>=': GreaterThanOrEqualOperator,
456039594db9 Implement the XPath relational operators and the `round()` function. cmlenz parents: 161 diff changeset	1139 '<': LessThanOperator, '>=': LessThanOrEqualOperator}
333 e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	1140
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	1141
e5ba8c5a30fe Fix XPath traversal in match templates. Previously, `div/p` would be treated the same as `div//p`, i.e. it would match all descendants and not just the immediate children. cmlenz parents: 330 diff changeset	1142 _DOTSLASHSLASH = (DESCENDANT_OR_SELF, PrincipalTypeTest(None), ())

Mercurial > genshi > mirror

annotate genshi/path.py @ 518:c1f2a859fd75 trunk