oga 0.1.1-java → 0.1.2-java

data/lib/oga/xpath/lexer.rb

@@ -1588,7 +1588,7 @@ ts = p
 		begin
  add_token(:T_SLASH) 		end
 	when 33 then
-# line 294 "lib/oga/xpath/lexer.rl"
+# line 296 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
 	when 12 then
@@ -1597,32 +1597,20 @@ ts = p
 te = p+1
 		end
 	when 11 then
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 8 then
-# line 342 "lib/oga/xpath/lexer.rl"
+# line 349 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
           emit(:T_TYPE_TEST, ts, te - 2)
          end
 		end
-	when 20 then
-# line 365 "lib/oga/xpath/lexer.rl"
-		begin
-te = p+1
- begin  add_token(:T_LBRACK)  end
-		end
-	when 21 then
-# line 366 "lib/oga/xpath/lexer.rl"
-		begin
-te = p+1
- begin  add_token(:T_RBRACK)  end
-		end
 	when 2 then
-# line 236 "lib/oga/xpath/lexer.rl"
+# line 238 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1630,7 +1618,7 @@ te = p+1
          end
 		end
 	when 7 then
-# line 258 "lib/oga/xpath/lexer.rl"
+# line 260 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1638,7 +1626,7 @@ te = p+1
          end
 		end
 	when 19 then
-# line 270 "lib/oga/xpath/lexer.rl"
+# line 272 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
  begin 
@@ -1659,12 +1647,12 @@ te = p+1
          end
 		end
 	when 22 then
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 30 then
-# line 355 "lib/oga/xpath/lexer.rl"
+# line 362 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1672,7 +1660,7 @@ p = p - 1; begin
          end
 		end
 	when 35 then
-# line 211 "lib/oga/xpath/lexer.rl"
+# line 213 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1682,7 +1670,7 @@ p = p - 1; begin
          end
 		end
 	when 36 then
-# line 217 "lib/oga/xpath/lexer.rl"
+# line 219 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1692,7 +1680,7 @@ p = p - 1; begin
          end
 		end
 	when 37 then
-# line 270 "lib/oga/xpath/lexer.rl"
+# line 272 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1713,7 +1701,7 @@ p = p - 1; begin
          end
 		end
 	when 31 then
-# line 197 "lib/oga/xpath/lexer.rl"
+# line 199 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1; begin 
@@ -1721,12 +1709,12 @@ p = p - 1; begin
          end
 		end
 	when 1 then
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
  begin p = ((te))-1; end
 		end
 	when 6 then
-# line 197 "lib/oga/xpath/lexer.rl"
+# line 199 "lib/oga/xpath/lexer.rl"
 		begin
  begin p = ((te))-1; end
  begin 
@@ -1744,14 +1732,14 @@ p = p - 1; begin
 		next
 	end
 end
-	when 8 then
+	when 6 then
 	begin begin p = ((te))-1; end
 
           value = slice_input(ts, te).to_i
 
           add_token(:T_INT, value)
         end
-	when 9 then
+	when 7 then
 	begin begin p = ((te))-1; end
 
           value = slice_input(ts, te).to_f
@@ -1767,7 +1755,7 @@ end
 # line 185 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LPAREN) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
@@ -1775,7 +1763,7 @@ te = p+1
 # line 186 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_RPAREN) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
@@ -1783,7 +1771,7 @@ te = p+1
 # line 187 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_COMMA) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
@@ -1791,119 +1779,135 @@ te = p+1
 # line 188 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_COLON) 		end
-# line 361 "lib/oga/xpath/lexer.rl"
+# line 368 "lib/oga/xpath/lexer.rl"
+		begin
+te = p+1
+		end
+	when 20 then
+# line 189 "lib/oga/xpath/lexer.rl"
+		begin
+ add_token(:T_LBRACK) 		end
+# line 368 "lib/oga/xpath/lexer.rl"
+		begin
+te = p+1
+		end
+	when 21 then
+# line 190 "lib/oga/xpath/lexer.rl"
+		begin
+ add_token(:T_RBRACK) 		end
+# line 368 "lib/oga/xpath/lexer.rl"
 		begin
 te = p+1
 		end
 	when 43 then
-# line 293 "lib/oga/xpath/lexer.rl"
+# line 295 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_PIPE) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 32 then
-# line 294 "lib/oga/xpath/lexer.rl"
+# line 296 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 40 then
-# line 295 "lib/oga/xpath/lexer.rl"
+# line 297 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_EQ) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 29 then
-# line 296 "lib/oga/xpath/lexer.rl"
+# line 298 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_NEQ) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 38 then
-# line 297 "lib/oga/xpath/lexer.rl"
+# line 299 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LT) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 41 then
-# line 298 "lib/oga/xpath/lexer.rl"
+# line 300 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_GT) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 39 then
-# line 299 "lib/oga/xpath/lexer.rl"
+# line 301 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_LTE) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 42 then
-# line 300 "lib/oga/xpath/lexer.rl"
+# line 302 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_GTE) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 25 then
-# line 310 "lib/oga/xpath/lexer.rl"
+# line 312 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_AND) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 28 then
-# line 311 "lib/oga/xpath/lexer.rl"
+# line 313 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_OR) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 26 then
-# line 312 "lib/oga/xpath/lexer.rl"
+# line 314 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_DIV) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 27 then
-# line 313 "lib/oga/xpath/lexer.rl"
+# line 315 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_MOD) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 23 then
-# line 314 "lib/oga/xpath/lexer.rl"
+# line 316 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_MUL) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
 	when 24 then
-# line 315 "lib/oga/xpath/lexer.rl"
+# line 317 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_SUB) 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 te = p
 p = p - 1;		end
@@ -1912,7 +1916,7 @@ p = p - 1;		end
 		begin
 te = p+1
 		end
-# line 360 "lib/oga/xpath/lexer.rl"
+# line 367 "lib/oga/xpath/lexer.rl"
 		begin
 act = 1;		end
 	when 4 then
@@ -1920,29 +1924,29 @@ act = 1;		end
 		begin
 te = p+1
 		end
-# line 211 "lib/oga/xpath/lexer.rl"
+# line 213 "lib/oga/xpath/lexer.rl"
 		begin
-act = 8;		end
+act = 6;		end
 	when 5 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 217 "lib/oga/xpath/lexer.rl"
+# line 219 "lib/oga/xpath/lexer.rl"
 		begin
-act = 9;		end
+act = 7;		end
 	when 34 then
 # line 1 "NONE"
 		begin
 te = p+1
 		end
-# line 294 "lib/oga/xpath/lexer.rl"
+# line 296 "lib/oga/xpath/lexer.rl"
 		begin
  add_token(:T_ADD) 		end
-# line 211 "lib/oga/xpath/lexer.rl"
+# line 213 "lib/oga/xpath/lexer.rl"
 		begin
-act = 8;		end
-# line 1945 "lib/oga/xpath/lexer.rb"
+act = 6;		end
+# line 1949 "lib/oga/xpath/lexer.rb"
 	end
 	end
 	end
@@ -1956,7 +1960,7 @@ ts = nil;		end
 		begin
 act = 0
 		end
-# line 1959 "lib/oga/xpath/lexer.rb"
+# line 1963 "lib/oga/xpath/lexer.rb"
 	end
 
 	if cs == 0
@@ -2036,7 +2040,7 @@ end
       end
 
       
-# line 376 "lib/oga/xpath/lexer.rl"
+# line 379 "lib/oga/xpath/lexer.rl"
 
     end # Lexer
   end # XPath

data/lib/oga/xpath/parser.rb

@@ -143,14 +143,14 @@ racc_action_pointer = [
    211,   nil,   192,   nil,    44,   nil,    96,   nil,   nil ]
 
 racc_action_default = [
-    -2,   -54,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
-   -10,   -11,   -54,   -17,   -54,   -20,   -21,   -23,   -24,   -25,
-   -43,   -50,   -51,   -52,   -53,   -54,   -54,   -54,   -54,   -54,
-   -54,   -54,   -54,   -54,   -54,   -54,   -54,   -54,   -54,   -54,
-   -54,   -12,   -13,   -14,   -19,   -18,   -22,   -54,   -54,   -54,
-   -42,   -44,   -45,    79,   -28,   -29,   -30,   -31,   -32,   -33,
-   -34,   -35,   -36,   -37,   -38,   -39,   -40,   -41,   -15,   -16,
-   -54,   -26,   -48,   -46,   -54,   -27,   -54,   -47,   -49 ]
+    -2,   -55,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
+   -10,   -11,   -55,   -17,   -20,   -21,   -22,   -24,   -25,   -26,
+   -44,   -51,   -52,   -53,   -54,   -55,   -55,   -55,   -55,   -55,
+   -55,   -55,   -55,   -55,   -55,   -55,   -55,   -55,   -55,   -55,
+   -55,   -12,   -13,   -14,   -19,   -18,   -23,   -55,   -55,   -55,
+   -43,   -45,   -46,    79,   -29,   -30,   -31,   -32,   -33,   -34,
+   -35,   -36,   -37,   -38,   -39,   -40,   -41,   -42,   -15,   -16,
+   -55,   -27,   -49,   -47,   -55,   -28,   -55,   -48,   -50 ]
 
 racc_goto_table = [
      2,     1,    51,    46,    50,   nil,   nil,   nil,   nil,   nil,
@@ -195,15 +195,15 @@ racc_reduce_table = [
   1, 39, :_reduce_17,
   2, 40, :_reduce_18,
   2, 40, :_reduce_19,
-  1, 33, :_reduce_20,
-  1, 44, :_reduce_21,
-  2, 44, :_reduce_22,
-  1, 44, :_reduce_23,
-  1, 47, :_reduce_24,
-  1, 45, :_reduce_25,
-  3, 45, :_reduce_26,
-  3, 46, :_reduce_27,
-  3, 34, :_reduce_28,
+  1, 40, :_reduce_20,
+  1, 33, :_reduce_21,
+  1, 44, :_reduce_22,
+  2, 44, :_reduce_23,
+  1, 44, :_reduce_24,
+  1, 47, :_reduce_25,
+  1, 45, :_reduce_26,
+  3, 45, :_reduce_27,
+  3, 46, :_reduce_28,
   3, 34, :_reduce_29,
   3, 34, :_reduce_30,
   3, 34, :_reduce_31,
@@ -217,20 +217,21 @@ racc_reduce_table = [
   3, 34, :_reduce_39,
   3, 34, :_reduce_40,
   3, 34, :_reduce_41,
-  2, 35, :_reduce_42,
-  1, 35, :_reduce_43,
+  3, 34, :_reduce_42,
+  2, 35, :_reduce_43,
+  1, 35, :_reduce_44,
   1, 48, :_reduce_none,
   1, 48, :_reduce_none,
-  3, 38, :_reduce_46,
-  4, 38, :_reduce_47,
-  1, 49, :_reduce_48,
-  3, 49, :_reduce_49,
-  1, 36, :_reduce_50,
-  1, 37, :_reduce_51,
+  3, 38, :_reduce_47,
+  4, 38, :_reduce_48,
+  1, 49, :_reduce_49,
+  3, 49, :_reduce_50,
+  1, 36, :_reduce_51,
   1, 37, :_reduce_52,
-  1, 41, :_reduce_53 ]
+  1, 37, :_reduce_53,
+  1, 41, :_reduce_54 ]
 
-racc_reduce_n = 54
+racc_reduce_n = 55
 
 racc_shift_n = 79
 
@@ -397,134 +398,138 @@ def _reduce_19(val, _values)
 end
 
 def _reduce_20(val, _values)
- s(:axis, 'child', val[0]) 
+ s(:absolute_path) 
 end
 
 def _reduce_21(val, _values)
- s(:test, *val[0]) 
+ s(:axis, 'child', val[0]) 
 end
 
 def _reduce_22(val, _values)
- s(:test, *val[0], val[1]) 
+ s(:test, *val[0]) 
 end
 
 def _reduce_23(val, _values)
- val[0] 
+ s(:test, *val[0], val[1]) 
 end
 
 def _reduce_24(val, _values)
- s(:type_test, val[0]) 
+ val[0] 
 end
 
 def _reduce_25(val, _values)
- [nil, val[0]] 
+ s(:type_test, val[0]) 
 end
 
 def _reduce_26(val, _values)
- [val[0], val[2]] 
+ [nil, val[0]] 
 end
 
 def _reduce_27(val, _values)
- val[1] 
+ [val[0], val[2]] 
 end
 
 def _reduce_28(val, _values)
- s(:pipe, val[0], val[2]) 
+ val[1] 
 end
 
 def _reduce_29(val, _values)
- s(:and, val[0], val[2]) 
+ s(:pipe, val[0], val[2]) 
 end
 
 def _reduce_30(val, _values)
- s(:or, val[0], val[2]) 
+ s(:and, val[0], val[2]) 
 end
 
 def _reduce_31(val, _values)
- s(:add, val[0], val[2]) 
+ s(:or, val[0], val[2]) 
 end
 
 def _reduce_32(val, _values)
- s(:div, val[0], val[2]) 
+ s(:add, val[0], val[2]) 
 end
 
 def _reduce_33(val, _values)
- s(:mod, val[0], val[2]) 
+ s(:div, val[0], val[2]) 
 end
 
 def _reduce_34(val, _values)
- s(:eq, val[0], val[2]) 
+ s(:mod, val[0], val[2]) 
 end
 
 def _reduce_35(val, _values)
- s(:neq, val[0], val[2]) 
+ s(:eq, val[0], val[2]) 
 end
 
 def _reduce_36(val, _values)
- s(:lt, val[0], val[2]) 
+ s(:neq, val[0], val[2]) 
 end
 
 def _reduce_37(val, _values)
- s(:gt, val[0], val[2]) 
+ s(:lt, val[0], val[2]) 
 end
 
 def _reduce_38(val, _values)
- s(:lte, val[0], val[2]) 
+ s(:gt, val[0], val[2]) 
 end
 
 def _reduce_39(val, _values)
- s(:gte, val[0], val[2]) 
+ s(:lte, val[0], val[2]) 
 end
 
 def _reduce_40(val, _values)
- s(:mul, val[0], val[2]) 
+ s(:gte, val[0], val[2]) 
 end
 
 def _reduce_41(val, _values)
- s(:sub, val[0], val[2]) 
+ s(:mul, val[0], val[2]) 
 end
 
 def _reduce_42(val, _values)
- s(:axis, val[0], val[1]) 
+ s(:sub, val[0], val[2]) 
 end
 
 def _reduce_43(val, _values)
- s(:axis, val[0]) 
+ s(:axis, val[0], val[1]) 
 end
 
-# reduce 44 omitted
+def _reduce_44(val, _values)
+ s(:axis, val[0]) 
+end
 
 # reduce 45 omitted
 
-def _reduce_46(val, _values)
+# reduce 46 omitted
+
+def _reduce_47(val, _values)
  s(:call, val[0]) 
 end
 
-def _reduce_47(val, _values)
+def _reduce_48(val, _values)
  s(:call, val[0], *val[2]) 
 end
 
-def _reduce_48(val, _values)
+def _reduce_49(val, _values)
  val 
 end
 
-def _reduce_49(val, _values)
+def _reduce_50(val, _values)
  val[2].unshift(val[0]) 
 end
 
-def _reduce_50(val, _values)
+def _reduce_51(val, _values)
  s(:string, val[0]) 
 end
 
-def _reduce_51(val, _values)
+def _reduce_52(val, _values)
  s(:int, val[0]) 
 end
 
-def _reduce_52(val, _values)
+def _reduce_53(val, _values)
  s(:float, val[0]) 
 end
 
-def _reduce_53(val, _values)
+def _reduce_54(val, _values)
  s(:var, val[0]) 
 end