cel 0.2.3 → 0.3.1

data/lib/cel/parser.rb

@@ -1,20 +1,17 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.1
-# from Racc grammar file "".
+# This file is automatically generated by Racc 1.8.1
+# from Racc grammar file "parser.ry".
 #
 
 require 'racc/parser.rb'
 
 require 'strscan'
 require 'bigdecimal'
-require 'cel/ast/elements'
 module Cel
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.ry/module_eval...', 'parser.ry', 97)
-
-
+module_eval(<<'...end parser.ry/module_eval...', 'parser.ry', 96)
 
 OPERATORS = if RUBY_VERSION < "2.7.0"
   {
@@ -37,6 +34,52 @@ end.freeze
 
 OPERATORS_RE = Regexp.union(*OPERATORS.keys)
 
+BACKSLASH = "\\\\" # Must be literally two backslashes for proper interpolation
+DIGIT     = "[0-9]"
+EXPONENT  = "(?:[eE][+-]?#{DIGIT}+)"
+HEXDIGIT  = "[0-9a-fA-F]"
+RAW       = "(?<raw>[rR])"
+
+ESC_CHAR_SEQ = "#{BACKSLASH}[abfnrtv\"'#{BACKSLASH}?`]"
+ESC_OCT_SEQ  = "#{BACKSLASH}[0-3][0-7]{2}"
+ESC_BYTE_SEQ = "#{BACKSLASH}[xX]#{HEXDIGIT}{2}"
+ESC_UNI_SEQ  = "#{BACKSLASH}u#{HEXDIGIT}{4}|#{BACKSLASH}U#{HEXDIGIT}{8}"
+ESC_SEQ      = "#{ESC_CHAR_SEQ}|#{ESC_BYTE_SEQ}|#{ESC_UNI_SEQ}|#{ESC_OCT_SEQ}"
+
+WHITESPACE_REGEX = /[ \t\r\n\u000C]+/
+COMMENT_REGEX = %r{//[^\n]*}
+
+NUM_FLOAT_REGEX = Regexp.union(
+  /#{DIGIT}+\.#{DIGIT}+#{EXPONENT}?/,
+  /#{DIGIT}+#{EXPONENT}/,
+  /\.#{DIGIT}+#{EXPONENT}?/
+)
+
+NUM_INT_REGEX = Regexp.union(
+  /0x(?<hex>#{HEXDIGIT}+)/,
+  /(?<dec>#{DIGIT}+)/
+)
+
+NUM_UINT_REGEX = Regexp.union(
+  /0x(?<hex>#{HEXDIGIT}+)[uU]/,
+  /(?<dec>#{DIGIT}+)[uU]/
+)
+
+STRING_REGEX = Regexp.union(
+  /"""(?<str>(?:#{ESC_SEQ}|[^\\])*)"""/,
+  /'''(?<str>(?:#{ESC_SEQ}|[^\\])*)'''/,
+  /"(?<str>(?:#{ESC_SEQ}|[^\\"\n\r])*)"/,
+  /'(?<str>(?:#{ESC_SEQ}|[^\\'\n\r])*)'/,
+  /#{RAW}"""(?<str>.*?)"""/m,
+  /#{RAW}'''(?<str>.*?)'''/m,
+  /#{RAW}"(?<str>[^"\n\r]*)"/,
+  /#{RAW}'(?<str>[^'\n\r]*)'/,
+)
+
+QUOTED_MAP_FIELD_REGEX = /`/
+
+BYTES_REGEX = /[bB]#{STRING_REGEX}/
+
 RESERVED = %W[
 as break const continue else
 for function if import let
@@ -44,20 +87,18 @@ loop package namespace return
 var void while
 ].freeze
 
-IDENTIFIER_REGEX = /[a-zA-Z][_a-zA-Z0-9]*/
-
-STRING_LIT_REGEX = Regexp.union(
-  /"""(?~""")*"""/,
-  /'''(?~''')*'''/,
-  /"(\\"|[^"])*"/,
-  /'(\\'|[^'])*'/,
-)
+IDENTIFIER_REGEX = /[_a-zA-Z][_a-zA-Z0-9]*/
 
-NUMBER_REGEX = Regexp.union(
-  /(0x[0-9a-fA-F]+)[uU]?/, # hexadecimal
-  /(\d+)[uU]/, # uinteger
-  /((\d*\.\d+)|\d+)([eE][+\-]?\d+)?/, # integer, float, exponent
+def initialize(
+  package = nil,
+  max_recursion_depth: 32,
+  max_nesting_depth: 12,
+  expression_size_limit: 2048
 )
+  @max_recursion_depth = max_recursion_depth
+  @max_nesting_depth = max_nesting_depth
+  @package = package
+end
 
 def parse(str)
   tokenize(str)
@@ -67,12 +108,7 @@ rescue Racc::ParseError => err
 end
 
 def parse_error(error)
-  parse_error = case error.message
-  when /parse error on value "([^"]+)" \(tRESERVED\)/
-    Cel::ParseError.new("invalid usage of the reserved word \"#{$1}\"")
-  else
-    Cel::ParseError.new(error.message)
-  end
+  parse_error = Cel::ParseError.new(error.message)
   parse_error.set_backtrace(error.backtrace)
   parse_error
 end
@@ -86,38 +122,22 @@ def tokenize(str)
 
   until scanner.eos?
     case
-    when scanner.scan(/\s+/)
+    when scanner.scan(WHITESPACE_REGEX)
       # skip whitespace
-    when scanner.scan(/#(( *)|( ?(?<string>.*)))\n/)
+    when scanner.scan(COMMENT_REGEX)
       # skip comment lines
-    when scanner.scan(NUMBER_REGEX)
-      @q << convert_to_number(scanner)
-    when scanner.scan(/[bB]?[rR]?#{STRING_LIT_REGEX}/) # string
-      # s = scanner.matched.yield_self {|s| s[1, s.length - 2] }
-      #                  .gsub(DBL_QUOTE_STR_ESCAPE_SEQUENCES_RE) do |match|
-      #                    case match
-      #                    when '\\a' then "\a"
-      #                    when '\\b' then "\b"
-      #                    when '\\e' then "\e"
-      #                    when '\\f' then "\f"
-      #                    when '\\n' then "\n"
-      #                    when '\\r' then "\r"
-      #                    when '\\s' then "\s"
-      #                    when '\\t' then "\t"
-      #                    when '\\v' then "\v"
-      #                    when '\\"' then '"'
-      #                    end
-      #                  end
-
-      # s = scanner.matched.yield_self {|s| s[1, s.length - 2] }.gsub(/\\'/, "'")
-
-      str = scanner.matched
-
-      @q << if str.start_with?("b")
-        [:tBYTES, convert_to_bytes(str.byteslice(2..-2))]
-      else
-        [:tSTRING, convert_to_string(str)]
-      end
+    when scanner.scan(NUM_FLOAT_REGEX)
+      @q << [:tDOUBLE, Float(scanner.matched)]
+    when scanner.scan(NUM_UINT_REGEX)
+      @q << [:tUINT, scanner[:hex] ? scanner[:hex].to_i(16) : scanner[:dec].to_i]
+    when scanner.scan(NUM_INT_REGEX)
+      @q << [:tINT, scanner[:hex] ? scanner[:hex].to_i(16) : scanner[:dec].to_i]
+    when scanner.scan(STRING_REGEX)
+      str = convert_to_string(scanner[:raw], scanner[:str], true)
+      @q << [:tSTRING, str]
+    when scanner.scan(BYTES_REGEX)
+      str = convert_to_string(scanner[:raw], scanner[:str])
+      @q << [:tBYTES, convert_to_bytes(str)]
     when scanner.scan(IDENTIFIER_REGEX)
       word = scanner.matched
       if word == "null"
@@ -126,8 +146,6 @@ def tokenize(str)
         @q << [:tBOOL, true]
       elsif word == "false"
         @q << [:tBOOL, false]
-      elsif RESERVED.include?(word)
-        @q << [:tRESERVED, scanner.matched]
       elsif word == "in"
         @q << [OPERATORS[scanner.matched], scanner.matched]
       else
@@ -135,6 +153,16 @@ def tokenize(str)
       end
     when scanner.scan(OPERATORS_RE)
       @q << [OPERATORS[scanner.matched], scanner.matched]
+    when scanner.scan(QUOTED_MAP_FIELD_REGEX)
+      current_pos = scanner.pos
+
+      raise ParseError, "unexpected value: #{scanner.string}" unless scanner.scan_until(QUOTED_MAP_FIELD_REGEX)
+
+      raise ParseError, "unexpected value: #{scanner.string}" if scanner.post_match.start_with?("(")
+
+      # TODO: ensure that no newline is in the string
+
+      @q << [:tIDENTIFIER, scanner.pre_match[current_pos..-1]]
     when scanner.scan(/\A.|\n/o)
       s = scanner.matched
       @q << [s, s]
@@ -149,286 +177,471 @@ def next_token
   @q.shift
 end
 
-def convert_to_number(scanner)
-  matched = scanner.matched
-  hexa, uint, number, floating, exp = scanner.captures
+CHAR_SEQ_MAP = {
+  "\\a" => "\a",
+  "\\b" => "\b",
+  "\\f" => "\f",
+  "\\n" => "\n",
+  "\\r" => "\r",
+  "\\t" => "\t",
+  "\\v" => "\v",
+  "\\\"" => "\"",
+  "\\'" => "'",
+  "\\\\" => "\\",
+  "\\?" => "?",
+  "\\`" => "`",
+}.freeze
+ESC_SEQ_REGEX = /#{ESC_SEQ}/
+def convert_to_string(raw, str, encode_to_utf8 = false)
+  # Raw strings do not interpret escape sequences
+  return str if raw
+
+  # Parse and convert all escape sequences
+  str.gsub(ESC_SEQ_REGEX) do |match|
+    case match[1]
+    when "0", "1", "2", "3"
+      # Octal sequence - ESC_OCT_SEQ
+      fragment = match[1..].to_i(8)
+      encode_to_utf8 ? [fragment].pack("U") : fragment.chr
+    when "x", "X"
+      # Hex sequence - ESC_BYTE_SEQ
+      fragment = match[2..].to_i(16)
+      encode_to_utf8 ? [fragment].pack("U") : fragment.chr
+    when "u", "U"
+      # Unicode escape sequence - ESC_UNI_SEQ
+      [match[2..].to_i(16)].pack('U')
+    else
+      # Char escape sequence - ESC_CHAR_SEQ
+      CHAR_SEQ_MAP.fetch(match)
+    end
+  end
+end
+
+def convert_to_bytes(str)
+  str.unpack("C*")
+end
+
+
+def literal_string(str)
+  Cel::String.new(str)
+end
+
+def literal_bytes(bytes)
+  Cel::Bytes.new(bytes)
+end
+
+def literal_int(int)
+  Cel::Number.new(:int, int)
+end
+
+def literal_uint(int)
+  Cel::Number.new(:uint, int)
+end
+
+def literal_double(double)
+  Cel::Number.new(:double, double)
+end
+
+def literal_bool(bool)
+  Cel::Bool.cast(bool)
+end
+
+def literal_null
+  Cel::Null::INSTANCE
+end
 
-  if hexa && !hexa.empty?
-    return [:tINT, hexa.to_i(16)]
+def new_map(elements)
+  depth = 1
+
+  if elements.size > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of map elements exceeded"
   end
 
-  if uint && !uint.empty?
-    return [:tUINT, Integer(uint)]
+  depth = elements.filter_map do |_, elem|
+    next unless elem.is_a?(Cel::Map)
+
+    d = depth + elem.depth
+
+    if d > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of map literals exceeded"
+    end
+
+    d
+  end.max || depth
+
+  Cel::Map.new(elements, depth: depth)
+end
+
+def new_list(val)
+  elements = Array(val)
+  depth = 1
+
+  if elements.size > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of elements for list literals exceeded"
   end
 
-  if exp && !exp.empty?
-    # third matched group, can only be a floating exponential, let's convert tout suite
-    [:tDOUBLE, BigDecimal(matched)]
-  elsif floating && !floating.empty?
-    if number == floating || floating.start_with?(".")
-      [:tDOUBLE, Float(matched)]
-    elsif number.nil? || number.empty?
-      [:tDOUBLE, BigDecimal(matched)]
+  depth = elements.filter_map do |elem|
+    next unless elem.is_a?(Cel::List)
+
+    d = depth + elem.depth
+
+    if d > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of list literals exceeded"
     end
-  else
-    if matched[-1].downcase == "u"
-      [:tINT, Integer(matched[0..-2]).abs]
-    else
-      [:tINT, Integer(matched)]
+
+    d
+  end.max || depth
+
+  Cel::List.new(elements, depth: depth)
+end
+
+def new_identifier(id)
+  Cel::Identifier.new(id, @package)
+end
+
+def new_message(type, struct)
+  depth = 1
+  if struct
+    if struct.size > @max_recursion_depth
+      raise MaxRecursionDepthExceededError, "max number of message elements exceeded"
     end
+
+    depth = struct.filter_map do |_, elem|
+      next unless elem.is_a?(Cel::Message)
+
+      d = depth + elem.depth
+
+      if d > @max_nesting_depth
+        raise MaxNestingDepthExceededError, "max nesting of map literals exceeded"
+      end
+
+      d
+    end.max || depth
   end
+
+  Cel::Message.new(type, struct, package: @package, depth: depth)
 end
 
-TRIPE_DOUBLE_QUOTES = %Q{"""}
-TRIPE_SINGLE_QUOTES = %Q{'''}
+def global_call(function, args = nil)
+  depth = 1
+
+  if args && args.size > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of function call arguments exceeded"
+  end
+
+  depth = args.filter_map do |arg|
+    next unless arg.is_a?(Cel::Invoke)
 
-def convert_to_string(str)
+    d = depth + arg.depth
 
-  if str.start_with?("r")
-    # If preceded by an r or R character, the string is a raw string
-    # and does not interpret escape sequences.
-    str = str.byteslice(2..-2).inspect.byteslice(1..-2)
-    return str
+    if d > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of function calls exceeded"
+    end
+
+    d
+  end.max || depth
+
+  Cel::Invoke.new(func: function, var: nil, args: args, package: @package, depth: depth)
+end
+
+def indexing_call(target, args)
+  depth = 1
+
+  if target.is_a?(Cel::Invoke)
+    depth += target.depth if target.indexing?
+
+    if depth > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of indexing operators exceeded"
+    end
   end
 
-  if str.size > 6 && (
-    (str.start_with?(TRIPE_DOUBLE_QUOTES) && str.end_with?(TRIPE_DOUBLE_QUOTES)) ||
-    (str.start_with?(TRIPE_SINGLE_QUOTES) && str.end_with?(TRIPE_SINGLE_QUOTES)))
-    str = str.byteslice(3..-4)
-  else
-    str = str.byteslice(1..-2)
+  receiver_call(:[], target, args, package: @package, depth: depth)
+end
+
+def selector_call(function, target)
+  depth = 1
+
+  # if selector operator
+  if target.is_a?(Cel::Invoke) && !target.var.nil?
+    depth += target.depth
+
+    if depth > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of selection operators exceeded"
+    end
   end
 
-  cleanup_escape_sequences(str)
+  receiver_call(function, target, package: @package, depth: depth)
 end
 
-def convert_to_bytes(str)
-  str.unpack("C*")
+def receiver_call(function, target, args = nil, **kwargs)
+  Cel::Invoke.new(func: function, var: target, args: args, package: @package, **kwargs)
+end
+
+def logical_operation(op, operands)
+  lhs, rhs = operands
+
+  if lhs.is_a?(Cel::Operation) && lhs.op == op
+    # concat them
+    operands = [*lhs.operands, rhs]
+  end
+
+  if operands.size - 1 > @max_recursion_depth
+    raise Cel::MaxRecursionDepthExceededError, "max recursion depth exceeded for #{op} operation"
+  end
+
+  operation(op, operands)
+end
+
+def math_operation(op, operands)
+  # 32 binary arithmetic operators of the same precedence in a row
+  lhs, _ = operands
+  depth = 1
+
+  if lhs.is_a?(Cel::Operation)
+    case op
+    when "*", "/", "%"
+      case lhs.op
+      when  "*", "/", "%"
+        depth = lhs.depth + 1
+      end
+    when "+", "+"
+      case lhs.op
+      when  "+", "+"
+        depth = lhs.depth + 1
+      end
+    end
+  end
+
+  if depth > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of arithmetic operators with the same precedence exceeded"
+  end
+
+  operation(op, operands, depth: depth)
 end
 
+def unary_operation(op, operand)
+  depth = 1
+
+  if operand.is_a?(Cel::Operation) && operand.op == op && operand.unary?
+    depth = depth + operand.depth
 
-BIN_ESCAPE = /\\([0-3][0-7][0-7])/
-HEX_ESCAPE = /\\x([0-9a-fA-F]{2})/
-BPM_ESCAPE = /\\u([0-9a-fA-F]{4})/
-UNICODE_ESCAPE = /\\u([0-9a-fA-F]{4})/
-WHITESPACE_ESCAPE = /\\([bfnrt"'\\])/
-ESCAPE_UNION = Regexp.union(BIN_ESCAPE, HEX_ESCAPE, BPM_ESCAPE, WHITESPACE_ESCAPE)
-# For the sake of a readable representation, the escape sequences (ESCAPE) are kept
-# implicit in string tokens. This means that strings without the r or R (raw) prefix
-# process ESCAPE sequences, while in strings with the raw prefix they stay uninterpreted.
-# See documentation of string literals below.
-def cleanup_escape_sequences(str)
-  str.gsub!(ESCAPE_UNION) do |match|
-    case match
-    when /\\"/
-      "\""
-    when BIN_ESCAPE
-      # For strings, it denotes the unicode code point.
-      Regexp.last_match(1).to_i.chr(Encoding::UTF_8)
-    when HEX_ESCAPE
-      # For strings, it denotes the unicode code point.
-      Regexp.last_match(1).hex.chr(Encoding::UTF_8)
-    when BPM_ESCAPE
-      Regexp.last_match(1).hex.chr(Encoding::BPM)
-    when UNICODE_ESCAPE
-      # encoding a Unicode code point. Valid only for string literals.
-      Regexp.last_match(1).hex.chr(Encoding::UTF_8)
-    when WHITESPACE_ESCAPE
-      Regexp.last_match(0)
+    if depth > @max_recursion_depth
+      raise MaxRecursionDepthExceededError, "max number of an unary operator exceeded"
     end
   end
-  str
+
+  operation(op, [operand], depth: depth)
+end
+
+def operation(op, operands, **kwargs)
+  Cel::Operation.new(op, operands, **kwargs)
+end
+
+def ternary_condition(if_op, *ops)
+  depth = 1
+
+  depth = ops.filter_map do |op|
+    next unless op.is_a?(Cel::Condition)
+
+    d = depth + op.depth
+
+    if d > @max_recursion_depth
+      raise MaxRecursionDepthExceededError, "max number of consecutive ternary operators exceeded"
+    end
+
+    d
+  end.max || depth
+
+  Cel::Condition.new(if_op, *ops, depth: depth)
+end
+
+# Checks whether the given identifier token is a reserved word or not. Throws
+# a ParseError if it's a reserved word.
+def validated_id!(identifier)
+  return identifier unless RESERVED.include?(identifier)
+
+  raise Cel::ParseError, "invalid usage of the reserved word \"#{identifier}\""
 end
 
 ...end parser.ry/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
-    22,    23,    24,    25,    26,    27,    28,    38,    20,    29,
-    39,    13,    40,    38,    32,     4,    39,    31,    40,    12,
-    21,    16,     4,    17,    33,    18,    22,    23,    24,    25,
-    26,    27,    28,    38,    20,    32,    39,    34,    40,    78,
-    35,    36,    35,    36,    37,    42,    21,    16,    47,    17,
-    55,    18,    22,    23,    24,    25,    26,    27,    28,    56,
-    20,    64,    68,    45,    72,    73,    74,    75,    76,    77,
-    33,    34,    21,    16,    37,    17,    37,    18,    22,    23,
-    24,    25,    26,    27,    28,    79,    20,    80,    81,    13,
-    82,    83,    84,    90,    92,    93,    94,    12,    21,    16,
-   nil,    17,   nil,    18,    22,    23,    24,    25,    26,    27,
-    28,   nil,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    12,    21,    16,   nil,    17,   nil,    18,
-    22,    23,    24,    25,    26,    27,    28,   nil,    20,   nil,
-   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,
-    21,    16,   nil,    17,   nil,    18,    22,    23,    24,    25,
-    26,    27,    28,   nil,    20,   nil,   nil,    13,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    12,    21,    16,   nil,    17,
-   nil,    18,    22,    23,    24,    25,    26,    27,    28,   nil,
-    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    12,    21,    16,   nil,    17,   nil,    18,    22,    23,
-    24,    25,    26,    27,    28,   nil,    20,   nil,   nil,    13,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    21,    16,
-   nil,    17,   nil,    18,    22,    23,    24,    25,    26,    27,
-    28,   nil,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    12,    21,    16,   nil,    17,   nil,    18,
-    22,    23,    24,    25,    26,    27,    28,   nil,    20,   nil,
-   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,
-    21,    16,   nil,    17,   nil,    18,    22,    23,    24,    25,
-    26,    27,    28,   nil,    20,   nil,   nil,    13,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    12,    21,    16,   nil,    17,
-   nil,    18,    22,    23,    24,    25,    26,    27,    28,   nil,
-    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    12,    21,    16,   nil,    17,   nil,    18,    22,    23,
-    24,    25,    26,    27,    28,   nil,    20,   nil,   nil,    13,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    21,    16,
-   nil,    17,   nil,    18,    22,    23,    24,    25,    26,    27,
-    28,   nil,    20,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    42,    21,    16,   nil,    17,   nil,    18,
-    22,    23,    24,    25,    26,    27,    28,   nil,    20,   nil,
-   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    21,    16,   nil,    17,   nil,    18,    22,    23,    24,    25,
-    26,    27,    28,   nil,    20,   nil,   nil,    13,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    12,    21,    16,   nil,    17,
-   nil,    18,    22,    23,    24,    25,    26,    27,    28,   nil,
-    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    12,    21,    16,   nil,    17,   nil,    18,    22,    23,
-    24,    25,    26,    27,    28,   nil,    20,   nil,   nil,    13,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    21,    16,
-   nil,    17,   nil,    18,    22,    23,    24,    25,    26,    27,
-    28,   nil,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    12,    21,    16,   nil,    17,   nil,    18,
-    22,    23,    24,    25,    26,    27,    28,   nil,    20,   nil,
-   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,
-    21,    16,   nil,    17,   nil,    18,    22,    23,    24,    25,
-    26,    27,    28,   nil,    20,   nil,   nil,    13,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    12,    21,    16,   nil,    17,
-   nil,    18,    22,    23,    24,    25,    26,    27,    28,   nil,
-    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    12,    21,    16,   nil,    17,   nil,    18,    22,    23,
-    24,    25,    26,    27,    28,   nil,    20,   nil,   nil,    13,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    21,    16,
-   nil,    17,   nil,    18,    22,    23,    24,    25,    26,    27,
-    28,   nil,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    12,    21,    16,   nil,    17,   nil,    18 ]
+    22,    23,    24,    25,    26,    27,    28,    20,    32,    38,
+    13,    39,    78,    40,     4,    35,    36,    32,    12,    17,
+    31,    18,    29,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,    35,    36,    22,    23,    24,    25,    26,
+    27,    28,    20,    42,    17,    45,    18,     4,    21,    16,
+    33,    38,    34,    39,    17,    40,    18,    37,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,    47,    38,
+    13,    39,    55,    40,    56,    67,    68,    72,    12,    17,
+    73,    18,    74,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,    75,    76,    13,    77,    33,    34,    37,
+    37,    79,    80,    12,    17,    81,    18,    82,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,    83,    84,
+    13,    89,    92,    93,    94,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    22,    23,    24,    25,    26,
+    27,    28,    20,    42,    17,    45,    18,   nil,    21,    16,
+   nil,   nil,   nil,   nil,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16,    22,    23,    24,    25,    26,
+    27,    28,    20,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    12,    17,   nil,    18,   nil,    21,    16,
+    22,    23,    24,    25,    26,    27,    28,    20,   nil,   nil,
+    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    17,
+   nil,    18,   nil,    21,    16 ]
 
 racc_action_check = [
-     0,     0,     0,     0,     0,     0,     0,    11,     0,     1,
-    11,     0,    11,    43,     5,     0,    43,     5,    43,     0,
-     0,     0,     2,     0,     6,     0,    12,    12,    12,    12,
-    12,    12,    12,    46,    12,    57,    46,     7,    46,    57,
-     8,     8,    60,    60,     9,    12,    12,    12,    15,    12,
-    21,    12,    13,    13,    13,    13,    13,    13,    13,    29,
-    13,    38,    40,    13,    48,    49,    50,    52,    53,    54,
-    58,    59,    13,    13,    61,    13,    62,    13,    16,    16,
-    16,    16,    16,    16,    16,    64,    16,    65,    66,    16,
-    67,    68,    71,    82,    86,    89,    90,    16,    16,    16,
-   nil,    16,   nil,    16,    17,    17,    17,    17,    17,    17,
-    17,   nil,    17,   nil,   nil,    17,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    17,    17,    17,   nil,    17,   nil,    17,
-    18,    18,    18,    18,    18,    18,    18,   nil,    18,   nil,
-   nil,    18,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    18,
-    18,    18,   nil,    18,   nil,    18,    31,    31,    31,    31,
-    31,    31,    31,   nil,    31,   nil,   nil,    31,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    31,    31,    31,   nil,    31,
-   nil,    31,    32,    32,    32,    32,    32,    32,    32,   nil,
-    32,   nil,   nil,    32,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    32,    32,    32,   nil,    32,   nil,    32,    33,    33,
-    33,    33,    33,    33,    33,   nil,    33,   nil,   nil,    33,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33,    33,    33,
-   nil,    33,   nil,    33,    34,    34,    34,    34,    34,    34,
-    34,   nil,    34,   nil,   nil,    34,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    34,    34,    34,   nil,    34,   nil,    34,
-    35,    35,    35,    35,    35,    35,    35,   nil,    35,   nil,
-   nil,    35,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    35,
-    35,    35,   nil,    35,   nil,    35,    36,    36,    36,    36,
-    36,    36,    36,   nil,    36,   nil,   nil,    36,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    36,    36,    36,   nil,    36,
-   nil,    36,    37,    37,    37,    37,    37,    37,    37,   nil,
-    37,   nil,   nil,    37,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    37,    37,    37,   nil,    37,   nil,    37,    39,    39,
-    39,    39,    39,    39,    39,   nil,    39,   nil,   nil,    39,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    39,    39,    39,
-   nil,    39,   nil,    39,    42,    42,    42,    42,    42,    42,
-    42,   nil,    42,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    42,    42,    42,   nil,    42,   nil,    42,
-    45,    45,    45,    45,    45,    45,    45,   nil,    45,   nil,
-   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    45,    45,   nil,    45,   nil,    45,    47,    47,    47,    47,
-    47,    47,    47,   nil,    47,   nil,   nil,    47,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    47,    47,    47,   nil,    47,
-   nil,    47,    74,    74,    74,    74,    74,    74,    74,   nil,
-    74,   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    74,    74,    74,   nil,    74,   nil,    74,    76,    76,
-    76,    76,    76,    76,    76,   nil,    76,   nil,   nil,    76,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    76,    76,    76,
-   nil,    76,   nil,    76,    77,    77,    77,    77,    77,    77,
-    77,   nil,    77,   nil,   nil,    77,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    77,    77,    77,   nil,    77,   nil,    77,
-    78,    78,    78,    78,    78,    78,    78,   nil,    78,   nil,
-   nil,    78,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    78,
-    78,    78,   nil,    78,   nil,    78,    79,    79,    79,    79,
-    79,    79,    79,   nil,    79,   nil,   nil,    79,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    79,    79,    79,   nil,    79,
-   nil,    79,    83,    83,    83,    83,    83,    83,    83,   nil,
-    83,   nil,   nil,    83,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    83,    83,    83,   nil,    83,   nil,    83,    92,    92,
-    92,    92,    92,    92,    92,   nil,    92,   nil,   nil,    92,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    92,    92,    92,
-   nil,    92,   nil,    92,    94,    94,    94,    94,    94,    94,
-    94,   nil,    94,   nil,   nil,    94,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    94,    94,    94,   nil,    94,   nil,    94 ]
+     0,     0,     0,     0,     0,     0,     0,     0,    57,    11,
+     0,    11,    57,    11,     0,     8,     8,     5,     0,     0,
+     5,     0,     1,     0,     0,    12,    12,    12,    12,    12,
+    12,    12,    12,    60,    60,    13,    13,    13,    13,    13,
+    13,    13,    13,    12,    12,    13,    12,     2,    12,    12,
+     6,    43,     7,    43,    13,    43,    13,     9,    13,    13,
+    16,    16,    16,    16,    16,    16,    16,    16,    15,    46,
+    16,    46,    21,    46,    29,    39,    40,    48,    16,    16,
+    49,    16,    50,    16,    16,    17,    17,    17,    17,    17,
+    17,    17,    17,    52,    53,    17,    54,    58,    59,    61,
+    62,    64,    65,    17,    17,    66,    17,    67,    17,    17,
+    18,    18,    18,    18,    18,    18,    18,    18,    68,    71,
+    18,    81,    86,    89,    91,   nil,   nil,   nil,    18,    18,
+   nil,    18,   nil,    18,    18,    31,    31,    31,    31,    31,
+    31,    31,    31,   nil,   nil,    31,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    31,    31,   nil,    31,   nil,    31,    31,
+    32,    32,    32,    32,    32,    32,    32,    32,   nil,   nil,
+    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    32,    32,
+   nil,    32,   nil,    32,    32,    33,    33,    33,    33,    33,
+    33,    33,    33,   nil,   nil,    33,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    33,    33,   nil,    33,   nil,    33,    33,
+    34,    34,    34,    34,    34,    34,    34,    34,   nil,   nil,
+    34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    34,    34,
+   nil,    34,   nil,    34,    34,    35,    35,    35,    35,    35,
+    35,    35,    35,   nil,   nil,    35,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    35,    35,   nil,    35,   nil,    35,    35,
+    36,    36,    36,    36,    36,    36,    36,    36,   nil,   nil,
+    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    36,    36,
+   nil,    36,   nil,    36,    36,    37,    37,    37,    37,    37,
+    37,    37,    37,   nil,   nil,    37,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    37,    37,   nil,    37,   nil,    37,    37,
+    38,    38,    38,    38,    38,    38,    38,    38,   nil,   nil,
+    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    38,    38,
+   nil,    38,   nil,    38,    38,    42,    42,    42,    42,    42,
+    42,    42,    42,   nil,   nil,    45,    45,    45,    45,    45,
+    45,    45,    45,    42,    42,    45,    42,   nil,    42,    42,
+   nil,   nil,   nil,   nil,    45,   nil,    45,   nil,    45,    45,
+    47,    47,    47,    47,    47,    47,    47,    47,   nil,   nil,
+    47,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    47,    47,
+   nil,    47,   nil,    47,    47,    74,    74,    74,    74,    74,
+    74,    74,    74,   nil,   nil,    74,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    74,    74,   nil,    74,   nil,    74,    74,
+    76,    76,    76,    76,    76,    76,    76,    76,   nil,   nil,
+    76,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    76,    76,
+   nil,    76,   nil,    76,    76,    77,    77,    77,    77,    77,
+    77,    77,    77,   nil,   nil,    77,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    77,    77,   nil,    77,   nil,    77,    77,
+    78,    78,    78,    78,    78,    78,    78,    78,   nil,   nil,
+    78,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    78,    78,
+   nil,    78,   nil,    78,    78,    82,    82,    82,    82,    82,
+    82,    82,    82,   nil,   nil,    82,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    82,    82,   nil,    82,   nil,    82,    82,
+    83,    83,    83,    83,    83,    83,    83,    83,   nil,   nil,
+    83,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    83,    83,
+   nil,    83,   nil,    83,    83,    92,    92,    92,    92,    92,
+    92,    92,    92,   nil,   nil,    92,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    92,    92,   nil,    92,   nil,    92,    92,
+    93,    93,    93,    93,    93,    93,    93,    93,   nil,   nil,
+    93,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    93,    93,
+   nil,    93,   nil,    93,    93 ]
 
 racc_action_pointer = [
-    -2,     9,     5,   nil,   nil,    -2,     9,    23,    28,    33,
-   nil,   -15,    24,    50,   nil,    25,    76,   102,   128,   nil,
-   nil,    40,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    59,
-   nil,   154,   180,   206,   232,   258,   284,   310,    51,   336,
-    52,   nil,   362,    -9,   nil,   388,    11,   414,    40,    39,
-    37,   nil,    39,    39,    49,   nil,   nil,    19,    55,    57,
-    30,    63,    65,   nil,    62,    61,    60,    61,    71,   nil,
-   nil,    68,   nil,   nil,   440,   nil,   466,   492,   518,   544,
-   nil,   nil,    83,   570,   nil,   nil,    74,   nil,   nil,    71,
-    76,   nil,   596,   nil,   622,   nil,   nil ]
+    -2,    22,    31,   nil,   nil,     2,    36,    39,     4,    47,
+   nil,   -12,    23,    33,   nil,    42,    58,    83,   108,   nil,
+   nil,    63,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    74,
+   nil,   133,   158,   183,   208,   233,   258,   283,   308,    66,
+    67,   nil,   333,    30,   nil,   343,    48,   368,    50,    58,
+    54,   nil,    69,    66,    77,   nil,   nil,    -7,    83,    85,
+    22,    89,    90,   nil,    79,    78,    77,    88,    92,   nil,
+   nil,    92,   nil,   nil,   393,   nil,   418,   443,   468,   nil,
+   nil,   112,   493,   518,   nil,   nil,   103,   nil,   nil,   104,
+   nil,    97,   543,   568,   nil,   nil,   nil ]
 
 racc_action_default = [
    -56,   -56,   -56,    -2,    -3,    -5,    -7,    -9,   -11,   -14,
    -16,   -17,   -56,   -56,   -24,   -29,   -56,   -38,   -39,   -34,
    -35,   -56,   -49,   -50,   -51,   -52,   -53,   -54,   -55,   -56,
-    -1,   -56,   -56,   -56,   -56,   -56,   -56,   -56,   -56,   -56,
-   -43,   -18,   -56,   -21,   -19,   -56,   -23,   -38,   -56,   -56,
+    -1,   -56,   -56,   -56,   -56,   -56,   -56,   -56,   -56,   -43,
+   -56,   -18,   -56,   -21,   -19,   -56,   -23,   -38,   -56,   -56,
    -37,   -42,   -56,   -40,   -56,   -36,    97,   -56,    -6,    -8,
-   -10,   -12,   -13,   -15,   -25,   -56,   -56,   -44,   -56,   -20,
-   -22,   -56,   -31,   -32,   -56,   -33,   -56,   -56,   -56,   -38,
-   -27,   -28,   -56,   -56,   -30,   -41,   -56,   -48,    -4,   -56,
-   -56,   -46,   -56,   -26,   -56,   -47,   -45 ]
+   -10,   -12,   -13,   -15,   -56,   -56,   -44,   -56,   -27,   -20,
+   -22,   -56,   -31,   -32,   -56,   -33,   -56,   -56,   -56,   -25,
+   -26,   -56,   -56,   -38,   -30,   -41,   -56,   -48,    -4,   -56,
+   -46,   -56,   -56,   -56,   -28,   -47,   -45 ]
 
 racc_goto_table = [
      2,    49,    43,    46,    44,     1,     3,    41,    30,    61,
-    62,    57,    58,    59,    60,    63,    48,    66,    54,    52,
-    53,    67,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    71,    43,   nil,   nil,    46,    70,    69,   nil,    65,
+    62,    57,    58,    59,    60,    63,    48,    65,    54,    52,
+    53,    66,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    71,    43,   nil,   nil,    46,    70,    69,    64,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    89,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    91,   nil,   nil,
    nil,   nil,   nil,   nil,    85,   nil,    86,    87,    88,   nil,
-   nil,   nil,   nil,    91,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    95,   nil,    96 ]
+   nil,   nil,    90,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    95,    96 ]
 
 racc_goto_check = [
-     2,    14,    10,    10,    12,     1,     3,    11,     3,     8,
-     8,     4,     5,     6,     7,     9,     2,    15,     2,    17,
+     2,    15,    10,    10,    12,     1,     3,    11,     3,     8,
+     8,     4,     5,     6,     7,     9,     2,    14,     2,    17,
     20,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    14,    10,   nil,   nil,    10,    12,    11,   nil,     2,
+   nil,    15,    10,   nil,   nil,    10,    12,    11,     2,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    14,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,   nil,   nil,
    nil,   nil,   nil,   nil,     2,   nil,     2,     2,     2,   nil,
-   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     2,   nil,     2 ]
+   nil,   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     2,     2 ]
 
 racc_goto_pointer = [
    nil,     5,     0,     6,   -20,   -20,   -20,   -20,   -26,   -22,
-   -10,    -5,    -9,   nil,   -16,   -23,   nil,     1,   nil,   nil,
-     2,   -19 ]
+   -10,    -5,    -9,   nil,   -22,   -16,   nil,     1,   nil,   nil,
+     2,   -18 ]
 
 racc_goto_default = [
    nil,   nil,    51,   nil,     5,     6,     7,     8,     9,    10,
@@ -437,61 +650,61 @@ racc_goto_default = [
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 31, :_reduce_none,
+  2, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 32, :_reduce_none,
+  5, 31, :_reduce_4,
   1, 31, :_reduce_none,
+  3, 33, :_reduce_6,
   1, 33, :_reduce_none,
-  5, 32, :_reduce_4,
-  1, 32, :_reduce_none,
-  3, 34, :_reduce_6,
+  3, 34, :_reduce_8,
   1, 34, :_reduce_none,
-  3, 35, :_reduce_8,
+  3, 35, :_reduce_10,
   1, 35, :_reduce_none,
-  3, 36, :_reduce_10,
+  3, 36, :_reduce_12,
+  3, 36, :_reduce_13,
   1, 36, :_reduce_none,
-  3, 37, :_reduce_12,
-  3, 37, :_reduce_13,
+  3, 37, :_reduce_15,
   1, 37, :_reduce_none,
-  3, 38, :_reduce_15,
   1, 38, :_reduce_none,
-  1, 39, :_reduce_none,
-  2, 39, :_reduce_18,
-  2, 39, :_reduce_19,
-  2, 41, :_reduce_20,
+  2, 38, :_reduce_18,
+  2, 38, :_reduce_19,
+  2, 40, :_reduce_20,
+  1, 40, :_reduce_none,
+  2, 41, :_reduce_22,
   1, 41, :_reduce_none,
-  2, 42, :_reduce_22,
+  1, 39, :_reduce_none,
+  4, 39, :_reduce_25,
+  4, 39, :_reduce_26,
+  3, 39, :_reduce_27,
+  6, 39, :_reduce_28,
+  1, 42, :_reduce_29,
+  4, 42, :_reduce_30,
+  3, 42, :_reduce_31,
+  3, 42, :_reduce_32,
+  3, 42, :_reduce_33,
   1, 42, :_reduce_none,
-  1, 40, :_reduce_none,
-  3, 40, :_reduce_25,
-  6, 40, :_reduce_26,
-  4, 40, :_reduce_27,
-  4, 40, :_reduce_28,
-  1, 43, :_reduce_29,
-  4, 43, :_reduce_30,
-  3, 43, :_reduce_31,
-  3, 43, :_reduce_32,
-  3, 43, :_reduce_33,
-  1, 43, :_reduce_none,
-  1, 46, :_reduce_none,
-  2, 46, :_reduce_none,
+  1, 45, :_reduce_none,
+  2, 45, :_reduce_36,
   1, 44, :_reduce_none,
   0, 44, :_reduce_38,
-  0, 47, :_reduce_39,
-  1, 47, :_reduce_none,
-  3, 49, :_reduce_41,
-  1, 49, :_reduce_42,
-  0, 45, :_reduce_43,
-  1, 45, :_reduce_none,
-  5, 51, :_reduce_45,
-  3, 51, :_reduce_46,
-  5, 50, :_reduce_47,
-  3, 50, :_reduce_48,
-  1, 48, :_reduce_49,
-  1, 48, :_reduce_50,
-  1, 48, :_reduce_51,
-  1, 48, :_reduce_52,
-  1, 48, :_reduce_53,
-  1, 48, :_reduce_54,
-  1, 48, :_reduce_55 ]
+  0, 46, :_reduce_39,
+  1, 46, :_reduce_none,
+  3, 48, :_reduce_41,
+  1, 48, :_reduce_42,
+  0, 43, :_reduce_43,
+  1, 43, :_reduce_none,
+  5, 50, :_reduce_45,
+  3, 50, :_reduce_46,
+  5, 49, :_reduce_47,
+  3, 49, :_reduce_48,
+  1, 47, :_reduce_49,
+  1, 47, :_reduce_50,
+  1, 47, :_reduce_51,
+  1, 47, :_reduce_52,
+  1, 47, :_reduce_53,
+  1, 47, :_reduce_54,
+  1, 47, :_reduce_55 ]
 
 racc_reduce_n = 56
 
@@ -507,29 +720,28 @@ racc_token_table = {
   :tNULL => 6,
   :tSTRING => 7,
   :tBYTES => 8,
-  :tRESERVED => 9,
-  :tIDENTIFIER => 10,
-  :tMULTIOP => 11,
-  :tADDOP => 12,
-  :tSUBOP => 13,
-  :tRELOP => 14,
-  :tANDOP => 15,
-  :tOROP => 16,
-  :tEOF => 17,
-  :UMINUS => 18,
-  "?" => 19,
-  ":" => 20,
-  "!" => 21,
-  "." => 22,
-  "(" => 23,
-  ")" => 24,
-  "[" => 25,
-  "]" => 26,
-  "{" => 27,
-  "}" => 28,
-  "," => 29 }
-
-racc_nt_base = 30
+  :tIDENTIFIER => 9,
+  :tMULTIOP => 10,
+  :tADDOP => 11,
+  :tSUBOP => 12,
+  :tRELOP => 13,
+  :tANDOP => 14,
+  :tOROP => 15,
+  :tEOF => 16,
+  :UMINUS => 17,
+  "?" => 18,
+  ":" => 19,
+  "!" => 20,
+  "[" => 21,
+  "]" => 22,
+  "{" => 23,
+  "}" => 24,
+  "." => 25,
+  "(" => 26,
+  ")" => 27,
+  "," => 28 }
+
+racc_nt_base = 29
 
 racc_use_result_var = true
 
@@ -560,7 +772,6 @@ Racc_token_to_s_table = [
   "tNULL",
   "tSTRING",
   "tBYTES",
-  "tRESERVED",
   "tIDENTIFIER",
   "tMULTIOP",
   "tADDOP",
@@ -573,13 +784,13 @@ Racc_token_to_s_table = [
   "\"?\"",
   "\":\"",
   "\"!\"",
-  "\".\"",
-  "\"(\"",
-  "\")\"",
   "\"[\"",
   "\"]\"",
   "\"{\"",
   "\"}\"",
+  "\".\"",
+  "\"(\"",
+  "\")\"",
   "\",\"",
   "$start",
   "target",
@@ -595,8 +806,8 @@ Racc_token_to_s_table = [
   "negated_member",
   "negative_member",
   "primary",
-  "maybe_expr_list",
   "maybe_field_inits",
+  "maybe_expr_list",
   "identifier",
   "maybe_map_inits",
   "literal",
@@ -619,7 +830,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'parser.ry', 17)
   def _reduce_4(val, _values, result)
-     result = Cel::Condition.new(val[0], val[2], val[4])
+     result = ternary_condition(val[0], val[2], val[4])
     result
   end
 .,.,
@@ -628,7 +839,7 @@ module_eval(<<'.,.,', 'parser.ry', 17)
 
 module_eval(<<'.,.,', 'parser.ry', 20)
   def _reduce_6(val, _values, result)
-     result = Cel::Operation.new(val[1], [val[0], val[2]])
+     result = logical_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -637,7 +848,7 @@ module_eval(<<'.,.,', 'parser.ry', 20)
 
 module_eval(<<'.,.,', 'parser.ry', 23)
   def _reduce_8(val, _values, result)
-     result = Cel::Operation.new(val[1], [val[0], val[2]])
+     result = logical_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -646,7 +857,7 @@ module_eval(<<'.,.,', 'parser.ry', 23)
 
 module_eval(<<'.,.,', 'parser.ry', 26)
   def _reduce_10(val, _values, result)
-     result = Cel::Operation.new(val[1], [val[0], val[2]])
+     result = operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -655,14 +866,14 @@ module_eval(<<'.,.,', 'parser.ry', 26)
 
 module_eval(<<'.,.,', 'parser.ry', 29)
   def _reduce_12(val, _values, result)
-     result = Cel::Operation.new(val[1], [val[0], val[2]])
+     result = math_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 30)
   def _reduce_13(val, _values, result)
-     result = Cel::Operation.new(val[1], [val[0], val[2]])
+     result = math_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -671,7 +882,7 @@ module_eval(<<'.,.,', 'parser.ry', 30)
 
 module_eval(<<'.,.,', 'parser.ry', 33)
   def _reduce_15(val, _values, result)
-     result = Cel::Operation.new(val[1], [val[0], val[2]])
+     result = math_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -682,21 +893,21 @@ module_eval(<<'.,.,', 'parser.ry', 33)
 
 module_eval(<<'.,.,', 'parser.ry', 38)
   def _reduce_18(val, _values, result)
-     result = Cel::Operation.new("!", [val[1]])
+     result = unary_operation("!", val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 39)
   def _reduce_19(val, _values, result)
-     result = Cel::Operation.new("-", [val[1]])
+     result = unary_operation("-", val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 41)
   def _reduce_20(val, _values, result)
-     result = Cel::Operation.new("!", [val[1]])
+     result = unary_operation("!", val[1])
     result
   end
 .,.,
@@ -705,7 +916,7 @@ module_eval(<<'.,.,', 'parser.ry', 41)
 
 module_eval(<<'.,.,', 'parser.ry', 44)
   def _reduce_22(val, _values, result)
-     result = Cel::Operation.new("-", [val[1]])
+     result = unary_operation("-", val[1])
     result
   end
 .,.,
@@ -716,42 +927,42 @@ module_eval(<<'.,.,', 'parser.ry', 44)
 
 module_eval(<<'.,.,', 'parser.ry', 48)
   def _reduce_25(val, _values, result)
-     result = Cel::Invoke.new(var: val[0], func: val[2])
+     result = indexing_call(val[0], val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 49)
   def _reduce_26(val, _values, result)
-     result = Cel::Invoke.new(var: val[0], func: val[2], args: [val[4]].flatten(1))
+     result = new_message(val[0], val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 50)
   def _reduce_27(val, _values, result)
-     result = Cel::Invoke.new(var: val[0], func: "[]", args: val[2])
+     result = selector_call(val[2], val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 51)
   def _reduce_28(val, _values, result)
-     result = Cel::Message.new(val[0], val[2])
+     result = receiver_call(val[2], val[0], [val[4]].flatten(1))
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 54)
   def _reduce_29(val, _values, result)
-     result = Cel::Identifier.new(val[0])
+     result = new_identifier(validated_id!(val[0]))
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 55)
   def _reduce_30(val, _values, result)
-     result = Cel::Invoke.new(func: val[0], args: [val[2]].flatten(1))
+     result = global_call(validated_id!(val[0]), val[2])
     result
   end
 .,.,
@@ -765,14 +976,14 @@ module_eval(<<'.,.,', 'parser.ry', 56)
 
 module_eval(<<'.,.,', 'parser.ry', 57)
   def _reduce_32(val, _values, result)
-     result = Cel::List.new(Array(val[1]))
+     result = new_list(val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 58)
   def _reduce_33(val, _values, result)
-     result = Cel::Map.new(Hash[val[1]])
+     result = new_map(val[1])
     result
   end
 .,.,
@@ -781,7 +992,12 @@ module_eval(<<'.,.,', 'parser.ry', 58)
 
 # reduce 35 omitted
 
-# reduce 36 omitted
+module_eval(<<'.,.,', 'parser.ry', 62)
+  def _reduce_36(val, _values, result)
+     result = val[1]
+    result
+  end
+.,.,
 
 # reduce 37 omitted
 
@@ -794,7 +1010,7 @@ module_eval(<<'.,.,', 'parser.ry', 65)
 
 module_eval(<<'.,.,', 'parser.ry', 67)
   def _reduce_39(val, _values, result)
-     result = nil
+     result = []
     result
   end
 .,.,
@@ -810,7 +1026,7 @@ module_eval(<<'.,.,', 'parser.ry', 70)
 
 module_eval(<<'.,.,', 'parser.ry', 71)
   def _reduce_42(val, _values, result)
-     [val[0]]
+     result = [val[0]]
     result
   end
 .,.,
@@ -826,77 +1042,77 @@ module_eval(<<'.,.,', 'parser.ry', 73)
 
 module_eval(<<'.,.,', 'parser.ry', 76)
   def _reduce_45(val, _values, result)
-     result = val[0].merge(Cel::Identifier.new(val[2]) => val[4])
+     result = val[0].merge(new_identifier(val[2]) => val[4])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 77)
   def _reduce_46(val, _values, result)
-     result = { Cel::Identifier.new(val[0]) => val[2] }
+     result = { new_identifier(val[0]) => val[2] }
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 79)
   def _reduce_47(val, _values, result)
-     val[0][val[2]] = val[4]; result = val[0]
+     val[0] << [val[2], val[4]]; result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 80)
   def _reduce_48(val, _values, result)
-     result = { val[0] => val[2] }
+     result = [[val[0], val[2]]]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 82)
   def _reduce_49(val, _values, result)
-     result = Cel::Number.new(:int, val[0])
+     result = literal_int(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 83)
   def _reduce_50(val, _values, result)
-     result = Cel::Number.new(:uint, val[0])
+     result = literal_uint(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 84)
   def _reduce_51(val, _values, result)
-     result = Cel::Number.new(:double, val[0])
+     result = literal_double(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 85)
   def _reduce_52(val, _values, result)
-     result = Cel::Bool.new(val[0])
+     result = literal_bool(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 86)
   def _reduce_53(val, _values, result)
-     result = Cel::Null.new()
+     result = literal_null
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 87)
   def _reduce_54(val, _values, result)
-     result = Cel::String.new(val[0])
+     result = literal_string(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 88)
   def _reduce_55(val, _values, result)
-     result = Cel::Bytes.new(val[0])
+     result = literal_bytes(val[0])
     result
   end
 .,.,