oga 0.2.3-java → 0.3.0-java

data/lib/oga/xml/pull_parser.rb

@@ -84,9 +84,7 @@ module Oga
       def parse(&block)
         @block = block
 
-        yyparse(self, :yield_next_token)
-
-        reset
+        super
 
         return
       end

data/lib/oga/xml/querying.rb

@@ -35,7 +35,7 @@ module Oga
       # @see [Oga::XPath::Evaluator#initialize]
       #
       def css(expression)
-        ast = CSS::Parser.new(expression).parse
+        ast = CSS::Parser.parse_with_cache(expression)
 
         return XPath::Evaluator.new(self).evaluate_ast(ast)
       end

data/lib/oga/xml/sax_parser.rb

@@ -17,6 +17,8 @@ module Oga
     # * `on_text`
     # * `on_element`
     # * `on_element_children`
+    # * `on_attribute`
+    # * `on_attributes`
     # * `after_element`
     #
     # For example:
@@ -57,6 +59,14 @@ module Oga
     #       end
     #     end
     #
+    # ## Attributes
+    #
+    # Attributes returned by `on_attribute` are passed as an Hash as the 3rd
+    # argument of the `on_element` callback. The keys of this Hash are the
+    # attribute names (optionally prefixed by their namespace) and their values.
+    # You can overwrite `on_attribute` to control individual attributes and
+    # `on_attributes` to control the final set.
+    #
     class SaxParser < Parser
       ##
       # @param [Object] handler The SAX handler to delegate callbacks to.
@@ -86,7 +96,7 @@ module Oga
       # @see [Oga::XML::Parser#on_element]
       # @return [Array]
       #
-      def on_element(namespace, name, attrs = {})
+      def on_element(namespace, name, attrs = [])
         run_callback(:on_element, namespace, name, attrs)
 
         return namespace, name
@@ -101,6 +111,45 @@ module Oga
       #
       def after_element(namespace_with_name)
         run_callback(:after_element, *namespace_with_name)
+
+        return
+      end
+
+      ##
+      # Manually overwrite this method since for this one we _do_ want the
+      # return value so it can be passed to `on_element`.
+      #
+      # @see [Oga::XML::Parser#on_attribute]
+      #
+      def on_attribute(name, ns = nil, value = nil)
+        if @handler.respond_to?(:on_attribute)
+          return run_callback(:on_attribute, name, ns, value)
+        end
+
+        key = ns ? "#{ns}:#{name}" : name
+
+        return {key => value}
+      end
+
+      ##
+      # Merges the attributes together into a Hash.
+      #
+      # @param [Array] attrs
+      # @return [Hash]
+      #
+      def on_attributes(attrs)
+        if @handler.respond_to?(:on_attributes)
+          return run_callback(:on_attributes, attrs)
+        end
+
+        merged = {}
+
+        attrs.each do |pair|
+          # Hash#merge requires an extra allocation, this doesn't.
+          pair.each { |key, value| merged[key] = value }
+        end
+
+        return merged
       end
 
       private

data/lib/oga/xml/text.rb

@@ -5,19 +5,48 @@ module Oga
     # have any children, attributes and the likes; just text.
     #
     class Text < CharacterNode
+      def initialize(*args)
+        super
+
+        @decoded = false
+      end
+
+      ##
+      # @param [String] value
+      #
+      def text=(value)
+        @decoded = false
+        @text    = value
+      end
+
+      ##
+      # Returns the text as a String. Upon the first call any XML/HTML entities
+      # are decoded.
+      #
+      # @return [String]
+      #
+      def text
+        unless @decoded
+          decoder  = html? ? HTML::Entities : Entities
+          @text    = decoder.decode(@text)
+          @decoded = true
+        end
+
+        return @text
+      end
+
       ##
       # @see [Oga::XML::CharacterNode#to_xml]
       #
       def to_xml
         node = parent
-        root = root_node
 
-        if root.is_a?(Document) and node.is_a?(Element) and root.html? \
+        if node.is_a?(Element) and html? \
         and Lexer::LITERAL_HTML_ELEMENTS.include?(node.name)
           return super
-        else
-          return Entities.encode(super)
         end
+
+        return Entities.encode(super)
       end
     end # Text
   end # XML

data/lib/oga/xpath/evaluator.rb

@@ -82,7 +82,7 @@ module Oga
       # @return [Mixed]
       #
       def evaluate(string)
-        ast = Parser.new(string).parse
+        ast = Parser.parse_with_cache(string)
 
         return evaluate_ast(ast)
       end
@@ -1657,6 +1657,11 @@ module Oga
           ns_matches = true
         end
 
+        if !ns and !ns_matches
+          ns_matches = xml_node.respond_to?(:default_namespace?) &&
+            xml_node.default_namespace?
+        end
+
         return name_matches && ns_matches
       end
 

data/lib/oga/xpath/lexer.rb

@@ -1463,9 +1463,8 @@ ts = p
 	_keys = cs << 1
 	_inds = _xpath_lexer_index_offsets[cs]
 	_slen = _xpath_lexer_key_spans[cs]
-	_wide = ( _wide)
-	_wide = (data.getbyte(p) || 0)
-  _trans = if (   _slen > 0 && 
+	_wide = ( (data.getbyte(p) || 0))
+	_trans = if (   _slen > 0 && 
 			_xpath_lexer_trans_keys[_keys] <= _wide && 
 			_wide <= _xpath_lexer_trans_keys[_keys + 1] 
 		    ) then

data/lib/oga/xpath/parser.rb

@@ -1,13 +1,257 @@
+# This file is automatically generated by ruby-ll. Manually changing this file
+# is not recommended as any changes will be lost the next time this parser is
+# re-generated.
+require 'll/setup'
+
+module Oga
+module XPath
+##
+# AST parser for XPath expressions. The AST is built using `AST::Node`
+# instances.
 #
-# DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
-# from Racc grammer file "".
+# Unlike {Oga::XML::Parser} this parser only takes String instances as input.
 #
+class Parser < LL::Driver
+  CONFIG = LL::DriverConfig.new
+
+  CONFIG.terminals = [
+    :$EOF, # 0
+    :T_AXIS, # 1
+    :T_COLON, # 2
+    :T_COMMA, # 3
+    :T_FLOAT, # 4
+    :T_INT, # 5
+    :T_IDENT, # 6
+    :T_TYPE_TEST, # 7
+    :T_LBRACK, # 8
+    :T_RBRACK, # 9
+    :T_LPAREN, # 10
+    :T_RPAREN, # 11
+    :T_SLASH, # 12
+    :T_STRING, # 13
+    :T_PIPE, # 14
+    :T_AND, # 15
+    :T_OR, # 16
+    :T_ADD, # 17
+    :T_DIV, # 18
+    :T_MOD, # 19
+    :T_EQ, # 20
+    :T_NEQ, # 21
+    :T_LT, # 22
+    :T_GT, # 23
+    :T_LTE, # 24
+    :T_GTE, # 25
+    :T_SUB, # 26
+    :T_MUL, # 27
+    :T_VAR, # 28
+  ].freeze
+
+  CONFIG.rules = [
+    [3, 0, 8, 34], # 0
+    [3, 1, 4, 35, 6, 0, 0, 3], # 1
+    [3, 2, 0, 3, 1, 16], # 2
+    [3, 3, 4, 36, 6, 0, 0, 5], # 3
+    [3, 4, 0, 5, 1, 15], # 4
+    [3, 5, 4, 37, 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, 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, 14, 0, 11, 1, 17], # 14
+    [3, 15, 0, 11, 1, 26], # 15
+    [3, 16, 8, 40, 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, 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, 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
+  ].freeze
+
+  CONFIG.table = [
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], # 0
+    [-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, 1], # 1
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 2
+    [-1, 3, -1, -1, 3, 3, 3, 3, -1, -1, 3, -1, 3, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3], # 3
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], # 4
+    [-1, 5, -1, -1, 5, 5, 5, 5, -1, -1, 5, -1, 5, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5], # 5
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, 7, -1, -1, -1, -1, -1, -1, -1], # 6
+    [-1, 8, -1, -1, 8, 8, 8, 8, -1, -1, 8, -1, 8, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8], # 7
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, 10, 11, 12, -1, -1, -1], # 8
+    [-1, 13, -1, -1, 13, 13, 13, 13, -1, -1, 13, -1, 13, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 13], # 9
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, 15, -1, -1], # 10
+    [-1, 16, -1, -1, 16, 16, 16, 16, -1, -1, 16, -1, 16, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 16], # 11
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 17, 18, -1, -1, -1, -1, -1, -1, -1, 19, -1], # 12
+    [-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, 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, 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
+  ].freeze
+
+  CONFIG.actions = [
+    [:_rule_0, 1], # 0
+    [:_rule_1, 2], # 1
+    [:_rule_2, 2], # 2
+    [:_rule_3, 2], # 3
+    [:_rule_4, 2], # 4
+    [:_rule_5, 2], # 5
+    [:_rule_6, 2], # 6
+    [:_rule_7, 2], # 7
+    [:_rule_8, 2], # 8
+    [:_rule_9, 2], # 9
+    [:_rule_10, 2], # 10
+    [:_rule_11, 2], # 11
+    [:_rule_12, 2], # 12
+    [:_rule_13, 2], # 13
+    [:_rule_14, 2], # 14
+    [:_rule_15, 2], # 15
+    [:_rule_16, 2], # 16
+    [:_rule_17, 2], # 17
+    [:_rule_18, 2], # 18
+    [:_rule_19, 2], # 19
+    [:_rule_20, 2], # 20
+    [:_rule_21, 2], # 21
+    [:_rule_22, 1], # 22
+    [:_rule_23, 1], # 23
+    [:_rule_24, 1], # 24
+    [:_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_31, 2], # 31
+    [:_rule_32, 1], # 32
+    [:_rule_33, 1], # 33
+    [:_rule_34, 2], # 34
+    [:_rule_35, 1], # 35
+    [:_rule_36, 3], # 36
+    [:_rule_37, 3], # 37
+    [:_rule_38, 1], # 38
+    [:_rule_39, 3], # 39
+    [:_rule_40, 1], # 40
+    [:_rule_41, 2], # 41
+    [:_rule_42, 2], # 42
+    [:_rule_43, 2], # 43
+    [:_rule_44, 0], # 44
+    [:_rule_45, 2], # 45
+    [:_rule_46, 3], # 46
+    [:_rule_47, 1], # 47
+    [:_rule_48, 1], # 48
+    [:_rule_49, 1], # 49
+    [:_rule_50, 1], # 50
+    [:_rule_51, 1], # 51
+    [:_rule_52, 1], # 52
+    [:_rule_53, 1], # 53
+    [:_rule_54, 1], # 54
+    [:_rule_55, 1], # 55
+    [:_rule_56, 1], # 56
+    [:_rule_57, 1], # 57
+    [:_rule_58, 1], # 58
+    [:_rule_59, 1], # 59
+    [:_rule_60, 1], # 60
+    [:_rule_61, 1], # 61
+    [:_rule_62, 1], # 62
+    [:_rule_63, 1], # 63
+    [:_rule_64, 1], # 64
+    [:_rule_65, 1], # 65
+    [:_rule_66, 1], # 66
+    [:_rule_67, 1], # 67
+  ].freeze
 
-require 'racc/parser.rb'
-module Oga
-  module XPath
-    class Parser < Racc::Parser
+  ##
+  # @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 }
+  end
 
   ##
   # @param [String] data The input to parse.
@@ -32,543 +276,345 @@ module Oga
   #
   # @yieldparam [Array]
   #
-  def yield_next_token
-    @lexer.advance do |*args|
-      yield args
+  def each_token
+    @lexer.advance do |type, value, line|
+      @line = line if line
+
+      yield [type, value]
     end
 
-    yield [false, false]
+    yield [-1, -1]
   end
 
   ##
-  # Parses the input and returns the corresponding AST.
-  #
-  # @example
-  #  parser = Oga::XPath::Parser.new('//foo')
-  #  ast    = parser.parse
+  # @param [Array] val
   #
-  # @return [AST::Node]
+  def combine_operators(val)
+    ret = val[0]
+
+    val[1].each do |expr|
+      ret = s(expr[0], ret, expr[1])
+    end
+
+    return ret
+  end
+
+  ##
+  # @param [Array] val
   #
-  def parse
-    ast = yyparse(self, :yield_next_token)
-
-    return ast
-  end
-# vim: set ft=racc:
-##### State transition tables begin ###
-
-racc_action_table = [
-    23,    22,    21,    26,    25,    22,    21,    53,    48,     4,
-    79,    17,    24,    23,    77,    54,    26,    25,    22,    21,
-    73,    58,     4,    48,    17,    24,    23,    27,    23,    26,
-    25,    22,    21,    22,    21,     4,    46,    17,    24,    23,
-    27,    23,    26,    25,    22,    21,    22,    21,     4,    46,
-    17,    24,    23,    27,   -18,    26,    25,    22,    21,    48,
-   -17,     4,    83,    17,    24,    23,    27,    28,    26,    25,
-    22,    21,   nil,   nil,     4,   nil,    17,    24,    23,    27,
-   nil,    26,    25,    22,    21,   nil,   nil,     4,   nil,    17,
-    24,    23,    27,   nil,    26,    25,    22,    21,   nil,   nil,
-     4,   nil,    17,    24,    23,    27,   nil,    26,    25,    22,
-    21,   nil,   nil,     4,   nil,    17,    24,    23,    27,   nil,
-    26,    25,    22,    21,   nil,   nil,     4,   nil,    17,    24,
-    23,    27,   nil,    26,    25,    22,    21,   nil,   nil,     4,
-   nil,    17,    24,    23,    27,   nil,    26,    25,    22,    21,
-   nil,   nil,     4,   nil,    17,    24,    23,    27,   nil,    26,
-    25,    22,    21,   nil,   nil,     4,   nil,    17,    24,    23,
-    27,   nil,    26,    25,    22,    21,   nil,   nil,     4,   nil,
-    17,    24,    23,    27,   nil,    26,    25,    22,    21,   nil,
-   nil,     4,   nil,    17,    24,    23,    27,   nil,    26,    25,
-    22,    21,   nil,   nil,     4,   nil,    17,    24,    23,    27,
-   nil,    26,    25,    22,    21,   nil,   nil,     4,   nil,    17,
-    24,    23,    27,   nil,    26,    25,    22,    21,   nil,   nil,
-     4,   nil,    17,    24,    23,    27,   nil,    26,    25,    22,
-    21,   nil,   nil,     4,   nil,    17,    24,   nil,    27,   nil,
-   nil,    82,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    27,    29,    30,    31,    32,    33,    34,    35,    36,
-    37,    38,    39,    40,    42,    41,    81,   nil,   nil,   nil,
-   nil,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-    38,    39,    40,    42,    41,    29,    30,    31,    32,    33,
-    34,    35,    36,    37,    38,    39,    40,    42,    41,    29,
-   nil,   nil,    32,    33,    34,    35,    36,    37,    38,    39,
-    40,    42,    41,    29,    30,   nil,    32,    33,    34,    35,
-    36,    37,    38,    39,    40,    42,    41,    29,   nil,   nil,
-    32,    33,    34,   nil,   nil,    37,    38,    39,    40,    42,
-    41,    29,   nil,   nil,    32,    33,    34,   nil,   nil,    37,
-    38,    39,    40,    42,    41,    29,   nil,   nil,    32,    33,
-    34,    29,   nil,   nil,    32,    33,    34,    42,    41,   nil,
-   nil,   nil,    29,    42,    41,    32,    33,    34,    29,   nil,
-   nil,    32,    33,    34,    42,    41,   nil,   nil,   nil,   nil,
-    42,    41,    29,    30,    31,    32,    33,    34,    35,    36,
-    37,    38,    39,    40,    42,    41 ]
-
-racc_action_check = [
-    54,    23,    23,    54,    54,    54,    54,    22,    51,    54,
-    54,    54,    54,    46,    53,    22,    46,    46,    46,    46,
-    43,    28,    46,    15,    46,    46,    36,    54,    48,    36,
-    36,    36,    36,    48,    48,    36,    14,    36,    36,     4,
-    46,    17,     4,     4,     4,     4,    17,    17,     4,    13,
-     4,     4,    42,    36,     9,    42,    42,    42,    42,    75,
-     5,    42,    80,    42,    42,    41,     4,     1,    41,    41,
-    41,    41,   nil,   nil,    41,   nil,    41,    41,    40,    42,
-   nil,    40,    40,    40,    40,   nil,   nil,    40,   nil,    40,
-    40,    39,    41,   nil,    39,    39,    39,    39,   nil,   nil,
-    39,   nil,    39,    39,    38,    40,   nil,    38,    38,    38,
-    38,   nil,   nil,    38,   nil,    38,    38,    37,    39,   nil,
-    37,    37,    37,    37,   nil,   nil,    37,   nil,    37,    37,
-    35,    38,   nil,    35,    35,    35,    35,   nil,   nil,    35,
-   nil,    35,    35,    82,    37,   nil,    82,    82,    82,    82,
-   nil,   nil,    82,   nil,    82,    82,     0,    35,   nil,     0,
-     0,     0,     0,   nil,   nil,     0,   nil,     0,     0,    29,
-    82,   nil,    29,    29,    29,    29,   nil,   nil,    29,   nil,
-    29,    29,    30,     0,   nil,    30,    30,    30,    30,   nil,
-   nil,    30,   nil,    30,    30,    31,    29,   nil,    31,    31,
-    31,    31,   nil,   nil,    31,   nil,    31,    31,    32,    30,
-   nil,    32,    32,    32,    32,   nil,   nil,    32,   nil,    32,
-    32,    33,    31,   nil,    33,    33,    33,    33,   nil,   nil,
-    33,   nil,    33,    33,    34,    32,   nil,    34,    34,    34,
-    34,   nil,   nil,    34,   nil,    34,    34,   nil,    33,   nil,
-   nil,    78,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    34,    78,    78,    78,    78,    78,    78,    78,    78,
-    78,    78,    78,    78,    78,    78,    74,   nil,   nil,   nil,
-   nil,    74,    74,    74,    74,    74,    74,    74,    74,    74,
-    74,    74,    74,    74,    74,    44,    44,    44,    44,    44,
-    44,    44,    44,    44,    44,    44,    44,    44,    44,    60,
-   nil,   nil,    60,    60,    60,    60,    60,    60,    60,    60,
-    60,    60,    60,    61,    61,   nil,    61,    61,    61,    61,
-    61,    61,    61,    61,    61,    61,    61,    65,   nil,   nil,
-    65,    65,    65,   nil,   nil,    65,    65,    65,    65,    65,
-    65,    66,   nil,   nil,    66,    66,    66,   nil,   nil,    66,
-    66,    66,    66,    66,    66,    67,   nil,   nil,    67,    67,
-    67,    68,   nil,   nil,    68,    68,    68,    67,    67,   nil,
-   nil,   nil,    69,    68,    68,    69,    69,    69,    70,   nil,
-   nil,    70,    70,    70,    69,    69,   nil,   nil,   nil,   nil,
-    70,    70,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2 ]
-
-racc_action_pointer = [
-   154,    67,   387,   nil,    37,    47,   nil,   nil,   nil,    41,
-   nil,   nil,   nil,    40,    27,    10,   nil,    39,   nil,   nil,
-   nil,   nil,     4,    -6,   nil,   nil,   nil,   nil,    21,   167,
-   180,   193,   206,   219,   232,   128,    24,   115,   102,    89,
-    76,    63,    50,     8,   280,   nil,    11,   nil,    26,   nil,
-   nil,    -5,   nil,     7,    -2,   nil,   nil,   nil,   nil,   nil,
-   294,   308,   nil,   nil,   nil,   322,   336,   350,   356,   367,
-   373,   nil,   nil,   nil,   266,    46,   nil,   nil,   247,   nil,
-    50,   nil,   141,   nil,   nil ]
-
-racc_action_default = [
-    -2,   -58,    -1,    -3,   -58,    -5,    -6,    -7,    -8,    -9,
-   -10,   -11,   -12,   -13,   -15,   -58,   -21,   -24,   -25,   -26,
-   -27,   -28,   -29,   -47,   -54,   -55,   -56,   -57,   -58,   -58,
-   -58,   -58,   -58,   -58,   -58,   -58,   -58,   -58,   -58,   -58,
-   -58,   -58,   -58,    -3,   -58,   -14,   -58,   -16,   -58,   -17,
-   -18,   -23,   -22,   -58,   -58,   -46,   -48,   -49,    85,   -32,
-   -33,   -34,   -35,   -36,   -37,   -38,   -39,   -40,   -41,   -42,
-   -43,   -44,   -45,    -4,   -58,   -19,   -20,   -30,   -52,   -50,
-   -58,   -31,   -58,   -51,   -53 ]
-
-racc_goto_table = [
-     2,    45,    47,     1,    44,    43,    56,    55,   nil,   nil,
-   nil,   nil,    49,    50,    51,   nil,    52,   nil,   nil,    57,
-    80,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    59,
-    60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-    70,    71,    72,    49,    50,    75,    74,    76,    84 ]
-
-racc_goto_check = [
-     2,    13,    13,     1,     2,     3,    17,    20,   nil,   nil,
-   nil,   nil,     4,     8,    15,   nil,    16,   nil,   nil,     8,
-    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     4,     8,    15,     2,    16,    21 ]
-
-racc_goto_pointer = [
-   nil,     3,     0,     1,    -5,   nil,   nil,   nil,    -4,   nil,
-   nil,   nil,   nil,   -12,   nil,    -3,    -1,   -17,   nil,   nil,
-   -16,   -34 ]
-
-racc_goto_default = [
-   nil,   nil,    78,     3,     5,     6,     7,     8,     9,    10,
-    11,    12,    13,   nil,    14,    15,    16,    18,    19,    20,
-   nil,   nil ]
-
-racc_reduce_table = [
-  0, 0, :racc_error,
-  1, 31, :_reduce_1,
-  0, 31, :_reduce_2,
-  1, 32, :_reduce_none,
-  3, 32, :_reduce_4,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 34, :_reduce_none,
-  2, 34, :_reduce_14,
-  1, 34, :_reduce_none,
-  2, 34, :_reduce_16,
-  1, 45, :_reduce_none,
-  1, 45, :_reduce_none,
-  3, 46, :_reduce_19,
-  3, 46, :_reduce_20,
-  1, 39, :_reduce_21,
-  2, 40, :_reduce_22,
-  2, 40, :_reduce_23,
-  1, 40, :_reduce_24,
-  1, 42, :_reduce_25,
-  1, 47, :_reduce_26,
-  1, 47, :_reduce_27,
-  1, 49, :_reduce_28,
-  1, 48, :_reduce_29,
-  3, 48, :_reduce_30,
-  3, 43, :_reduce_31,
-  3, 35, :_reduce_32,
-  3, 35, :_reduce_33,
-  3, 35, :_reduce_34,
-  3, 35, :_reduce_35,
-  3, 35, :_reduce_36,
-  3, 35, :_reduce_37,
-  3, 35, :_reduce_38,
-  3, 35, :_reduce_39,
-  3, 35, :_reduce_40,
-  3, 35, :_reduce_41,
-  3, 35, :_reduce_42,
-  3, 35, :_reduce_43,
-  3, 35, :_reduce_44,
-  3, 35, :_reduce_45,
-  2, 44, :_reduce_46,
-  1, 44, :_reduce_47,
-  1, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  3, 38, :_reduce_50,
-  4, 38, :_reduce_51,
-  1, 51, :_reduce_52,
-  3, 51, :_reduce_53,
-  1, 36, :_reduce_54,
-  1, 37, :_reduce_55,
-  1, 37, :_reduce_56,
-  1, 41, :_reduce_57 ]
-
-racc_reduce_n = 58
-
-racc_shift_n = 85
-
-racc_token_table = {
-  false => 0,
-  :error => 1,
-  :T_AXIS => 2,
-  :T_COLON => 3,
-  :T_COMMA => 4,
-  :T_FLOAT => 5,
-  :T_INT => 6,
-  :T_IDENT => 7,
-  :T_TYPE_TEST => 8,
-  :T_LBRACK => 9,
-  :T_RBRACK => 10,
-  :T_LPAREN => 11,
-  :T_RPAREN => 12,
-  :T_SLASH => 13,
-  :T_STRING => 14,
-  :T_PIPE => 15,
-  :T_AND => 16,
-  :T_OR => 17,
-  :T_ADD => 18,
-  :T_DIV => 19,
-  :T_MOD => 20,
-  :T_EQ => 21,
-  :T_NEQ => 22,
-  :T_LT => 23,
-  :T_GT => 24,
-  :T_LTE => 25,
-  :T_GTE => 26,
-  :T_SUB => 27,
-  :T_MUL => 28,
-  :T_VAR => 29 }
-
-racc_nt_base = 30
-
-racc_use_result_var = false
-
-Racc_arg = [
-  racc_action_table,
-  racc_action_check,
-  racc_action_default,
-  racc_action_pointer,
-  racc_goto_table,
-  racc_goto_check,
-  racc_goto_default,
-  racc_goto_pointer,
-  racc_nt_base,
-  racc_reduce_table,
-  racc_token_table,
-  racc_shift_n,
-  racc_reduce_n,
-  racc_use_result_var ]
-
-Racc_token_to_s_table = [
-  "$end",
-  "error",
-  "T_AXIS",
-  "T_COLON",
-  "T_COMMA",
-  "T_FLOAT",
-  "T_INT",
-  "T_IDENT",
-  "T_TYPE_TEST",
-  "T_LBRACK",
-  "T_RBRACK",
-  "T_LPAREN",
-  "T_RPAREN",
-  "T_SLASH",
-  "T_STRING",
-  "T_PIPE",
-  "T_AND",
-  "T_OR",
-  "T_ADD",
-  "T_DIV",
-  "T_MOD",
-  "T_EQ",
-  "T_NEQ",
-  "T_LT",
-  "T_GT",
-  "T_LTE",
-  "T_GTE",
-  "T_SUB",
-  "T_MUL",
-  "T_VAR",
-  "$start",
-  "xpath",
-  "expression",
-  "expression_members",
-  "expression_with_predicate",
-  "operator",
-  "string",
-  "number",
-  "call",
-  "path",
-  "absolute_path",
-  "variable",
-  "node_test_as_axis",
-  "predicate",
-  "axis",
-  "path_member",
-  "path_members",
-  "node_test",
-  "node_name",
-  "type_test",
-  "axis_value",
-  "call_args" ]
-
-Racc_debug_parser = false
-
-##### State transition tables end #####
-
-# reduce 0 omitted
-
-def _reduce_1(val, _values)
- val[0] 
-end
+  def combine_optional_operator(val)
+    ret = val[0]
 
-def _reduce_2(val, _values)
- nil 
-end
+    if val[1]
+      ret = s(val[1][0], ret, val[1][1])
+    end
 
-# reduce 3 omitted
+    ret
+  end
 
-def _reduce_4(val, _values)
- val[1] 
-end
+  def _rule_0(val)
+    val[0]
+  end
 
-# reduce 5 omitted
+  def _rule_1(val)
+     combine_operators(val) 
+  end
 
-# reduce 6 omitted
+  def _rule_2(val)
+     [:or, val[1]] 
+  end
 
-# reduce 7 omitted
+  def _rule_3(val)
+     combine_operators(val) 
+  end
 
-# reduce 8 omitted
+  def _rule_4(val)
+     [:and, val[1]] 
+  end
 
-# reduce 9 omitted
+  def _rule_5(val)
+     combine_operators(val) 
+  end
 
-# reduce 10 omitted
+  def _rule_6(val)
+     [:eq, val[1]] 
+  end
 
-# reduce 11 omitted
+  def _rule_7(val)
+     [:neq, val[1]] 
+  end
 
-# reduce 12 omitted
+  def _rule_8(val)
+     combine_operators(val) 
+  end
 
-# reduce 13 omitted
+  def _rule_9(val)
+     [:lt, val[1]] 
+  end
 
-def _reduce_14(val, _values)
- s(:predicate, val[0], val[1]) 
-end
+  def _rule_10(val)
+     [:gt, val[1]] 
+  end
 
-# reduce 15 omitted
+  def _rule_11(val)
+     [:lte, val[1]] 
+  end
 
-def _reduce_16(val, _values)
- s(:predicate, val[0], val[1]) 
-end
+  def _rule_12(val)
+     [:gte, val[1]] 
+  end
 
-# reduce 17 omitted
+  def _rule_13(val)
+     combine_operators(val) 
+  end
 
-# reduce 18 omitted
+  def _rule_14(val)
+     [:add, val[1]] 
+  end
 
-def _reduce_19(val, _values)
- [val[0], val[2]] 
-end
+  def _rule_15(val)
+     [:sub, val[1]] 
+  end
 
-def _reduce_20(val, _values)
- [val[0], *val[2]] 
-end
+  def _rule_16(val)
+     combine_optional_operator(val) 
+  end
 
-def _reduce_21(val, _values)
- s(:path, *val[0]) 
-end
+  def _rule_17(val)
+     [:div, val[1]] 
+  end
 
-def _reduce_22(val, _values)
- s(:absolute_path, *val[1]) 
-end
+  def _rule_18(val)
+     [:mod, val[1]] 
+  end
 
-def _reduce_23(val, _values)
- s(:absolute_path, val[1]) 
-end
+  def _rule_19(val)
+     [:mul, val[1]] 
+  end
 
-def _reduce_24(val, _values)
- s(:absolute_path) 
-end
+  def _rule_20(val)
+     combine_operators(val) 
+  end
 
-def _reduce_25(val, _values)
- s(:axis, 'child', val[0]) 
-end
+  def _rule_21(val)
+     [:pipe, val[1]] 
+  end
 
-def _reduce_26(val, _values)
- s(:test, *val[0]) 
-end
+  def _rule_22(val)
+    val[0]
+  end
 
-def _reduce_27(val, _values)
- val[0] 
-end
+  def _rule_23(val)
+    val[0]
+  end
 
-def _reduce_28(val, _values)
- s(:type_test, val[0]) 
-end
+  def _rule_24(val)
+    val[0]
+  end
 
-def _reduce_29(val, _values)
- [nil, val[0]] 
-end
+  def _rule_25(val)
+    val[0]
+  end
 
-def _reduce_30(val, _values)
- [val[0], val[2]] 
-end
+  def _rule_26(val)
+    val[0]
+  end
 
-def _reduce_31(val, _values)
- val[1] 
-end
+  def _rule_27(val)
+     val[1] 
+  end
 
-def _reduce_32(val, _values)
- s(:pipe, val[0], val[2]) 
-end
+  def _rule_28(val)
+     val[0].length > 1 ? s(:path, *val[0]) : val[0][0] 
+  end
 
-def _reduce_33(val, _values)
- s(:and, val[0], val[2]) 
-end
+  def _rule_29(val)
+     [val[0], *val[1]] 
+  end
 
-def _reduce_34(val, _values)
- s(:or, val[0], val[2]) 
-end
+  def _rule_30(val)
+     val[1] 
+  end
 
-def _reduce_35(val, _values)
- s(:add, val[0], val[2]) 
-end
+  def _rule_31(val)
+     s(:absolute_path, *val[1]) 
+  end
 
-def _reduce_36(val, _values)
- s(:div, val[0], val[2]) 
-end
+  def _rule_32(val)
+    val[0]
+  end
 
-def _reduce_37(val, _values)
- s(:mod, val[0], val[2]) 
-end
+  def _rule_33(val)
+    val[0]
+  end
 
-def _reduce_38(val, _values)
- s(:eq, val[0], val[2]) 
-end
+  def _rule_34(val)
+    
+      type = val[1][0]
+      args = val[1][1]
+      pred = val[1][2]
+
+      if type == :test
+        # Whenever a bare test is used (e.g. just "A") this actually means
+        # "child::A". Handling this on parser level is the easiest.
+        if args
+          node = s(:axis, 'child', s(:test, val[0], args))
+        else
+          node = s(:axis, 'child', s(:test, nil, val[0]))
+        end
+      else
+        node = s(type, val[0], *args)
+      end
+
+      if pred
+        node = s(:predicate, node, pred)
+      end
+
+      node
+    
+  end
 
-def _reduce_39(val, _values)
- s(:neq, val[0], val[2]) 
-end
+  def _rule_35(val)
+     s(:axis, 'child', val[0]) 
+  end
 
-def _reduce_40(val, _values)
- s(:lt, val[0], val[2]) 
-end
+  def _rule_36(val)
+     [:call, val[1]] 
+  end
 
-def _reduce_41(val, _values)
- s(:gt, val[0], val[2]) 
-end
+  def _rule_37(val)
+     [:test, val[1], val[2]] 
+  end
 
-def _reduce_42(val, _values)
- s(:lte, val[0], val[2]) 
-end
+  def _rule_38(val)
+     [:test, nil, val[0]] 
+  end
 
-def _reduce_43(val, _values)
- s(:gte, val[0], val[2]) 
-end
+  def _rule_39(val)
+     val[1] 
+  end
 
-def _reduce_44(val, _values)
- s(:mul, val[0], val[2]) 
-end
+  def _rule_40(val)
+     s(:type_test, val[0]) 
+  end
 
-def _reduce_45(val, _values)
- s(:sub, val[0], val[2]) 
-end
+  def _rule_41(val)
+    
+      val[1] ? s(:test, val[0], val[1]) : s(:test, nil, val[0])
+    
+  end
 
-def _reduce_46(val, _values)
- s(:axis, val[0], val[1]) 
-end
+  def _rule_42(val)
+     val[1] 
+  end
 
-def _reduce_47(val, _values)
- s(:axis, val[0]) 
-end
+  def _rule_43(val)
+     [val[0], *val[1]] 
+  end
 
-# reduce 48 omitted
+  def _rule_44(val)
+    val
+  end
 
-# reduce 49 omitted
+  def _rule_45(val)
+     val[1] 
+  end
 
-def _reduce_50(val, _values)
- s(:call, val[0]) 
-end
+  def _rule_46(val)
+    
+      ret = s(:axis, val[0], val[1])
 
-def _reduce_51(val, _values)
- s(:call, val[0], *val[2]) 
-end
+      if val[2]
+        ret = s(:predicate, ret, val[2])
+      end
 
-def _reduce_52(val, _values)
- val 
-end
+      ret
+    
+  end
 
-def _reduce_53(val, _values)
- val[2].unshift(val[0]) 
-end
+  def _rule_47(val)
+    val[0]
+  end
 
-def _reduce_54(val, _values)
- s(:string, val[0]) 
-end
+  def _rule_48(val)
+    val[0]
+  end
 
-def _reduce_55(val, _values)
- s(:int, val[0]) 
-end
+  def _rule_49(val)
+     s(:string, val[0]) 
+  end
 
-def _reduce_56(val, _values)
- s(:float, val[0]) 
-end
+  def _rule_50(val)
+     s(:int, val[0]) 
+  end
 
-def _reduce_57(val, _values)
- s(:var, val[0]) 
-end
+  def _rule_51(val)
+     s(:float, val[0]) 
+  end
 
-def _reduce_none(val, _values)
-  val[0]
-end
+  def _rule_52(val)
+     s(:var, val[0]) 
+  end
+
+  def _rule_53(val)
+    val[0]
+  end
+
+  def _rule_54(val)
+    val[0]
+  end
+
+  def _rule_55(val)
+    val[0]
+  end
+
+  def _rule_56(val)
+    val[0]
+  end
+
+  def _rule_57(val)
+    val[0]
+  end
+
+  def _rule_58(val)
+    val[0]
+  end
+
+  def _rule_59(val)
+    val[0]
+  end
 
-    end   # class Parser
-    end   # module XPath
-  end   # module Oga
+  def _rule_60(val)
+    val[0]
+  end
+
+  def _rule_61(val)
+    val[0]
+  end
+
+  def _rule_62(val)
+    val[0]
+  end
+
+  def _rule_63(val)
+    val[0]
+  end
+
+  def _rule_64(val)
+    val[0]
+  end
+
+  def _rule_65(val)
+    val[0]
+  end
+
+  def _rule_66(val)
+    val[0]
+  end
+
+  def _rule_67(val)
+    val[0]
+  end
+end
+end
+end