mvinl 0.1.4 → 0.1.6

data/syntax/mvinl.tab.rb

@@ -8,22 +8,13 @@ require 'racc/parser.rb'
 module MVinl
   class Program < Racc::Parser
 
-module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 112)
-
-  FUNCTIONS = {}
-  STATE = {
-    in_prop: false,
-    in_keyword_arg: false,
-    keyword_arg_depth: 0,
-    depth: 0
-  }
-
+module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 144)
   class MVinl::ParserError < StandardError; end
 
   private
 
   def create_property(id, positional_args = [], keyword_args = {})
-    STATE[:in_prop] = false
+    @context.state[:in_prop] = false
     {id => [positional_args, keyword_args]}
   end
 
@@ -31,9 +22,12 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 112)
     properties ||  Hash.new
   end
 
-  def define_function(name, args, body)
-  FUNCTIONS[name.to_sym] = {args: args, body: body}
-    nil
+  def evaluate_const(const_name)
+    MVinl::Context::CONSTANTS[const_name]
+  end
+
+  def evaluate_var(var_name)
+    @context.variables[var_name]
   end
 
   def evaluate_pn(operator, operands, context = {})
@@ -47,14 +41,22 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 112)
       end
     end
 
-    if FUNCTIONS.key?(operator)
-      function = FUNCTIONS[operator]
+    if @context.functions.key?(operator)
+      function = @context.functions[operator]
       raise MVinl::ParserError, "Argument mismatch for #{operator}" if operands.size != function[:args].size
 
       # Map arguments to operands
       new_context = function[:args].zip(operands).to_h
       # Replace symbols in body with context values
       function = replace_symbols(function[:body], new_context)
+      # Evaluate variables
+      function.map! do |e|
+        if e.is_a? Hash
+	  e[:var] ? evaluate_var(e[:var]) : evaluate_const(e[:con])
+	else
+	  e
+	end
+      end
       # Recursive evaluation
       evaluate_pn(function[0], function[1..], new_context)
     else
@@ -81,137 +83,166 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 112)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    -9,     8,    -9,    -9,    -9,    11,     2,    15,     5,     6,
-    15,    -9,    28,    29,    41,    15,    -9,     7,    24,    25,
-    27,    28,    29,    17,    11,    41,    15,    37,    15,    24,
-    25,    27,    28,    29,    43,    11,    43,    54,   nil,    15,
-    24,    25,    27,    28,    29,   nil,    11,    43,    54,   nil,
-    15,    24,    25,    27,    28,    29,   nil,    11,    43,   nil,
-   nil,    15,    24,    25,    27,    28,    29,   nil,    11,    43,
-   nil,   nil,    15,   -15,    24,    25,    27,    28,    29,   nil,
-    11,    24,    25,    27,    28,    29,   nil,    11 ]
+   -16,    15,   -16,   -16,   -16,   -16,   -16,     2,    19,     8,
+    10,    12,    13,    29,    30,   -16,    41,    19,    41,    19,
+   -16,    32,    14,    23,    24,    25,    26,    28,    29,    30,
+    36,    32,    52,    55,    19,    19,    23,    24,    25,    26,
+    28,    29,    30,    19,    32,    52,    55,    50,    19,    61,
+    62,    25,    26,    28,    29,    30,    52,    32,   nil,   nil,
+   nil,    19,    61,    62,    25,    26,    28,    29,    30,   nil,
+    32,    52,   nil,   nil,    19,    61,    62,    25,    26,    28,
+    29,    30,   nil,    32,    52,   nil,   nil,    19,   -22,    23,
+    24,    25,    26,    28,    29,    30,   nil,    32,    23,    24,
+    25,    26,    28,    29,    30,   nil,    32,    23,    24,    25,
+    26,    28,    29,    30,   nil,    32,    23,    24,    25,    26,
+    28,    29,    30,   nil,    32 ]
 
 racc_action_check = [
-    13,     2,    13,    13,    13,     7,     1,     9,     1,     1,
-    10,    13,    29,    29,    30,    30,    13,     1,    19,    19,
-    19,    19,    19,    12,    19,    32,    32,    20,    19,    47,
-    47,    47,    47,    47,    31,    47,    47,    47,   nil,    47,
-    48,    48,    48,    48,    48,   nil,    48,    48,    48,   nil,
-    48,    49,    49,    49,    49,    49,   nil,    49,    49,   nil,
-   nil,    49,    50,    50,    50,    50,    50,   nil,    50,    50,
-   nil,   nil,    50,    18,    18,    18,    18,    18,    18,   nil,
-    18,    36,    36,    36,    36,    36,   nil,    36 ]
+    17,     2,    17,    17,    17,    17,    17,     1,     4,     1,
+     1,     1,     1,    30,    30,    17,    31,    31,    58,    58,
+    17,    14,     1,    45,    45,    45,    45,    45,    45,    45,
+    16,    45,    45,    45,    34,    45,    46,    46,    46,    46,
+    46,    46,    46,    35,    46,    46,    46,    43,    46,    47,
+    47,    47,    47,    47,    47,    47,    57,    47,   nil,   nil,
+   nil,    47,    67,    67,    67,    67,    67,    67,    67,   nil,
+    67,    67,   nil,   nil,    67,    68,    68,    68,    68,    68,
+    68,    68,   nil,    68,    68,   nil,   nil,    68,    37,    37,
+    37,    37,    37,    37,    37,    37,   nil,    37,     9,     9,
+     9,     9,     9,     9,     9,   nil,     9,    11,    11,    11,
+    11,    11,    11,    11,   nil,    11,    49,    49,    49,    49,
+    49,    49,    49,   nil,    49 ]
 
 racc_action_pointer = [
-   nil,     6,     1,   nil,   nil,   nil,   nil,    -7,   nil,    -9,
-    -6,   nil,    19,     0,   nil,   nil,   nil,   nil,    68,    12,
-    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     3,
-    -1,    21,    10,   nil,   nil,   nil,    75,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,    34,    45,
-    56,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,     7,     1,   nil,   -12,   nil,   nil,   nil,   nil,    90,
+   nil,    99,   nil,   nil,     5,   nil,    24,     0,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     0,    -3,   nil,   nil,    14,    23,   nil,    81,   nil,   nil,
+   nil,   nil,   nil,    40,   nil,    15,    28,    41,   nil,   108,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    39,    -1,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    54,    67,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-    -1,   -44,   -44,    -2,    -3,    -4,    -6,   -44,    59,    -5,
-   -44,   -32,    -7,   -13,   -12,   -43,   -34,    -8,   -10,   -44,
-   -11,   -14,   -19,   -20,   -21,   -22,   -23,   -24,   -25,   -44,
-   -44,   -37,   -44,   -35,   -36,   -16,   -44,   -18,   -26,   -38,
-   -38,   -42,   -27,   -33,   -34,   -34,   -17,   -44,   -44,   -44,
-   -44,   -30,   -39,   -40,   -41,   -31,   -28,   -37,   -29 ]
+    -1,   -13,   -55,    -2,    -3,    -4,    -5,    -6,    -7,   -55,
+    -9,   -55,   -11,   -13,   -55,    72,   -14,   -20,   -19,   -54,
+    -8,   -26,   -27,   -28,   -29,   -30,   -31,   -32,   -33,   -34,
+   -55,   -55,   -41,   -10,   -12,   -55,   -15,   -17,   -35,   -49,
+   -49,   -53,   -43,   -18,   -21,   -55,   -55,   -55,   -23,   -55,
+   -25,   -39,   -42,   -50,   -51,   -52,   -40,   -48,   -55,   -44,
+   -45,   -46,   -47,   -24,   -36,   -43,   -43,   -55,   -55,   -37,
+   -48,   -38 ]
 
 racc_goto_table = [
-    10,    14,    16,    34,    40,    21,    45,    19,     1,    42,
-    47,    48,    32,     3,     4,     9,    12,    13,    18,    20,
-    35,    36,    39,    46,    44,    51,    55,    56,    58,    38,
-    31,   nil,   nil,    34,    34,    49,    50,   nil,   nil,    53,
-    53,   nil,    32,    32 ]
+    18,    40,    35,    60,    20,     4,    33,    45,    46,     1,
+    47,     3,     5,     6,    51,    56,     7,    34,     9,    11,
+    37,    43,    48,    60,    60,    49,    64,    39,    66,    38,
+    18,    42,    44,    67,    68,    58,    69,    71,    57,   nil,
+   nil,    54,    54,   nil,    63,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    65,    58,    58 ]
 
 racc_goto_check = [
-    16,     9,     9,    13,    20,    10,    20,    17,     1,    19,
-    21,    21,    16,     2,     3,     4,     5,     6,     7,     8,
-    11,    12,     9,    10,     9,    19,    19,    19,    19,    15,
-    18,   nil,   nil,    13,    13,    17,    17,   nil,   nil,     9,
-     9,   nil,    16,    16 ]
+    14,    24,    20,    17,     8,     3,     8,    25,    25,     1,
+    21,     2,     4,     5,    23,    23,     6,     3,     7,     9,
+    12,    13,    15,    17,    17,    16,    23,    14,    24,    19,
+    14,    14,     8,    21,    21,    20,    23,    23,    22,   nil,
+   nil,    14,    14,   nil,     8,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    14,    20,    20 ]
 
 racc_goto_pointer = [
-   nil,     8,    12,    13,     9,     7,     8,     5,     1,    -8,
-   -13,     0,     1,   -16,   nil,     0,    -7,    -9,    11,   -22,
-   -26,   -29 ]
+   nil,     9,    10,     4,    11,    12,    15,    17,    -5,    18,
+   nil,   nil,     3,   -16,    -4,   -21,   -18,   -44,   nil,    -1,
+   -12,   -32,    -9,   -31,   -30,   -32 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33,
-    52,   nil,   nil,    22,    23,    26,    30,   nil,    57,   nil,
-   nil,   nil ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,   nil,
+    16,    17,   nil,   nil,    59,   nil,   nil,    21,    22,    27,
+    31,   nil,    70,   nil,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  0, 18, :_reduce_1,
-  2, 18, :_reduce_2,
-  2, 18, :_reduce_3,
-  2, 18, :_reduce_4,
-  2, 19, :_reduce_5,
-  0, 21, :_reduce_6,
-  2, 21, :_reduce_7,
-  3, 21, :_reduce_8,
-  1, 22, :_reduce_9,
-  2, 22, :_reduce_10,
-  3, 22, :_reduce_11,
-  1, 23, :_reduce_12,
+  0, 22, :_reduce_1,
+  2, 22, :_reduce_2,
+  2, 22, :_reduce_3,
+  2, 22, :_reduce_4,
+  2, 22, :_reduce_5,
+  2, 22, :_reduce_6,
+  2, 22, :_reduce_7,
+  2, 26, :_reduce_8,
+  1, 28, :_reduce_9,
+  2, 25, :_reduce_10,
+  1, 30, :_reduce_11,
+  2, 23, :_reduce_12,
   0, 24, :_reduce_13,
   2, 24, :_reduce_14,
-  0, 25, :_reduce_15,
-  2, 25, :_reduce_16,
-  2, 28, :_reduce_17,
-  1, 29, :_reduce_18,
-  1, 27, :_reduce_19,
-  1, 27, :_reduce_20,
-  1, 30, :_reduce_21,
-  1, 30, :_reduce_22,
-  1, 30, :_reduce_23,
-  1, 30, :_reduce_24,
-  1, 32, :_reduce_25,
-  2, 32, :_reduce_26,
-  6, 20, :_reduce_27,
-  4, 35, :_reduce_28,
-  4, 35, :_reduce_29,
-  4, 31, :_reduce_30,
-  4, 31, :_reduce_31,
-  1, 33, :_reduce_32,
-  1, 36, :_reduce_33,
-  0, 34, :_reduce_34,
-  2, 34, :_reduce_35,
-  2, 34, :_reduce_36,
-  2, 34, :_reduce_37,
-  0, 38, :_reduce_38,
-  2, 38, :_reduce_39,
-  2, 38, :_reduce_40,
-  2, 38, :_reduce_41,
-  1, 37, :_reduce_42,
-  1, 26, :_reduce_43 ]
-
-racc_reduce_n = 44
-
-racc_shift_n = 59
+  3, 24, :_reduce_15,
+  1, 31, :_reduce_16,
+  2, 31, :_reduce_17,
+  3, 31, :_reduce_18,
+  1, 32, :_reduce_19,
+  0, 33, :_reduce_20,
+  2, 33, :_reduce_21,
+  0, 34, :_reduce_22,
+  2, 34, :_reduce_23,
+  2, 36, :_reduce_24,
+  1, 37, :_reduce_25,
+  1, 29, :_reduce_26,
+  1, 29, :_reduce_27,
+  1, 29, :_reduce_28,
+  1, 29, :_reduce_29,
+  1, 38, :_reduce_30,
+  1, 38, :_reduce_31,
+  1, 38, :_reduce_32,
+  1, 38, :_reduce_33,
+  1, 40, :_reduce_34,
+  2, 40, :_reduce_35,
+  6, 27, :_reduce_36,
+  4, 43, :_reduce_37,
+  4, 43, :_reduce_38,
+  4, 39, :_reduce_39,
+  4, 39, :_reduce_40,
+  1, 41, :_reduce_41,
+  1, 44, :_reduce_42,
+  0, 42, :_reduce_43,
+  2, 42, :_reduce_44,
+  2, 42, :_reduce_45,
+  2, 42, :_reduce_46,
+  2, 42, :_reduce_47,
+  2, 42, :_reduce_48,
+  0, 46, :_reduce_49,
+  2, 46, :_reduce_50,
+  2, 46, :_reduce_51,
+  2, 46, :_reduce_52,
+  1, 45, :_reduce_53,
+  1, 35, :_reduce_54 ]
+
+racc_reduce_n = 55
+
+racc_shift_n = 72
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :EOS => 2,
-  :GROUP => 3,
-  :END_TAG => 4,
-  :KEYWORD_ARG => 5,
-  :NUMBER => 6,
-  :FLOAT => 7,
-  :SYMBOL => 8,
-  :STRING => 9,
-  :MULTILINE_STRING => 10,
-  :DEF => 11,
-  :OPEN_PAREN => 12,
-  :CLOSE_PAREN => 13,
-  :polish_notation => 14,
-  :OPER => 15,
-  :ID => 16 }
-
-racc_nt_base = 17
+  :VARIABLE => 3,
+  :CONSTANT => 4,
+  :GROUP => 5,
+  :END_TAG => 6,
+  :KEYWORD_ARG => 7,
+  :CONSTANT_CALL => 8,
+  :VARIABLE_CALL => 9,
+  :NUMBER => 10,
+  :FLOAT => 11,
+  :SYMBOL => 12,
+  :STRING => 13,
+  :MULTILINE_STRING => 14,
+  :DEF => 15,
+  :OPEN_PAREN => 16,
+  :CLOSE_PAREN => 17,
+  :polish_notation => 18,
+  :OPER => 19,
+  :ID => 20 }
+
+racc_nt_base = 21
 
 racc_use_result_var = false
 
@@ -236,9 +267,13 @@ Racc_token_to_s_table = [
   "$end",
   "error",
   "EOS",
+  "VARIABLE",
+  "CONSTANT",
   "GROUP",
   "END_TAG",
   "KEYWORD_ARG",
+  "CONSTANT_CALL",
+  "VARIABLE_CALL",
   "NUMBER",
   "FLOAT",
   "SYMBOL",
@@ -253,14 +288,18 @@ Racc_token_to_s_table = [
   "$start",
   "program",
   "group",
-  "function_def",
   "properties",
+  "constant_def",
+  "variable_def",
+  "function_def",
+  "var_def_name",
+  "super_value",
+  "const_def_name",
   "property",
   "prop_id",
   "positional_args",
   "keyword_args",
   "identifier",
-  "super_value",
   "keyword_arg",
   "keyword_arg_id",
   "value",
@@ -294,7 +333,7 @@ module_eval(<<'.,.,', 'mvinl.y', 13)
 
 module_eval(<<'.,.,', 'mvinl.y', 14)
   def _reduce_3(val, _values)
-     val[0]
+     val[0].merge(val[1])
   end
 .,.,
 
@@ -304,242 +343,317 @@ module_eval(<<'.,.,', 'mvinl.y', 15)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 18)
+module_eval(<<'.,.,', 'mvinl.y', 16)
   def _reduce_5(val, _values)
-     {val[0].to_sym => create_group(val[1])}
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 21)
+module_eval(<<'.,.,', 'mvinl.y', 17)
   def _reduce_6(val, _values)
-     Hash.new
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 22)
+module_eval(<<'.,.,', 'mvinl.y', 18)
   def _reduce_7(val, _values)
-     val[0].merge(val[1])
+     val[0]
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 23)
   def _reduce_8(val, _values)
-     val[0].merge(val[1])
+    	@context.define_variable(val[0], val[1]) ||
+	  raise(MVinl::ParserError, "Trying to define a reserved word '#{val[0]}' as a variable")
+
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 26)
+module_eval(<<'.,.,', 'mvinl.y', 28)
   def _reduce_9(val, _values)
-     create_property(val[0])
+     @context.state[:in_var] = true; val[0].to_sym
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 27)
+module_eval(<<'.,.,', 'mvinl.y', 33)
   def _reduce_10(val, _values)
-     create_property(val[0], val[1])
+    	if (res = @context.define_constant(val[0], val[1])) == nil
+	  raise(MVinl::ParserError, "Trying to define a reserved word '#{val[0]}' as a constant")
+	elsif (res == false)
+	  raise(MVinl::ParserError, "Can't overwrite a constant #{val[0]}")
+	else
+          res
+        end
+
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 28)
+module_eval(<<'.,.,', 'mvinl.y', 43)
   def _reduce_11(val, _values)
-     create_property(val[0], val[1], val[2])
+     @context.state[:in_var] = true; val[0].to_sym
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 31)
+module_eval(<<'.,.,', 'mvinl.y', 46)
   def _reduce_12(val, _values)
-     STATE[:in_prop] = true; val[0]
+     {val[0].to_sym => create_group(val[1])}
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 34)
+module_eval(<<'.,.,', 'mvinl.y', 49)
   def _reduce_13(val, _values)
-     Array.new
+     Hash.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 35)
+module_eval(<<'.,.,', 'mvinl.y', 50)
   def _reduce_14(val, _values)
-     val[0] << val[1]
+     val[0].merge(val[1])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 38)
+module_eval(<<'.,.,', 'mvinl.y', 51)
   def _reduce_15(val, _values)
-     Hash.new
+     val[0].merge(val[1])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 41)
+module_eval(<<'.,.,', 'mvinl.y', 54)
   def _reduce_16(val, _values)
-    	STATE[:keyword_arg_depth] = 0
-	val[0].merge(val[1])
-
+     create_property(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 48)
+module_eval(<<'.,.,', 'mvinl.y', 55)
   def _reduce_17(val, _values)
-    	STATE[:in_keyword_arg] = false
-	STATE[:keyword_arg_depth] += 1
-	{val[0].to_sym => val[1]}
-
+     create_property(val[0], val[1])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 54)
+module_eval(<<'.,.,', 'mvinl.y', 56)
   def _reduce_18(val, _values)
-     STATE[:in_keyword_arg] = true; val[0]
+     create_property(val[0], val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 57)
+module_eval(<<'.,.,', 'mvinl.y', 59)
   def _reduce_19(val, _values)
-     val[0]
+     @context.state[:in_prop] = true; val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 58)
+module_eval(<<'.,.,', 'mvinl.y', 62)
   def _reduce_20(val, _values)
-     val[0]
+     Array.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 61)
+module_eval(<<'.,.,', 'mvinl.y', 63)
   def _reduce_21(val, _values)
-     val[0].to_i
+     val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 62)
+module_eval(<<'.,.,', 'mvinl.y', 66)
   def _reduce_22(val, _values)
-     val[0].to_f
+     Hash.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 63)
+module_eval(<<'.,.,', 'mvinl.y', 69)
   def _reduce_23(val, _values)
-     val[0]
+    	@context.state[:keyword_arg_depth] = 0
+	val[0].merge(val[1])
+
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 64)
+module_eval(<<'.,.,', 'mvinl.y', 76)
   def _reduce_24(val, _values)
-     val[0].to_sym
+    	@context.state[:in_keyword_arg] = false
+	@context.state[:keyword_arg_depth] += 1
+	{val[0].to_sym => val[1]}
+
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 67)
+module_eval(<<'.,.,', 'mvinl.y', 82)
   def _reduce_25(val, _values)
-     val[0]
+     @context.state[:in_keyword_arg] = true; val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 68)
+module_eval(<<'.,.,', 'mvinl.y', 85)
   def _reduce_26(val, _values)
-     "#{val[0]} #{val[1]}"
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 73)
+module_eval(<<'.,.,', 'mvinl.y', 86)
   def _reduce_27(val, _values)
-    	  define_function(val[2], val[3], val[4])
-
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 77)
+module_eval(<<'.,.,', 'mvinl.y', 87)
   def _reduce_28(val, _values)
-     [val[1], *val[2]]
+     MVinl::Context::CONSTANTS[val[0]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 78)
+module_eval(<<'.,.,', 'mvinl.y', 88)
   def _reduce_29(val, _values)
-     [val[1], *val[2]]
+     @context.variables[val[0]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 81)
+module_eval(<<'.,.,', 'mvinl.y', 91)
   def _reduce_30(val, _values)
-     evaluate_pn(val[1], val[2])
+     val[0].to_i
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 82)
+module_eval(<<'.,.,', 'mvinl.y', 92)
   def _reduce_31(val, _values)
-     evaluate_pn(val[1], val[2])
+     val[0].to_f
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 85)
+module_eval(<<'.,.,', 'mvinl.y', 93)
   def _reduce_32(val, _values)
-     STATE[:depth] += 1
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 88)
+module_eval(<<'.,.,', 'mvinl.y', 94)
   def _reduce_33(val, _values)
-     STATE[:depth] -= 1
+     val[0].to_sym
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 91)
+module_eval(<<'.,.,', 'mvinl.y', 97)
   def _reduce_34(val, _values)
-     Array.new
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 92)
+module_eval(<<'.,.,', 'mvinl.y', 98)
   def _reduce_35(val, _values)
-     val[0] << val[1]
+     "#{val[0]} #{val[1]}"
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 93)
+module_eval(<<'.,.,', 'mvinl.y', 103)
   def _reduce_36(val, _values)
-     val[0] << val[1]
+    	@context.define_function(val[2], val[3], val[4])
+
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 94)
+module_eval(<<'.,.,', 'mvinl.y', 107)
   def _reduce_37(val, _values)
-     val[0] << val[1]
+     [val[1], *val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 97)
+module_eval(<<'.,.,', 'mvinl.y', 108)
   def _reduce_38(val, _values)
-     Array.new
+     [val[1], *val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 98)
+module_eval(<<'.,.,', 'mvinl.y', 111)
   def _reduce_39(val, _values)
-     val[0] << val[1]
+     evaluate_pn(val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 99)
+module_eval(<<'.,.,', 'mvinl.y', 112)
   def _reduce_40(val, _values)
-     val[0] << val[1]
+     evaluate_pn(val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 100)
+module_eval(<<'.,.,', 'mvinl.y', 115)
   def _reduce_41(val, _values)
-     val[0] << val[1]
+     @context.state[:depth] += 1
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 103)
+module_eval(<<'.,.,', 'mvinl.y', 118)
   def _reduce_42(val, _values)
-     val[0].to_sym
+     @context.state[:depth] -= 1
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 106)
+module_eval(<<'.,.,', 'mvinl.y', 121)
   def _reduce_43(val, _values)
+     Array.new
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 122)
+  def _reduce_44(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 123)
+  def _reduce_45(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 124)
+  def _reduce_46(val, _values)
+     val[0] << { con: val[1] }
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 125)
+  def _reduce_47(val, _values)
+     val[0] << { var: val[1] }
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 126)
+  def _reduce_48(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 129)
+  def _reduce_49(val, _values)
+     Array.new
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 130)
+  def _reduce_50(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 131)
+  def _reduce_51(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 132)
+  def _reduce_52(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 135)
+  def _reduce_53(val, _values)
+     val[0].to_sym
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 138)
+  def _reduce_54(val, _values)
      val[0].to_sym
   end
 .,.,