oga 1.2.3-java → 1.3.0-java

data/lib/oga/xpath/parser.rb

@@ -5,7 +5,6 @@ require 'll/setup'
 
 module Oga
 module XPath
-##
 # AST parser for XPath expressions. The AST is built using `AST::Node`
 # instances.
 #
@@ -49,74 +48,76 @@ class Parser < LL::Driver
   ].freeze
 
   CONFIG.rules = [
-    [3, 0, 8, 34], # 0
-    [3, 1, 4, 35, 6, 0, 0, 3], # 1
+    [3, 0, 8, 32], # 0
+    [3, 1, 4, 33, 6, 0, 0, 3], # 1
     [3, 2, 0, 3, 1, 16], # 2
-    [3, 3, 4, 36, 6, 0, 0, 5], # 3
+    [3, 3, 4, 34, 6, 0, 0, 5], # 3
     [3, 4, 0, 5, 1, 15], # 4
-    [3, 5, 4, 37, 6, 0, 0, 7], # 5
+    [3, 5, 4, 35, 6, 0, 0, 7], # 5
     [3, 6, 0, 7, 1, 20], # 6
     [3, 7, 0, 7, 1, 21], # 7
-    [3, 8, 4, 38, 6, 0, 0, 9], # 8
+    [3, 8, 4, 36, 6, 0, 0, 9], # 8
     [3, 9, 0, 9, 1, 22], # 9
     [3, 10, 0, 9, 1, 23], # 10
     [3, 11, 0, 9, 1, 24], # 11
     [3, 12, 0, 9, 1, 25], # 12
-    [3, 13, 4, 39, 6, 0, 0, 11], # 13
+    [3, 13, 4, 37, 6, 0, 0, 11], # 13
     [3, 14, 0, 11, 1, 17], # 14
     [3, 15, 0, 11, 1, 26], # 15
-    [3, 16, 8, 40, 0, 13], # 16
+    [3, 16, 8, 38, 0, 13], # 16
     [3, 17, 0, 11, 1, 18], # 17
     [3, 18, 0, 11, 1, 19], # 18
     [3, 19, 0, 11, 1, 27], # 19
-    [3, 20, 4, 41, 6, 0, 0, 15], # 20
+    [3, 20, 4, 39, 6, 0, 0, 15], # 20
     [3, 21, 0, 15, 1, 14], # 21
-    [3, 22, 0, 16], # 22
-    [3, 23, 0, 19], # 23
-    [3, 24, 0, 31], # 24
-    [3, 25, 0, 32], # 25
-    [3, 26, 0, 33], # 26
+    [3, 22, 0, 17], # 22
+    [3, 23, 0, 16], # 23
+    [3, 24, 0, 29], # 24
+    [3, 25, 0, 30], # 25
+    [3, 26, 0, 31], # 26
     [3, 27, 1, 11, 0, 1, 1, 10], # 27
-    [3, 28, 0, 17], # 28
-    [3, 29, 4, 42, 6, 0, 0, 20], # 29
-    [3, 30, 0, 20, 1, 12], # 30
-    [3, 31, 8, 43, 1, 12], # 31
-    [3, 32, 0, 21], # 32
-    [3, 33, 0, 29], # 33
-    [3, 34, 0, 22, 1, 6], # 34
-    [3, 35, 0, 24], # 35
-    [3, 36, 1, 11, 0, 27, 1, 10], # 36
-    [3, 37, 8, 44, 1, 6, 1, 2], # 37
-    [3, 38, 8, 45], # 38
-    [3, 39, 1, 9, 0, 1, 1, 8], # 39
-    [3, 40, 1, 7], # 40
-    [3, 41, 8, 46, 1, 6], # 41
-    [3, 42, 1, 6, 1, 2], # 42
-    [3, 43, 4, 47, 6, 0, 0, 1], # 43
-    [3, 44, 2, 0], # 44
-    [3, 45, 0, 1, 1, 3], # 45
-    [3, 46, 8, 48, 0, 30, 1, 1], # 46
-    [3, 47, 0, 25], # 47
-    [3, 48, 0, 24], # 48
-    [3, 49, 1, 13], # 49
-    [3, 50, 1, 5], # 50
-    [3, 51, 1, 4], # 51
-    [3, 52, 1, 28], # 52
-    [3, 53, 0, 1], # 53
-    [3, 54, 0, 2], # 54
-    [3, 55, 0, 4], # 55
-    [3, 56, 0, 6], # 56
-    [3, 57, 0, 8], # 57
-    [3, 58, 0, 10], # 58
-    [3, 59, 0, 12], # 59
-    [3, 60, 0, 14], # 60
-    [3, 61, 0, 18], # 61
-    [3, 62, 0, 17], # 62
-    [3, 63, 0, 23], # 63
-    [3, 64, 0, 23], # 64
-    [3, 65, 0, 26], # 65
-    [3, 66, 0, 28], # 66
-    [3, 67, 0, 23], # 67
+    [3, 28, 8, 40, 1, 12], # 28
+    [3, 29, 0, 18], # 29
+    [3, 30, 0, 27], # 30
+    [3, 31, 0, 19, 1, 6], # 31
+    [3, 32, 8, 42, 8, 41, 0, 22], # 32
+    [3, 33, 1, 11, 0, 25, 1, 10], # 33
+    [3, 34, 8, 44, 8, 43, 1, 6, 1, 2], # 34
+    [3, 35, 8, 46, 8, 45], # 35
+    [3, 36, 0, 17, 1, 12], # 36
+    [3, 37, 1, 9, 0, 1, 1, 8], # 37
+    [3, 38, 1, 7], # 38
+    [3, 39, 8, 47, 1, 6], # 39
+    [3, 40, 1, 6, 1, 2], # 40
+    [3, 41, 4, 48, 6, 0, 0, 1], # 41
+    [3, 42, 2, 0], # 42
+    [3, 43, 0, 1, 1, 3], # 43
+    [3, 44, 8, 50, 8, 49, 0, 28, 1, 1], # 44
+    [3, 45, 0, 23], # 45
+    [3, 46, 0, 22], # 46
+    [3, 47, 1, 13], # 47
+    [3, 48, 1, 5], # 48
+    [3, 49, 1, 4], # 49
+    [3, 50, 1, 28], # 50
+    [3, 51, 0, 1], # 51
+    [3, 52, 0, 2], # 52
+    [3, 53, 0, 4], # 53
+    [3, 54, 0, 6], # 54
+    [3, 55, 0, 8], # 55
+    [3, 56, 0, 10], # 56
+    [3, 57, 0, 12], # 57
+    [3, 58, 0, 14], # 58
+    [3, 59, 0, 17], # 59
+    [3, 60, 0, 21], # 60
+    [3, 61, 0, 20], # 61
+    [3, 62, 0, 21], # 62
+    [3, 63, 0, 20], # 63
+    [3, 64, 0, 21], # 64
+    [3, 65, 0, 20], # 65
+    [3, 66, 0, 24], # 66
+    [3, 67, 0, 26], # 67
+    [3, 68, 0, 21], # 68
+    [3, 69, 0, 20], # 69
   ].freeze
 
   CONFIG.table = [
@@ -136,39 +137,41 @@ class Parser < LL::Driver
     [-1, 20, -1, -1, 20, 20, 20, 20, -1, -1, 20, -1, 20, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 20], # 13
     [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 14
     [-1, 22, -1, -1, 25, 25, 22, 22, -1, -1, 27, -1, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 26], # 15
-    [-1, 28, -1, -1, -1, -1, 28, 28, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 16
-    [-1, 29, -1, -1, -1, -1, 29, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 17
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 18
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 19
-    [-1, 33, -1, -1, -1, -1, 32, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 20
-    [-1, -1, -1, -1, -1, -1, 34, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 21
-    [38, 38, 37, 38, 38, 38, 38, 38, 38, 38, 36, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38], # 22
-    [-1, -1, -1, -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 23
-    [-1, -1, -1, -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 24
-    [-1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 25
-    [-1, -1, 42, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 26
-    [44, 43, 44, 44, 43, 43, 43, 43, 44, 44, 43, 44, 43, 43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 43], # 27
-    [-1, -1, -1, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 28
-    [-1, 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 29
-    [-1, -1, -1, -1, -1, -1, 47, 48, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 30
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 31
-    [-1, -1, -1, -1, 51, 50, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 32
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 52], # 33
-    [-1, 53, -1, -1, 53, 53, 53, 53, -1, -1, 53, -1, 53, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 53], # 34
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 35
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 36
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 56, 56, -1, -1, -1, -1, -1, -1, -1], # 37
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 57, 57, 57, 57, -1, -1, -1], # 38
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, 58, -1, -1], # 39
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 59, 59, -1, -1, -1, -1, -1, -1, -1, 59, -1], # 40
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 60, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 41
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 28, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 16
+    [-1, 30, -1, -1, -1, -1, 29, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 17
+    [-1, -1, -1, -1, -1, -1, 31, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 18
+    [35, 35, 34, 35, 35, 35, 35, 35, 35, 35, 33, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35], # 19
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 20
+    [-1, -1, -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 21
+    [-1, -1, -1, -1, -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 22
+    [-1, -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 23
+    [-1, -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 24
+    [42, 41, 42, 42, 41, 41, 41, 41, 42, 42, 41, 42, 41, 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 41], # 25
+    [-1, -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 26
+    [-1, 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 27
+    [-1, -1, -1, -1, -1, -1, 45, 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 28
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 29
+    [-1, -1, -1, -1, 49, 48, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 30
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50], # 31
+    [-1, 51, -1, -1, 51, 51, 51, 51, -1, -1, 51, -1, 51, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 51], # 32
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 52, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 33
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 34
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, 54, -1, -1, -1, -1, -1, -1, -1], # 35
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, 55, 55, 55, -1, -1, -1], # 36
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 56, -1, -1], # 37
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 57, 57, -1, -1, -1, -1, -1, -1, -1, 57, -1], # 38
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 39
+    [-1, 59, -1, -1, -1, -1, 59, 59, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 40
+    [-1, -1, -1, -1, -1, -1, -1, -1, 60, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 41
     [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 42
-    [-1, 62, -1, -1, -1, -1, 62, 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 43
-    [-1, -1, -1, -1, -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 44
+    [-1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 43
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 44
     [-1, -1, -1, -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 45
-    [-1, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 46
-    [-1, -1, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 47
-    [-1, -1, -1, -1, -1, -1, -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 48
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 46
+    [-1, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 47
+    [-1, -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 48
+    [-1, -1, -1, -1, -1, -1, -1, -1, 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 49
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 50
   ].freeze
 
   CONFIG.actions = [
@@ -200,25 +203,25 @@ class Parser < LL::Driver
     [:_rule_25, 1], # 25
     [:_rule_26, 1], # 26
     [:_rule_27, 3], # 27
-    [:_rule_28, 1], # 28
-    [:_rule_29, 2], # 29
-    [:_rule_30, 2], # 30
+    [:_rule_28, 2], # 28
+    [:_rule_29, 1], # 29
+    [:_rule_30, 1], # 30
     [:_rule_31, 2], # 31
-    [:_rule_32, 1], # 32
-    [:_rule_33, 1], # 33
-    [:_rule_34, 2], # 34
-    [:_rule_35, 1], # 35
-    [:_rule_36, 3], # 36
+    [:_rule_32, 3], # 32
+    [:_rule_33, 3], # 33
+    [:_rule_34, 4], # 34
+    [:_rule_35, 2], # 35
+    [:_rule_36, 2], # 36
     [:_rule_37, 3], # 37
     [:_rule_38, 1], # 38
-    [:_rule_39, 3], # 39
-    [:_rule_40, 1], # 40
+    [:_rule_39, 2], # 39
+    [:_rule_40, 2], # 40
     [:_rule_41, 2], # 41
-    [:_rule_42, 2], # 42
+    [:_rule_42, 0], # 42
     [:_rule_43, 2], # 43
-    [:_rule_44, 0], # 44
-    [:_rule_45, 2], # 45
-    [:_rule_46, 3], # 46
+    [:_rule_44, 4], # 44
+    [:_rule_45, 1], # 45
+    [:_rule_46, 1], # 46
     [:_rule_47, 1], # 47
     [:_rule_48, 1], # 48
     [:_rule_49, 1], # 49
@@ -240,44 +243,36 @@ class Parser < LL::Driver
     [:_rule_65, 1], # 65
     [:_rule_66, 1], # 66
     [:_rule_67, 1], # 67
+    [:_rule_68, 1], # 68
+    [:_rule_69, 1], # 69
   ].freeze
 
-  ##
   # @return [Oga::LRU]
-  #
   CACHE = LRU.new
 
-  ##
   # @param [String] data
   # @return [AST::Node]
-  #
   def self.parse_with_cache(data)
-    return CACHE.get_or_set(data) { new(data).parse }
+    CACHE.get_or_set(data) { new(data).parse }
   end
 
-  ##
   # @param [String] data The input to parse.
-  #
   def initialize(data)
     @lexer = Lexer.new(data)
   end
 
-  ##
   # Creates a new XPath node.
   #
   # @param [Symbol] type
   # @param [Array] children
   # @return [AST::Node]
-  #
   def s(type, *children)
-    return AST::Node.new(type, children)
+    AST::Node.new(type, children)
   end
 
-  ##
   # Yields the next token from the lexer.
   #
   # @yieldparam [Array]
-  #
   def each_token
     @lexer.advance do |type, value, line|
       @line = line if line
@@ -288,9 +283,7 @@ class Parser < LL::Driver
     yield [-1, -1]
   end
 
-  ##
   # @param [Array] val
-  #
   def combine_operators(val)
     ret = val[0]
 
@@ -298,12 +291,10 @@ class Parser < LL::Driver
       ret = s(expr[0], ret, expr[1])
     end
 
-    return ret
+    ret
   end
 
-  ##
   # @param [Array] val
-  #
   def combine_optional_operator(val)
     ret = val[0]
 
@@ -427,34 +418,29 @@ class Parser < LL::Driver
   end
 
   def _rule_28(val)
-     val[0].length > 1 ? s(:path, *val[0]) : val[0][0] 
+    
+      if val[1]
+        s(:absolute_path, val[1])
+      else
+        s(:absolute_path)
+      end
+    
   end
 
   def _rule_29(val)
-     [val[0], *val[1]] 
-  end
-
-  def _rule_30(val)
-     val[1] 
-  end
-
-  def _rule_31(val)
-     s(:absolute_path, *val[1]) 
-  end
-
-  def _rule_32(val)
     val[0]
   end
 
-  def _rule_33(val)
+  def _rule_30(val)
     val[0]
   end
 
-  def _rule_34(val)
+  def _rule_31(val)
     
       type = val[1][0]
       args = val[1][1]
       pred = val[1][2]
+      more = val[1][3]
 
       if type.equal?(:test)
         # Whenever a bare test is used (e.g. just "A") this actually means
@@ -472,92 +458,127 @@ class Parser < LL::Driver
         node = s(:predicate, node, pred)
       end
 
+      if more
+        node = node.updated(nil, node.children + [more])
+      end
+
       node
     
   end
 
-  def _rule_35(val)
-     s(:axis, 'child', val[0]) 
+  def _rule_32(val)
+    
+      pred = val[1]
+      more = val[2]
+      node = s(:axis, 'child', val[0])
+
+      if pred
+        node = s(:predicate, node, pred)
+      end
+
+      if more
+        node = node.updated(nil, node.children + [more])
+      end
+
+      node
+    
   end
 
-  def _rule_36(val)
+  def _rule_33(val)
      [:call, val[1]] 
   end
 
-  def _rule_37(val)
-     [:test, val[1], val[2]] 
+  def _rule_34(val)
+     [:test, val[1], val[2], val[3]] 
   end
 
-  def _rule_38(val)
-     [:test, nil, val[0]] 
+  def _rule_35(val)
+     [:test, nil, val[0], val[1]] 
   end
 
-  def _rule_39(val)
+  def _rule_36(val)
      val[1] 
   end
 
-  def _rule_40(val)
+  def _rule_37(val)
+     val[1] 
+  end
+
+  def _rule_38(val)
      s(:type_test, val[0]) 
   end
 
-  def _rule_41(val)
+  def _rule_39(val)
     
       val[1] ? s(:test, val[0], val[1]) : s(:test, nil, val[0])
     
   end
 
-  def _rule_42(val)
+  def _rule_40(val)
      val[1] 
   end
 
-  def _rule_43(val)
+  def _rule_41(val)
      [val[0], *val[1]] 
   end
 
-  def _rule_44(val)
+  def _rule_42(val)
     val
   end
 
-  def _rule_45(val)
+  def _rule_43(val)
      val[1] 
   end
 
-  def _rule_46(val)
+  def _rule_44(val)
     
-      ret = s(:axis, val[0], val[1])
+      ret  = s(:axis, val[0], val[1])
+      more = val[3]
 
       if val[2]
         ret = s(:predicate, ret, val[2])
       end
 
+      if more
+        ret = ret.updated(nil, ret.children + [more])
+      end
+
       ret
     
   end
 
-  def _rule_47(val)
+  def _rule_45(val)
     val[0]
   end
 
-  def _rule_48(val)
+  def _rule_46(val)
     val[0]
   end
 
-  def _rule_49(val)
+  def _rule_47(val)
      s(:string, val[0]) 
   end
 
-  def _rule_50(val)
+  def _rule_48(val)
      s(:int, val[0]) 
   end
 
-  def _rule_51(val)
+  def _rule_49(val)
      s(:float, val[0]) 
   end
 
-  def _rule_52(val)
+  def _rule_50(val)
      s(:var, val[0]) 
   end
 
+  def _rule_51(val)
+    val[0]
+  end
+
+  def _rule_52(val)
+    val[0]
+  end
+
   def _rule_53(val)
     val[0]
   end
@@ -617,6 +638,14 @@ class Parser < LL::Driver
   def _rule_67(val)
     val[0]
   end
+
+  def _rule_68(val)
+    val[0]
+  end
+
+  def _rule_69(val)
+    val[0]
+  end
 end
 end
 end