core
/
oga
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Lex XPath axes without a node test." 

Upon further investigation this change turned out to be useless. Nokogiri/libxml
does not allow the use of long axes without tests, instead it ends up
lexing/parsing such a value as a simple node test.

This reverts commit f699b0d097.
This commit is contained in:
Yorick Peterse 2014-07-22 15:53:00 +02:00
parent c43c38fab9
commit 4142504101
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/oga/xpath/lexer.rl
View File

@ -219,7 +219,11 @@ module Oga
| 'parent'
| 'preceding'
| 'preceding-sibling'
| 'self');
| 'self') '::';
action emit_axis_full {
emit(:T_AXIS, ts, te - 2)
}
# Short Axes
#
@ -299,13 +303,10 @@ module Oga
'[' => { add_token(:T_LBRACK) };
']' => { add_token(:T_RBRACK) };
string => emit_string;
integer => emit_integer;
float => emit_float;
axis_full => { emit(:T_AXIS, ts, te) };
axis_full '::' => { emit(:T_AXIS, ts, te - 2) };
string => emit_string;
integer => emit_integer;
float => emit_float;
axis_full => emit_axis_full;
axis_short => emit_axis_short;
identifier => emit_identifier;
*|;

15
spec/oga/xpath/parser/axes_spec.rb
View File

@ -44,21 +44,6 @@ describe Oga::XPath::Parser do
)
end
example 'parse the descendant-or-self axis without a test' do
parse_xpath('/descendant-or-self').should == s(
:absolute_path,
s(:axis, 'descendant-or-self')
)
end
example 'parse the descendant-or-self axis followed by an attribute axis' do
parse_xpath('/descendant-or-self/attribute::foo').should == s(
:absolute_path,
s(:axis, 'descendant-or-self'),
s(:axis, 'attribute', s(:test, nil, 'foo'))
)
end
example 'parse the following axis' do
parse_xpath('/following::A').should == s(
:absolute_path,