oga 0.1.3-java → 0.2.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +57 -0
  3. data/doc/changelog.md +128 -0
  4. data/doc/css/common.css +5 -4
  5. data/doc/css_selectors.md +935 -0
  6. data/doc/manually_creating_documents.md +67 -0
  7. data/doc/xml_namespaces.md +63 -0
  8. data/ext/c/lexer.c +745 -628
  9. data/ext/c/lexer.h +8 -0
  10. data/ext/c/lexer.rl +44 -7
  11. data/ext/java/org/liboga/xml/Lexer.java +351 -232
  12. data/ext/java/org/liboga/xml/Lexer.rl +29 -8
  13. data/ext/ragel/base_lexer.rl +68 -18
  14. data/lib/liboga.jar +0 -0
  15. data/lib/oga.rb +4 -1
  16. data/lib/oga/css/lexer.rb +743 -0
  17. data/lib/oga/css/parser.rb +830 -0
  18. data/lib/oga/version.rb +1 -1
  19. data/lib/oga/xml/attribute.rb +3 -1
  20. data/lib/oga/xml/element.rb +15 -1
  21. data/lib/oga/xml/entities.rb +60 -0
  22. data/lib/oga/xml/html_void_elements.rb +2 -0
  23. data/lib/oga/xml/lexer.rb +36 -28
  24. data/lib/oga/xml/node_set.rb +22 -0
  25. data/lib/oga/xml/parser.rb +149 -128
  26. data/lib/oga/xml/querying.rb +24 -0
  27. data/lib/oga/xml/sax_parser.rb +55 -1
  28. data/lib/oga/xml/text.rb +6 -1
  29. data/lib/oga/xpath/evaluator.rb +138 -101
  30. data/lib/oga/xpath/lexer.rb +1205 -1294
  31. data/lib/oga/xpath/parser.rb +238 -206
  32. metadata +8 -3
  33. data/lib/oga/xpath/node.rb +0 -10
data/lib/oga/xpath/parser.rb CHANGED
@@ -13,7 +13,6 @@ module Oga
13
13
  # @param [String] data The input to parse.
14
14
  #
15
15
  def initialize(data)
16
- @data = data
17
16
  @lexer = Lexer.new(data)
18
17
  end
19
18
 
@@ -22,10 +21,10 @@ module Oga
22
21
  #
23
22
  # @param [Symbol] type
24
23
  # @param [Array] children
25
- # @return [Oga::XPath::Node]
24
+ # @return [AST::Node]
26
25
  #
27
26
  def s(type, *children)
28
- return Node.new(type, children)
27
+ return AST::Node.new(type, children)
29
28
  end
30
29
 
31
30
  ##
@@ -48,7 +47,7 @@ module Oga
48
47
  # parser = Oga::XPath::Parser.new('//foo')
49
48
  # ast = parser.parse
50
49
  #
51
- # @return [Oga::XPath::Node]
50
+ # @return [AST::Node]
52
51
  #
53
52
  def parse
54
53
  ast = yyparse(self, :yield_next_token)
@@ -59,181 +58,202 @@ module Oga
59
58
  ##### State transition tables begin ###
60
59
 
61
60
  racc_action_table = [
62
- 20, 48, 20, 23, 22, 19, 18, 19, 18, 49,
63
- 20, 14, 21, 23, 22, 19, 18, 71, 20, 40,
64
- 73, 14, 21, 19, 18, 19, 18, 24, 20, 53,
65
- 47, 23, 22, 19, 18, 40, -14, 24, 20, 14,
66
- 21, 23, 22, 19, 18, 40, -13, -12, 20, 14,
67
- 21, 23, 22, 19, 18, 24, 77, 25, 20, 14,
68
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
69
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
70
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
71
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
72
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
73
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
74
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
75
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
76
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
77
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
78
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
79
- 21, 23, 22, 19, 18, 24, nil, nil, 20, 14,
80
- 21, 23, 22, 19, 18, 24, nil, nil, 26, 14,
81
- 21, 29, 30, 31, nil, 24, 76, nil, nil, nil,
82
- 39, 38, nil, nil, nil, 24, nil, 26, 27, 28,
83
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 39,
84
- 38, 75, nil, nil, nil, nil, 26, 27, 28, 29,
85
- 30, 31, 32, 33, 34, 35, 36, 37, 39, 38,
86
- 26, nil, nil, 29, 30, 31, 32, 33, 34, 35,
87
- 36, 37, 39, 38, 26, 27, nil, 29, 30, 31,
88
- 32, 33, 34, 35, 36, 37, 39, 38, 26, nil,
89
- nil, 29, 30, 31, nil, nil, 34, 35, 36, 37,
90
- 39, 38, 26, nil, nil, 29, 30, 31, nil, nil,
91
- 34, 35, 36, 37, 39, 38, 26, nil, nil, 29,
92
- 30, 31, 26, nil, nil, 29, 30, 31, 39, 38,
93
- nil, nil, nil, 26, 39, 38, 29, 30, 31, nil,
94
- nil, nil, nil, nil, nil, 39, 38, 26, 27, 28,
95
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 39,
96
- 38 ]
61
+ 23, 22, 21, 26, 25, 22, 21, 53, 48, 4,
62
+ 79, 17, 24, 23, 77, 54, 26, 25, 22, 21,
63
+ 73, 58, 4, 48, 17, 24, 23, 27, 23, 26,
64
+ 25, 22, 21, 22, 21, 4, 46, 17, 24, 23,
65
+ 27, 23, 26, 25, 22, 21, 22, 21, 4, 46,
66
+ 17, 24, 23, 27, -18, 26, 25, 22, 21, 48,
67
+ -17, 4, 83, 17, 24, 23, 27, 28, 26, 25,
68
+ 22, 21, nil, nil, 4, nil, 17, 24, 23, 27,
69
+ nil, 26, 25, 22, 21, nil, nil, 4, nil, 17,
70
+ 24, 23, 27, nil, 26, 25, 22, 21, nil, nil,
71
+ 4, nil, 17, 24, 23, 27, nil, 26, 25, 22,
72
+ 21, nil, nil, 4, nil, 17, 24, 23, 27, nil,
73
+ 26, 25, 22, 21, nil, nil, 4, nil, 17, 24,
74
+ 23, 27, nil, 26, 25, 22, 21, nil, nil, 4,
75
+ nil, 17, 24, 23, 27, nil, 26, 25, 22, 21,
76
+ nil, nil, 4, nil, 17, 24, 23, 27, nil, 26,
77
+ 25, 22, 21, nil, nil, 4, nil, 17, 24, 23,
78
+ 27, nil, 26, 25, 22, 21, nil, nil, 4, nil,
79
+ 17, 24, 23, 27, nil, 26, 25, 22, 21, nil,
80
+ nil, 4, nil, 17, 24, 23, 27, nil, 26, 25,
81
+ 22, 21, nil, nil, 4, nil, 17, 24, 23, 27,
82
+ nil, 26, 25, 22, 21, nil, nil, 4, nil, 17,
83
+ 24, 23, 27, nil, 26, 25, 22, 21, nil, nil,
84
+ 4, nil, 17, 24, 23, 27, nil, 26, 25, 22,
85
+ 21, nil, nil, 4, nil, 17, 24, nil, 27, nil,
86
+ nil, 82, nil, nil, nil, nil, nil, nil, nil, nil,
87
+ nil, 27, 29, 30, 31, 32, 33, 34, 35, 36,
88
+ 37, 38, 39, 40, 42, 41, 81, nil, nil, nil,
89
+ nil, 29, 30, 31, 32, 33, 34, 35, 36, 37,
90
+ 38, 39, 40, 42, 41, 29, 30, 31, 32, 33,
91
+ 34, 35, 36, 37, 38, 39, 40, 42, 41, 29,
92
+ nil, nil, 32, 33, 34, 35, 36, 37, 38, 39,
93
+ 40, 42, 41, 29, 30, nil, 32, 33, 34, 35,
94
+ 36, 37, 38, 39, 40, 42, 41, 29, nil, nil,
95
+ 32, 33, 34, nil, nil, 37, 38, 39, 40, 42,
96
+ 41, 29, nil, nil, 32, 33, 34, nil, nil, 37,
97
+ 38, 39, 40, 42, 41, 29, nil, nil, 32, 33,
98
+ 34, 29, nil, nil, 32, 33, 34, 42, 41, nil,
99
+ nil, nil, 29, 42, 41, 32, 33, 34, 29, nil,
100
+ nil, 32, 33, 34, 42, 41, nil, nil, nil, nil,
101
+ 42, 41, 29, 30, 31, 32, 33, 34, 35, 36,
102
+ 37, 38, 39, 40, 42, 41 ]
97
103
 
98
104
  racc_action_check = [
99
- 47, 19, 40, 47, 47, 47, 47, 40, 40, 19,
100
- 49, 47, 47, 49, 49, 49, 49, 48, 14, 44,
101
- 49, 49, 49, 14, 14, 20, 20, 47, 33, 25,
102
- 16, 33, 33, 33, 33, 12, 8, 49, 39, 33,
103
- 33, 39, 39, 39, 39, 68, 5, 3, 38, 39,
104
- 39, 38, 38, 38, 38, 33, 74, 1, 37, 38,
105
- 38, 37, 37, 37, 37, 39, nil, nil, 36, 37,
106
- 37, 36, 36, 36, 36, 38, nil, nil, 35, 36,
107
- 36, 35, 35, 35, 35, 37, nil, nil, 34, 35,
108
- 35, 34, 34, 34, 34, 36, nil, nil, 76, 34,
109
- 34, 76, 76, 76, 76, 35, nil, nil, 0, 76,
110
- 76, 0, 0, 0, 0, 34, nil, nil, 32, 0,
111
- 0, 32, 32, 32, 32, 76, nil, nil, 26, 32,
112
- 32, 26, 26, 26, 26, 0, nil, nil, 27, 26,
113
- 26, 27, 27, 27, 27, 32, nil, nil, 28, 27,
114
- 27, 28, 28, 28, 28, 26, nil, nil, 29, 28,
115
- 28, 29, 29, 29, 29, 27, nil, nil, 30, 29,
116
- 29, 30, 30, 30, 30, 28, nil, nil, 31, 30,
117
- 30, 31, 31, 31, 31, 29, nil, nil, 62, 31,
118
- 31, 62, 62, 62, nil, 30, 72, nil, nil, nil,
119
- 62, 62, nil, nil, nil, 31, nil, 72, 72, 72,
120
- 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
121
- 72, 70, nil, nil, nil, nil, 70, 70, 70, 70,
122
- 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
123
- 55, nil, nil, 55, 55, 55, 55, 55, 55, 55,
124
- 55, 55, 55, 55, 56, 56, nil, 56, 56, 56,
125
- 56, 56, 56, 56, 56, 56, 56, 56, 60, nil,
126
- nil, 60, 60, 60, nil, nil, 60, 60, 60, 60,
127
- 60, 60, 61, nil, nil, 61, 61, 61, nil, nil,
128
- 61, 61, 61, 61, 61, 61, 63, nil, nil, 63,
129
- 63, 63, 64, nil, nil, 64, 64, 64, 63, 63,
130
- nil, nil, nil, 65, 64, 64, 65, 65, 65, nil,
131
- nil, nil, nil, nil, nil, 65, 65, 2, 2, 2,
132
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
133
- 2 ]
105
+ 54, 23, 23, 54, 54, 54, 54, 22, 51, 54,
106
+ 54, 54, 54, 46, 53, 22, 46, 46, 46, 46,
107
+ 43, 28, 46, 15, 46, 46, 36, 54, 48, 36,
108
+ 36, 36, 36, 48, 48, 36, 14, 36, 36, 4,
109
+ 46, 17, 4, 4, 4, 4, 17, 17, 4, 13,
110
+ 4, 4, 42, 36, 9, 42, 42, 42, 42, 75,
111
+ 5, 42, 80, 42, 42, 41, 4, 1, 41, 41,
112
+ 41, 41, nil, nil, 41, nil, 41, 41, 40, 42,
113
+ nil, 40, 40, 40, 40, nil, nil, 40, nil, 40,
114
+ 40, 39, 41, nil, 39, 39, 39, 39, nil, nil,
115
+ 39, nil, 39, 39, 38, 40, nil, 38, 38, 38,
116
+ 38, nil, nil, 38, nil, 38, 38, 37, 39, nil,
117
+ 37, 37, 37, 37, nil, nil, 37, nil, 37, 37,
118
+ 35, 38, nil, 35, 35, 35, 35, nil, nil, 35,
119
+ nil, 35, 35, 82, 37, nil, 82, 82, 82, 82,
120
+ nil, nil, 82, nil, 82, 82, 0, 35, nil, 0,
121
+ 0, 0, 0, nil, nil, 0, nil, 0, 0, 29,
122
+ 82, nil, 29, 29, 29, 29, nil, nil, 29, nil,
123
+ 29, 29, 30, 0, nil, 30, 30, 30, 30, nil,
124
+ nil, 30, nil, 30, 30, 31, 29, nil, 31, 31,
125
+ 31, 31, nil, nil, 31, nil, 31, 31, 32, 30,
126
+ nil, 32, 32, 32, 32, nil, nil, 32, nil, 32,
127
+ 32, 33, 31, nil, 33, 33, 33, 33, nil, nil,
128
+ 33, nil, 33, 33, 34, 32, nil, 34, 34, 34,
129
+ 34, nil, nil, 34, nil, 34, 34, nil, 33, nil,
130
+ nil, 78, nil, nil, nil, nil, nil, nil, nil, nil,
131
+ nil, 34, 78, 78, 78, 78, 78, 78, 78, 78,
132
+ 78, 78, 78, 78, 78, 78, 74, nil, nil, nil,
133
+ nil, 74, 74, 74, 74, 74, 74, 74, 74, 74,
134
+ 74, 74, 74, 74, 74, 44, 44, 44, 44, 44,
135
+ 44, 44, 44, 44, 44, 44, 44, 44, 44, 60,
136
+ nil, nil, 60, 60, 60, 60, 60, 60, 60, 60,
137
+ 60, 60, 60, 61, 61, nil, 61, 61, 61, 61,
138
+ 61, 61, 61, 61, 61, 61, 61, 65, nil, nil,
139
+ 65, 65, 65, nil, nil, 65, 65, 65, 65, 65,
140
+ 65, 66, nil, nil, 66, 66, 66, nil, nil, 66,
141
+ 66, 66, 66, 66, 66, 67, nil, nil, 67, 67,
142
+ 67, 68, nil, nil, 68, 68, 68, 67, 67, nil,
143
+ nil, nil, 69, 68, 68, 69, 69, 69, 70, nil,
144
+ nil, 70, 70, 70, 69, 69, nil, nil, nil, nil,
145
+ 70, 70, 2, 2, 2, 2, 2, 2, 2, 2,
146
+ 2, 2, 2, 2, 2, 2 ]
134
147
 
135
148
  racc_action_pointer = [
136
- 106, 57, 312, 34, nil, 33, nil, nil, 23, nil,
137
- nil, nil, 22, nil, 16, nil, 21, nil, nil, -2,
138
- 18, nil, nil, nil, nil, 29, 126, 136, 146, 156,
139
- 166, 176, 116, 26, 86, 76, 66, 56, 46, 36,
140
- 0, nil, nil, nil, 6, nil, nil, -2, 10, 8,
141
- nil, nil, nil, nil, nil, 225, 239, nil, nil, nil,
142
- 253, 267, 173, 281, 287, 298, nil, nil, 32, nil,
143
- 211, nil, 192, nil, 44, nil, 96, nil, nil ]
149
+ 154, 67, 387, nil, 37, 47, nil, nil, nil, 41,
150
+ nil, nil, nil, 40, 27, 10, nil, 39, nil, nil,
151
+ nil, nil, 4, -6, nil, nil, nil, nil, 21, 167,
152
+ 180, 193, 206, 219, 232, 128, 24, 115, 102, 89,
153
+ 76, 63, 50, 8, 280, nil, 11, nil, 26, nil,
154
+ nil, -5, nil, 7, -2, nil, nil, nil, nil, nil,
155
+ 294, 308, nil, nil, nil, 322, 336, 350, 356, 367,
156
+ 373, nil, nil, nil, 266, 46, nil, nil, 247, nil,
157
+ 50, nil, 141, nil, nil ]
144
158
 
145
159
  racc_action_default = [
146
- -2, -55, -1, -3, -4, -5, -6, -7, -8, -9,
147
- -10, -11, -55, -17, -20, -21, -22, -24, -25, -26,
148
- -44, -51, -52, -53, -54, -55, -55, -55, -55, -55,
149
- -55, -55, -55, -55, -55, -55, -55, -55, -55, -55,
150
- -55, -12, -13, -14, -19, -18, -23, -55, -55, -55,
151
- -43, -45, -46, 79, -29, -30, -31, -32, -33, -34,
152
- -35, -36, -37, -38, -39, -40, -41, -42, -15, -16,
153
- -55, -27, -49, -47, -55, -28, -55, -48, -50 ]
160
+ -2, -58, -1, -3, -58, -5, -6, -7, -8, -9,
161
+ -10, -11, -12, -13, -15, -58, -21, -24, -25, -26,
162
+ -27, -28, -29, -47, -54, -55, -56, -57, -58, -58,
163
+ -58, -58, -58, -58, -58, -58, -58, -58, -58, -58,
164
+ -58, -58, -58, -3, -58, -14, -58, -16, -58, -17,
165
+ -18, -23, -22, -58, -58, -46, -48, -49, 85, -32,
166
+ -33, -34, -35, -36, -37, -38, -39, -40, -41, -42,
167
+ -43, -44, -45, -4, -58, -19, -20, -30, -52, -50,
168
+ -58, -31, -58, -51, -53 ]
154
169
 
155
170
  racc_goto_table = [
156
- 2, 1, 51, 46, 50, nil, nil, nil, nil, nil,
157
- nil, nil, nil, 74, nil, 41, 42, 43, 44, 45,
158
- nil, nil, nil, 52, nil, nil, 54, 55, 56, 57,
159
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
160
- 78, 41, 42, 43, 68, 69, nil, 70 ]
171
+ 2, 45, 47, 1, 44, 43, 56, 55, nil, nil,
172
+ nil, nil, 49, 50, 51, nil, 52, nil, nil, 57,
173
+ 80, nil, nil, nil, nil, nil, nil, nil, nil, 59,
174
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
175
+ 70, 71, 72, 49, 50, 75, 74, 76, 84 ]
161
176
 
162
177
  racc_goto_check = [
163
- 2, 1, 14, 16, 18, nil, nil, nil, nil, nil,
164
- nil, nil, nil, 19, nil, 3, 5, 8, 12, 13,
165
- nil, nil, nil, 8, nil, nil, 2, 2, 2, 2,
178
+ 2, 13, 13, 1, 2, 3, 17, 20, nil, nil,
179
+ nil, nil, 4, 8, 15, nil, 16, nil, nil, 8,
180
+ 21, nil, nil, nil, nil, nil, nil, nil, nil, 2,
166
181
  2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
167
- 19, 3, 5, 8, 12, 13, nil, 2 ]
182
+ 2, 2, 2, 4, 8, 15, 2, 16, 21 ]
168
183
 
169
184
  racc_goto_pointer = [
170
- nil, 1, 0, 1, nil, 2, nil, nil, 3, nil,
171
- nil, nil, 4, 5, -18, nil, -13, nil, -16, -36 ]
185
+ nil, 3, 0, 1, -5, nil, nil, nil, -4, nil,
186
+ nil, nil, nil, -12, nil, -3, -1, -17, nil, nil,
187
+ -16, -34 ]
172
188
 
173
189
  racc_goto_default = [
174
- nil, nil, 72, 3, 4, 5, 6, 7, 8, 9,
175
- 10, 11, 12, 13, 15, 16, nil, 17, nil, nil ]
190
+ nil, nil, 78, 3, 5, 6, 7, 8, 9, 10,
191
+ 11, 12, 13, nil, 14, 15, 16, 18, 19, 20,
192
+ nil, nil ]
176
193
 
177
194
  racc_reduce_table = [
178
195
  0, 0, :racc_error,
179
196
  1, 31, :_reduce_1,
180
197
  0, 31, :_reduce_2,
181
198
  1, 32, :_reduce_none,
182
- 1, 32, :_reduce_none,
183
- 1, 32, :_reduce_none,
184
- 1, 32, :_reduce_none,
185
- 1, 32, :_reduce_none,
186
- 1, 32, :_reduce_none,
187
- 1, 32, :_reduce_none,
188
- 1, 32, :_reduce_none,
189
- 1, 32, :_reduce_none,
190
- 1, 42, :_reduce_none,
191
- 1, 42, :_reduce_none,
192
- 1, 42, :_reduce_none,
193
- 3, 43, :_reduce_15,
194
- 3, 43, :_reduce_16,
195
- 1, 39, :_reduce_17,
196
- 2, 40, :_reduce_18,
197
- 2, 40, :_reduce_19,
198
- 1, 40, :_reduce_20,
199
- 1, 33, :_reduce_21,
200
- 1, 44, :_reduce_22,
201
- 2, 44, :_reduce_23,
202
- 1, 44, :_reduce_24,
203
- 1, 47, :_reduce_25,
204
- 1, 45, :_reduce_26,
205
- 3, 45, :_reduce_27,
206
- 3, 46, :_reduce_28,
207
- 3, 34, :_reduce_29,
208
- 3, 34, :_reduce_30,
209
- 3, 34, :_reduce_31,
210
- 3, 34, :_reduce_32,
211
- 3, 34, :_reduce_33,
212
- 3, 34, :_reduce_34,
213
- 3, 34, :_reduce_35,
214
- 3, 34, :_reduce_36,
215
- 3, 34, :_reduce_37,
216
- 3, 34, :_reduce_38,
217
- 3, 34, :_reduce_39,
218
- 3, 34, :_reduce_40,
219
- 3, 34, :_reduce_41,
220
- 3, 34, :_reduce_42,
221
- 2, 35, :_reduce_43,
222
- 1, 35, :_reduce_44,
223
- 1, 48, :_reduce_none,
224
- 1, 48, :_reduce_none,
225
- 3, 38, :_reduce_47,
226
- 4, 38, :_reduce_48,
227
- 1, 49, :_reduce_49,
228
- 3, 49, :_reduce_50,
229
- 1, 36, :_reduce_51,
230
- 1, 37, :_reduce_52,
231
- 1, 37, :_reduce_53,
232
- 1, 41, :_reduce_54 ]
233
-
234
- racc_reduce_n = 55
235
-
236
- racc_shift_n = 79
199
+ 3, 32, :_reduce_4,
200
+ 1, 33, :_reduce_none,
201
+ 1, 33, :_reduce_none,
202
+ 1, 33, :_reduce_none,
203
+ 1, 33, :_reduce_none,
204
+ 1, 33, :_reduce_none,
205
+ 1, 33, :_reduce_none,
206
+ 1, 33, :_reduce_none,
207
+ 1, 33, :_reduce_none,
208
+ 1, 34, :_reduce_none,
209
+ 2, 34, :_reduce_14,
210
+ 1, 34, :_reduce_none,
211
+ 2, 34, :_reduce_16,
212
+ 1, 45, :_reduce_none,
213
+ 1, 45, :_reduce_none,
214
+ 3, 46, :_reduce_19,
215
+ 3, 46, :_reduce_20,
216
+ 1, 39, :_reduce_21,
217
+ 2, 40, :_reduce_22,
218
+ 2, 40, :_reduce_23,
219
+ 1, 40, :_reduce_24,
220
+ 1, 42, :_reduce_25,
221
+ 1, 47, :_reduce_26,
222
+ 1, 47, :_reduce_27,
223
+ 1, 49, :_reduce_28,
224
+ 1, 48, :_reduce_29,
225
+ 3, 48, :_reduce_30,
226
+ 3, 43, :_reduce_31,
227
+ 3, 35, :_reduce_32,
228
+ 3, 35, :_reduce_33,
229
+ 3, 35, :_reduce_34,
230
+ 3, 35, :_reduce_35,
231
+ 3, 35, :_reduce_36,
232
+ 3, 35, :_reduce_37,
233
+ 3, 35, :_reduce_38,
234
+ 3, 35, :_reduce_39,
235
+ 3, 35, :_reduce_40,
236
+ 3, 35, :_reduce_41,
237
+ 3, 35, :_reduce_42,
238
+ 3, 35, :_reduce_43,
239
+ 3, 35, :_reduce_44,
240
+ 3, 35, :_reduce_45,
241
+ 2, 44, :_reduce_46,
242
+ 1, 44, :_reduce_47,
243
+ 1, 50, :_reduce_none,
244
+ 1, 50, :_reduce_none,
245
+ 3, 38, :_reduce_50,
246
+ 4, 38, :_reduce_51,
247
+ 1, 51, :_reduce_52,
248
+ 3, 51, :_reduce_53,
249
+ 1, 36, :_reduce_54,
250
+ 1, 37, :_reduce_55,
251
+ 1, 37, :_reduce_56,
252
+ 1, 41, :_reduce_57 ]
253
+
254
+ racc_reduce_n = 58
255
+
256
+ racc_shift_n = 85
237
257
 
238
258
  racc_token_table = {
239
259
  false => 0,
@@ -321,20 +341,22 @@ Racc_token_to_s_table = [
321
341
  "$start",
322
342
  "xpath",
323
343
  "expression",
324
- "node_test_as_axis",
344
+ "expression_members",
345
+ "expression_with_predicate",
325
346
  "operator",
326
- "axis",
327
347
  "string",
328
348
  "number",
329
349
  "call",
330
350
  "path",
331
351
  "absolute_path",
332
352
  "variable",
353
+ "node_test_as_axis",
354
+ "predicate",
355
+ "axis",
333
356
  "path_member",
334
357
  "path_members",
335
358
  "node_test",
336
359
  "node_name",
337
- "predicate",
338
360
  "type_test",
339
361
  "axis_value",
340
362
  "call_args" ]
@@ -355,7 +377,9 @@ end
355
377
 
356
378
  # reduce 3 omitted
357
379
 
358
- # reduce 4 omitted
380
+ def _reduce_4(val, _values)
381
+ val[1]
382
+ end
359
383
 
360
384
  # reduce 5 omitted
361
385
 
@@ -375,161 +399,169 @@ end
375
399
 
376
400
  # reduce 13 omitted
377
401
 
378
- # reduce 14 omitted
402
+ def _reduce_14(val, _values)
403
+ s(:predicate, val[0], val[1])
404
+ end
405
+
406
+ # reduce 15 omitted
407
+
408
+ def _reduce_16(val, _values)
409
+ s(:predicate, val[0], val[1])
410
+ end
411
+
412
+ # reduce 17 omitted
379
413
 
380
- def _reduce_15(val, _values)
414
+ # reduce 18 omitted
415
+
416
+ def _reduce_19(val, _values)
381
417
  [val[0], val[2]]
382
418
  end
383
419
 
384
- def _reduce_16(val, _values)
420
+ def _reduce_20(val, _values)
385
421
  [val[0], *val[2]]
386
422
  end
387
423
 
388
- def _reduce_17(val, _values)
424
+ def _reduce_21(val, _values)
389
425
  s(:path, *val[0])
390
426
  end
391
427
 
392
- def _reduce_18(val, _values)
428
+ def _reduce_22(val, _values)
393
429
  s(:absolute_path, *val[1])
394
430
  end
395
431
 
396
- def _reduce_19(val, _values)
432
+ def _reduce_23(val, _values)
397
433
  s(:absolute_path, val[1])
398
434
  end
399
435
 
400
- def _reduce_20(val, _values)
436
+ def _reduce_24(val, _values)
401
437
  s(:absolute_path)
402
438
  end
403
439
 
404
- def _reduce_21(val, _values)
440
+ def _reduce_25(val, _values)
405
441
  s(:axis, 'child', val[0])
406
442
  end
407
443
 
408
- def _reduce_22(val, _values)
444
+ def _reduce_26(val, _values)
409
445
  s(:test, *val[0])
410
446
  end
411
447
 
412
- def _reduce_23(val, _values)
413
- s(:test, *val[0], val[1])
414
- end
415
-
416
- def _reduce_24(val, _values)
448
+ def _reduce_27(val, _values)
417
449
  val[0]
418
450
  end
419
451
 
420
- def _reduce_25(val, _values)
452
+ def _reduce_28(val, _values)
421
453
  s(:type_test, val[0])
422
454
  end
423
455
 
424
- def _reduce_26(val, _values)
456
+ def _reduce_29(val, _values)
425
457
  [nil, val[0]]
426
458
  end
427
459
 
428
- def _reduce_27(val, _values)
460
+ def _reduce_30(val, _values)
429
461
  [val[0], val[2]]
430
462
  end
431
463
 
432
- def _reduce_28(val, _values)
464
+ def _reduce_31(val, _values)
433
465
  val[1]
434
466
  end
435
467
 
436
- def _reduce_29(val, _values)
468
+ def _reduce_32(val, _values)
437
469
  s(:pipe, val[0], val[2])
438
470
  end
439
471
 
440
- def _reduce_30(val, _values)
472
+ def _reduce_33(val, _values)
441
473
  s(:and, val[0], val[2])
442
474
  end
443
475
 
444
- def _reduce_31(val, _values)
476
+ def _reduce_34(val, _values)
445
477
  s(:or, val[0], val[2])
446
478
  end
447
479
 
448
- def _reduce_32(val, _values)
480
+ def _reduce_35(val, _values)
449
481
  s(:add, val[0], val[2])
450
482
  end
451
483
 
452
- def _reduce_33(val, _values)
484
+ def _reduce_36(val, _values)
453
485
  s(:div, val[0], val[2])
454
486
  end
455
487
 
456
- def _reduce_34(val, _values)
488
+ def _reduce_37(val, _values)
457
489
  s(:mod, val[0], val[2])
458
490
  end
459
491
 
460
- def _reduce_35(val, _values)
492
+ def _reduce_38(val, _values)
461
493
  s(:eq, val[0], val[2])
462
494
  end
463
495
 
464
- def _reduce_36(val, _values)
496
+ def _reduce_39(val, _values)
465
497
  s(:neq, val[0], val[2])
466
498
  end
467
499
 
468
- def _reduce_37(val, _values)
500
+ def _reduce_40(val, _values)
469
501
  s(:lt, val[0], val[2])
470
502
  end
471
503
 
472
- def _reduce_38(val, _values)
504
+ def _reduce_41(val, _values)
473
505
  s(:gt, val[0], val[2])
474
506
  end
475
507
 
476
- def _reduce_39(val, _values)
508
+ def _reduce_42(val, _values)
477
509
  s(:lte, val[0], val[2])
478
510
  end
479
511
 
480
- def _reduce_40(val, _values)
512
+ def _reduce_43(val, _values)
481
513
  s(:gte, val[0], val[2])
482
514
  end
483
515
 
484
- def _reduce_41(val, _values)
516
+ def _reduce_44(val, _values)
485
517
  s(:mul, val[0], val[2])
486
518
  end
487
519
 
488
- def _reduce_42(val, _values)
520
+ def _reduce_45(val, _values)
489
521
  s(:sub, val[0], val[2])
490
522
  end
491
523
 
492
- def _reduce_43(val, _values)
524
+ def _reduce_46(val, _values)
493
525
  s(:axis, val[0], val[1])
494
526
  end
495
527
 
496
- def _reduce_44(val, _values)
528
+ def _reduce_47(val, _values)
497
529
  s(:axis, val[0])
498
530
  end
499
531
 
500
- # reduce 45 omitted
532
+ # reduce 48 omitted
501
533
 
502
- # reduce 46 omitted
534
+ # reduce 49 omitted
503
535
 
504
- def _reduce_47(val, _values)
536
+ def _reduce_50(val, _values)
505
537
  s(:call, val[0])
506
538
  end
507
539
 
508
- def _reduce_48(val, _values)
540
+ def _reduce_51(val, _values)
509
541
  s(:call, val[0], *val[2])
510
542
  end
511
543
 
512
- def _reduce_49(val, _values)
544
+ def _reduce_52(val, _values)
513
545
  val
514
546
  end
515
547
 
516
- def _reduce_50(val, _values)
548
+ def _reduce_53(val, _values)
517
549
  val[2].unshift(val[0])
518
550
  end
519
551
 
520
- def _reduce_51(val, _values)
552
+ def _reduce_54(val, _values)
521
553
  s(:string, val[0])
522
554
  end
523
555
 
524
- def _reduce_52(val, _values)
556
+ def _reduce_55(val, _values)
525
557
  s(:int, val[0])
526
558
  end
527
559
 
528
- def _reduce_53(val, _values)
560
+ def _reduce_56(val, _values)
529
561
  s(:float, val[0])
530
562
  end
531
563
 
532
- def _reduce_54(val, _values)
564
+ def _reduce_57(val, _values)
533
565
  s(:var, val[0])
534
566
  end
535
567