hcl-checker 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 195128a0325ac3b7fa3add01a739dbe3ce0aeb5b3314edfc74d195caa3a0aa61
-  data.tar.gz: ab84f84386083bdbb9aaea917716ea7e8462eaed2b89a2ab4f887fb4c3b2ee93
+  metadata.gz: cb47986f7941e27c8c23509a32796a30c309af1341c7aac468acac3c33efaa26
+  data.tar.gz: a90c767872e02d7f6b94d044a8750969d1c1ec5236c565be051a7a8cc7b1889d
 SHA512:
-  metadata.gz: b53587ad90fa9ed3cf6c2fbfd5cad15f6b526e62e5c63298fbd963a1629d6283a0bac0ab7276674acba8a1d67e38bc2118fe8f9a0a11a5d362afef4957cc745a
-  data.tar.gz: 4d908d23f548138a2e4e876709cda19321650203d13219f8ac8fe3748cd1427e628f9cb834f80bf684252a7d06d9a97d72663f3ac6c19699a0149593e3450a0d
+  metadata.gz: 9efd2312d2ff19fb9518259689491ac616923ab1df6a7eaa922d3d72e2b92a97583c3f56065c43d5bcd8660a2ec3f520df828480bfb209d1b04ab34d187e1ca8
+  data.tar.gz: c4446a6f7b85a90fd1eb4157d5c4dbe8522497309fbe53ac63b66b66b6612a88f354028ecc074f8c7dda45e6802a21be0aca02767d9f2f1277eed509178d8e02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hcl-checker (1.4.0)
+    hcl-checker (1.5.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -47,21 +47,21 @@ You can validate the `hcl_string` contents with `valid?` method. This will
 return `true` if is a valid HCL or `false` if not.
 
 ```
-2.3.2 :014 > HCL1::Checker.valid? hcl_string
+2.3.2 :014 > HCL::Checker.valid? hcl_string
  => true
 ```
 
 You can parse the `hcl_string` into a `Hash` with `parse` method.
 
 ```
-2.3.2 :015 > HCL1::Checker.parse(hcl_string)
+2.3.2 :015 > HCL::Checker.parse(hcl_string)
  => {"provider"=>{"aws"=>{"region"=>"${var.aws_region}", "access_key"=>"${var.aws_access_key}", "secret_key"=>"${var.aws_secret_key}"}}, "resource"=>{"aws_vpc"=>{"default"=>{"cidr_block"=>"10.0.0.0/16", "enable_dns_hostnames"=>true, "tags"=>{"Name"=>"Event Store VPC"}}}}}
 ```
 
 If after a `parse` you got `false` you can check `last_error` with:
 
 ```
-2.4.2 :063 > HCL1::Checker.last_error
+2.4.2 :063 > HCL::Checker.last_error
  => "Parse error at  \"eec8b16c-ee89-4ea0-bdcc-d094300a42e8\" , (invalid token: ,)"
 ```
 

data/Rakefile

@@ -16,4 +16,3 @@ task :build_grammar do
   `racc ./assets/parse.y -o ./lib/hcl/parser.rb`
   print "....done\n\n"
 end
-

data/assets/lexer.rex

@@ -2,7 +2,7 @@
 class HCLLexer
 option
   independent
-  
+
 macro
   NEWLINE               \n|\r
   BLANK                 \s+
@@ -20,6 +20,8 @@ macro
   RIGHTBRACE            \}
   LEFTBRACKET           \[
   RIGHTBRACKET          \]
+  LEFTPARENTHESES       \(
+  RIGHTPARENTHESES      \)
   HEREDOCUMENT          \<<\-?
 
 rule
@@ -36,17 +38,18 @@ rule
                 {QUOTE}                   { [:STRING,       consume_string(text)] }
                 {HEREDOCUMENT}            { [:STRING,       consume_heredoc] }
 #-------------------------------------------------------------------------------
-                {LEFTBRACE}               { [:LEFTBRACE,    text]}
-                {RIGHTBRACE}              { [:RIGHTBRACE,   text]}
-                {LEFTBRACKET}             { [:LEFTBRACKET,  text]}
-                {RIGHTBRACKET}            { [:RIGHTBRACKET, text]}
+                {LEFTBRACE}               { [:LEFTBRACE,        text]}
+                {RIGHTBRACE}              { [:RIGHTBRACE,       text]}
+                {LEFTBRACKET}             { [:LEFTBRACKET,      text]}
+                {RIGHTBRACKET}            { [:RIGHTBRACKET,     text]}
+                {LEFTPARENTHESES}         { [:LEFTPARENTHESES,  text]}
+                {RIGHTPARENTHESES}        { [:RIGHTPARENTHESES, text]}
 #-------------------------------------------------------------------------------
                 {COMMA}                   { [:COMMA,        text]}
                 {IDENTIFIER}              { [:IDENTIFIER,   text]}
                 {EQUAL}                   { [:EQUAL,        text]}
                 {MINUS}                   { [:MINUS,        text]}
 
-
 inner
 
   def lex(input)

data/assets/parse.y

@@ -12,6 +12,8 @@ token BOOL
       RIGHTBRACE
       LEFTBRACKET
       RIGHTBRACKET
+      LEFTPARENTHESES
+      RIGHTPARENTHESES
       PERIOD
       EPLUS
       EMINUS
@@ -24,7 +26,6 @@ rule
   |  objectlist
   ;
 
-
   objectlist:
      objectitem COMMA
        { result = [val[0]] }
@@ -61,6 +62,10 @@ rule
        { result = val[0], val[2] }
   |  objectkey EQUAL list
        { result = val[0], val[2] }
+  |  objectkey EQUAL IDENTIFIER LEFTPARENTHESES IDENTIFIER RIGHTPARENTHESES
+       { result = val[0], "#{val[2]}(#{val[4]})" }
+  |  objectkey EQUAL IDENTIFIER
+       { result = val[0], val[2] }
   |  block
        { result = val[0] }
   ;

data/hcl-checker.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_development_dependency 'bundler', '~> 2.1.4'
   spec.add_development_dependency 'rake', '~> 12.3.3'
@@ -26,26 +27,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rexical', '>= 1.0.7'
 
   spec.post_install_message = %q{
-Hello, I am updating this Gem to support version 2.0 of the HCL.
-
-In the meantime, it is important that you know that there will be a
-compatibility break with the current version, for Gem to support both
-versions.
-
-Therefore, instead of using just HCL::Checker you must tell which
-version you are using, like this:
-
-HCL1::Checker
-
-Or
-
-HCL2::Checker
-
-At the moment both HCL::Checker and HCL1::Checker will work, but with
-the release of support for version 2 the HCL::Checker syntax will no
-longer work.
-
-So, update your code.
+Hello, me again. After several contacts of users of this gem requesting that
+the module name be kept only as HCL, instead of HCL1 and HCL2, I went back and
+kept it. Sorry for those who eventually switched from HCL to HCL1. And thanks to
+everyone who got in touch justifying why my change would be bad for all users.
 
 Thank you :)
 }

data/lib/hcl/checker.rb

@@ -4,18 +4,24 @@ require_relative 'parser'
 
 module HCL
   module Checker
-    def self.valid?(value)
-      ret = HCLParser.new.parse(value)
-      return true if ret.is_a? Hash
-      false
-    rescue
-      false
-    end
+    class << self
+      attr_accessor :last_error
+
+      def valid?(value)
+        ret = HCLParser.new.parse(value)
+        return true if ret.is_a? Hash
+        false
+      rescue Racc::ParseError => e
+        @last_error = e.message
+        false
+      end
 
-    def self.parse(value)
-      HCLParser.new.parse(value)
-    rescue Racc::ParseError => e
-      return e.message
+      def parse(value)
+        HCLParser.new.parse(value)
+      rescue Racc::ParseError => e
+        @last_error = e.message
+        return e.message
+      end
     end
   end
 end

data/lib/hcl/checker/version.rb

@@ -1,5 +1,5 @@
 module HCL
   module Checker
-    VERSION = '1.4.0'
+    VERSION = '1.5.0'
   end
 end

data/lib/hcl/lexer.rb

@@ -85,16 +85,22 @@ class HCLLexer
                      action { [:STRING,       consume_heredoc] }
 
                   when (text = @ss.scan(/\{/))
-                     action { [:LEFTBRACE,    text]}
+                     action { [:LEFTBRACE,        text]}
 
                   when (text = @ss.scan(/\}/))
-                     action { [:RIGHTBRACE,   text]}
+                     action { [:RIGHTBRACE,       text]}
 
                   when (text = @ss.scan(/\[/))
-                     action { [:LEFTBRACKET,  text]}
+                     action { [:LEFTBRACKET,      text]}
 
                   when (text = @ss.scan(/\]/))
-                     action { [:RIGHTBRACKET, text]}
+                     action { [:RIGHTBRACKET,     text]}
+
+                  when (text = @ss.scan(/\(/))
+                     action { [:LEFTPARENTHESES,  text]}
+
+                  when (text = @ss.scan(/\)/))
+                     action { [:RIGHTPARENTHESES, text]}
 
                   when (text = @ss.scan(/\,/))
                      action { [:COMMA,        text]}

data/lib/hcl/parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.14
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.5.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -10,7 +10,7 @@ require_relative './lexer'
 
 class HCLParser < Racc::Parser
 
-module_eval(<<'...end parse.y/module_eval...', 'parse.y', 123)
+module_eval(<<'...end parse.y/module_eval...', 'parse.y', 128)
   #//
   #//       HCL is unclear on what one should do when duplicate
   #//       keys are encountered.
@@ -69,87 +69,91 @@ module_eval(<<'...end parse.y/module_eval...', 'parse.y', 123)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    22,    28,    27,    10,    28,    27,     5,    23,     6,    14,
-    35,    26,    14,    12,    26,    32,    28,    27,    40,     5,
-   -10,     6,    35,     5,    14,     6,    26,    39,    30,     5,
-   -11,     6,    13,    17,    38,    18,    19,    14,    20 ]
+    22,    29,    28,    10,    12,    26,    43,    23,     5,    14,
+     6,    27,    29,    28,     5,    42,     6,   -10,    37,    31,
+    14,   -11,    27,    34,    29,    28,     5,     5,     6,     6,
+    37,    40,    14,    17,    27,    18,    13,    14,    19,    20,
+    32,    41,    44 ]
 
 racc_action_check = [
-    13,    13,    13,     1,    26,    26,     0,    13,     0,    13,
-    26,    13,    26,     4,    26,    26,    40,    40,    31,     3,
-     5,     3,    40,    14,    40,    14,    40,    31,    14,    29,
-     6,    29,     7,     9,    29,     9,    10,     9,    11 ]
+    13,    13,    13,     1,     4,    13,    33,    13,     0,    13,
+     0,    13,    27,    27,    14,    33,    14,     5,    27,    14,
+    27,     6,    27,    27,    43,    43,    30,     3,    30,     3,
+    43,    30,    43,     9,    43,     9,     7,     9,    10,    11,
+    26,    32,    41 ]
 
 racc_action_pointer = [
-    -1,     3,   nil,    12,     8,    12,    22,    24,   nil,    26,
-    36,    33,   nil,    -2,    16,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     1,   nil,   nil,    22,
-   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    13,   nil ]
+     1,     3,   nil,    20,    -1,     9,    13,    28,   nil,    26,
+    38,    34,   nil,    -2,     7,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    25,     9,   nil,   nil,
+    19,   nil,    34,     1,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    26,   nil,    21,   nil,   nil ]
 
 racc_action_default = [
-    -2,   -33,    -1,    -3,    -5,   -20,   -21,   -33,   -17,   -33,
-   -33,    -7,    -4,   -33,   -33,   -18,   -19,   -20,   -21,    42,
-    -6,   -12,   -13,   -14,   -15,   -16,   -33,   -31,   -32,   -33,
-    -9,   -33,   -23,   -24,   -27,   -28,   -29,   -30,    -8,   -22,
-   -26,   -25 ]
+    -2,   -35,    -1,    -3,    -5,   -22,   -23,   -35,   -19,   -35,
+   -35,    -7,    -4,   -35,   -35,   -20,   -21,   -22,   -23,    46,
+    -6,   -12,   -13,   -14,   -15,   -16,   -18,   -35,   -33,   -34,
+   -35,    -9,   -35,   -35,   -25,   -26,   -29,   -30,   -31,   -32,
+    -8,   -35,   -24,   -28,   -17,   -27 ]
 
 racc_goto_table = [
-    11,     3,    33,    15,     1,     2,    21,    24,    25,    16,
-    31,   nil,   nil,   nil,   nil,    29,    41,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    11 ]
+    11,    35,     3,    15,     1,     2,    21,    24,    25,    16,
+    33,   nil,   nil,   nil,   nil,   nil,    30,    45,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    11 ]
 
 racc_goto_check = [
-     4,     3,    12,     5,     1,     2,     7,     5,     8,     9,
-    11,   nil,   nil,   nil,   nil,     3,    12,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     4 ]
+     4,    12,     3,     5,     1,     2,     7,     5,     8,     9,
+    11,   nil,   nil,   nil,   nil,   nil,     3,    12,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4 ]
 
 racc_goto_pointer = [
-   nil,     4,     5,     1,    -3,    -6,   nil,    -7,    -5,     0,
-   nil,   -16,   -24 ]
+   nil,     4,     5,     2,    -3,    -6,   nil,    -7,    -5,     0,
+   nil,   -17,   -26 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,     4,    37,     7,    34,    36,     8,
+   nil,   nil,   nil,   nil,     4,    39,     7,    36,    38,     8,
      9,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 19, :_reduce_1,
-  0, 20, :_reduce_2,
-  1, 20, :_reduce_none,
-  2, 21, :_reduce_4,
-  1, 21, :_reduce_5,
-  3, 21, :_reduce_6,
-  2, 21, :_reduce_7,
-  3, 23, :_reduce_8,
-  2, 23, :_reduce_9,
-  1, 24, :_reduce_10,
-  1, 24, :_reduce_11,
-  3, 22, :_reduce_12,
-  3, 22, :_reduce_13,
-  3, 22, :_reduce_14,
-  3, 22, :_reduce_15,
-  3, 22, :_reduce_16,
-  1, 22, :_reduce_17,
-  2, 27, :_reduce_18,
-  2, 27, :_reduce_19,
-  1, 28, :_reduce_20,
-  1, 28, :_reduce_21,
-  3, 26, :_reduce_22,
-  2, 26, :_reduce_23,
-  1, 29, :_reduce_24,
-  3, 29, :_reduce_25,
-  2, 29, :_reduce_26,
-  1, 30, :_reduce_27,
-  1, 30, :_reduce_28,
-  1, 30, :_reduce_29,
-  1, 30, :_reduce_30,
-  1, 25, :_reduce_31,
-  1, 25, :_reduce_32 ]
-
-racc_reduce_n = 33
-
-racc_shift_n = 42
+  1, 21, :_reduce_1,
+  0, 22, :_reduce_2,
+  1, 22, :_reduce_none,
+  2, 23, :_reduce_4,
+  1, 23, :_reduce_5,
+  3, 23, :_reduce_6,
+  2, 23, :_reduce_7,
+  3, 25, :_reduce_8,
+  2, 25, :_reduce_9,
+  1, 26, :_reduce_10,
+  1, 26, :_reduce_11,
+  3, 24, :_reduce_12,
+  3, 24, :_reduce_13,
+  3, 24, :_reduce_14,
+  3, 24, :_reduce_15,
+  3, 24, :_reduce_16,
+  6, 24, :_reduce_17,
+  3, 24, :_reduce_18,
+  1, 24, :_reduce_19,
+  2, 29, :_reduce_20,
+  2, 29, :_reduce_21,
+  1, 30, :_reduce_22,
+  1, 30, :_reduce_23,
+  3, 28, :_reduce_24,
+  2, 28, :_reduce_25,
+  1, 31, :_reduce_26,
+  3, 31, :_reduce_27,
+  2, 31, :_reduce_28,
+  1, 32, :_reduce_29,
+  1, 32, :_reduce_30,
+  1, 32, :_reduce_31,
+  1, 32, :_reduce_32,
+  1, 27, :_reduce_33,
+  1, 27, :_reduce_34 ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 46
 
 racc_token_table = {
   false => 0,
@@ -167,11 +171,13 @@ racc_token_table = {
   :RIGHTBRACE => 12,
   :LEFTBRACKET => 13,
   :RIGHTBRACKET => 14,
-  :PERIOD => 15,
-  :EPLUS => 16,
-  :EMINUS => 17 }
+  :LEFTPARENTHESES => 15,
+  :RIGHTPARENTHESES => 16,
+  :PERIOD => 17,
+  :EPLUS => 18,
+  :EMINUS => 19 }
 
-racc_nt_base = 18
+racc_nt_base = 20
 
 racc_use_result_var = true
 
@@ -207,6 +213,8 @@ Racc_token_to_s_table = [
   "RIGHTBRACE",
   "LEFTBRACKET",
   "RIGHTBRACKET",
+  "LEFTPARENTHESES",
+  "RIGHTPARENTHESES",
   "PERIOD",
   "EPLUS",
   "EMINUS",
@@ -230,221 +238,235 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'parse.y', 19)
+module_eval(<<'.,.,', 'parse.y', 21)
   def _reduce_1(val, _values, result)
      @result = flatten_objectlist(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 22)
+module_eval(<<'.,.,', 'parse.y', 24)
   def _reduce_2(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 # reduce 3 omitted
 
-module_eval(<<'.,.,', 'parse.y', 29)
+module_eval(<<'.,.,', 'parse.y', 30)
   def _reduce_4(val, _values, result)
-     result = [val[0]] 
+     result = [val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 31)
+module_eval(<<'.,.,', 'parse.y', 32)
   def _reduce_5(val, _values, result)
-     result = [val[0]] 
+     result = [val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 33)
+module_eval(<<'.,.,', 'parse.y', 34)
   def _reduce_6(val, _values, result)
-     result = val[0] << val[1]  
+     result = val[0] << val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 35)
+module_eval(<<'.,.,', 'parse.y', 36)
   def _reduce_7(val, _values, result)
-     result = val[0] << val[1]  
+     result = val[0] << val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 40)
+module_eval(<<'.,.,', 'parse.y', 41)
   def _reduce_8(val, _values, result)
-     result = flatten_objectlist(val[1]) 
+     result = flatten_objectlist(val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 42)
+module_eval(<<'.,.,', 'parse.y', 43)
   def _reduce_9(val, _values, result)
-     return 
+     return
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 47)
+module_eval(<<'.,.,', 'parse.y', 48)
   def _reduce_10(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 49)
+module_eval(<<'.,.,', 'parse.y', 50)
   def _reduce_11(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 54)
+module_eval(<<'.,.,', 'parse.y', 55)
   def _reduce_12(val, _values, result)
-     result = val[0], val[2] 
+     result = val[0], val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 56)
+module_eval(<<'.,.,', 'parse.y', 57)
   def _reduce_13(val, _values, result)
-     result = val[0], val[2] 
+     result = val[0], val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 58)
+module_eval(<<'.,.,', 'parse.y', 59)
   def _reduce_14(val, _values, result)
-     result = val[0], val[2] 
+     result = val[0], val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 60)
+module_eval(<<'.,.,', 'parse.y', 61)
   def _reduce_15(val, _values, result)
-     result = val[0], val[2] 
+     result = val[0], val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 62)
+module_eval(<<'.,.,', 'parse.y', 63)
   def _reduce_16(val, _values, result)
-     result = val[0], val[2] 
+     result = val[0], val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 64)
+module_eval(<<'.,.,', 'parse.y', 65)
   def _reduce_17(val, _values, result)
-     result = val[0] 
+     result = val[0], "#{val[2]}(#{val[4]})"
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 69)
+module_eval(<<'.,.,', 'parse.y', 67)
   def _reduce_18(val, _values, result)
-     result = val[0], val[1] 
+     result = val[0], val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 71)
+module_eval(<<'.,.,', 'parse.y', 69)
   def _reduce_19(val, _values, result)
-     result = val[0], {val[1][0] => val[1][1]} 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 76)
+module_eval(<<'.,.,', 'parse.y', 74)
   def _reduce_20(val, _values, result)
-     result = val[0] 
+     result = val[0], val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 78)
+module_eval(<<'.,.,', 'parse.y', 76)
   def _reduce_21(val, _values, result)
-     result = val[0] 
+     result = val[0], {val[1][0] => val[1][1]}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 83)
+module_eval(<<'.,.,', 'parse.y', 81)
   def _reduce_22(val, _values, result)
-     result = val[1] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 85)
+module_eval(<<'.,.,', 'parse.y', 83)
   def _reduce_23(val, _values, result)
-     return 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 90)
+module_eval(<<'.,.,', 'parse.y', 88)
   def _reduce_24(val, _values, result)
-     result = [val[0]] 
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 92)
+module_eval(<<'.,.,', 'parse.y', 90)
   def _reduce_25(val, _values, result)
-     result = val[0] << val[2] 
+     return
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 94)
+module_eval(<<'.,.,', 'parse.y', 95)
   def _reduce_26(val, _values, result)
-     result = val[0] 
+     result = [val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 99)
+module_eval(<<'.,.,', 'parse.y', 97)
   def _reduce_27(val, _values, result)
-     result = val[0] 
+     result = val[0] << val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 101)
+module_eval(<<'.,.,', 'parse.y', 99)
   def _reduce_28(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 103)
+module_eval(<<'.,.,', 'parse.y', 104)
   def _reduce_29(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 105)
+module_eval(<<'.,.,', 'parse.y', 106)
   def _reduce_30(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 110)
+module_eval(<<'.,.,', 'parse.y', 108)
   def _reduce_31(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 112)
+module_eval(<<'.,.,', 'parse.y', 110)
   def _reduce_32(val, _values, result)
-     result = val[0] 
+     result = val[0]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parse.y', 115)
+  def _reduce_33(val, _values, result)
+     result = val[0]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parse.y', 117)
+  def _reduce_34(val, _values, result)
+     result = val[0]
     result
   end
 .,.,