mvinl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ceac64e8ec7e1ff3f8fab41d82d4b69a577098bca195f7ed01205dfc3b54b2d
-  data.tar.gz: f8592113d9ac37d001048f8f49c4e46e4c1f09d6209e32800f73f821549fab61
+  metadata.gz: 7c681f294e44a200c6fb8c66aed4ac1c50fce869c1c12f0a64b891b0ee720842
+  data.tar.gz: 94acd6d0220cb2fbfa05c839e8081e19b6d8ef3c3f4bd549dec217653b53fe0a
 SHA512:
-  metadata.gz: e31891e65cde3f3de7124ec7665eaf89561f3a5db04201e03c316ee214e09b5d67db5f79d108eee5ddeae30daaddea187dbe27bcec2881aa7ff1bb4970b50536
-  data.tar.gz: 2b05bef7791eec6129ba210fd146f3ea575098d7ab70afe44cf709297319d2915ad7d5c876cf0dfe64a9f177dc299bb46a17a3769ed40d0317b77d6d0ebdbeb2
+  metadata.gz: 2d2df258513050c3c8b982865df1e60e2d84aa253b09070f65ae0775d9a07f90231480130d5e9b645b0ee761460d66acf097a35e878894f7b30d3eda62ab23ed
+  data.tar.gz: 5eaa3496bef0fc23371cf449e12264873fa6455bff81f88c70c454a903b09b2860252feec4e07515d3eb37a637f2fdad7ffabfd1ad4dd5758e19844641cbf868

data/bin/imvnl

@@ -24,25 +24,28 @@ THE SOFTWARE.
 =end
 
 require 'readline'
-require 'pry'
+require 'mvinl/context'
 require 'mvinl/lexer'
 require 'mvinl/parser'
-require 'mvinl/context'
 require 'mvinl/info'
 
-PSL = "mvnl(#{MVinl::Version})".freeze
-PS1 = "#{PSL}>".freeze
-
 module MVinl::REPL
+  PSL = "mvnl(#{MVinl::Version})".freeze
+  PS1 = "#{PSL}>".freeze
+  HISTORY_FILE = File.expand_path('.imvnl_history')
   CONTEXT = MVinl::Context.new
   LEXER = MVinl::Lexer.new(CONTEXT, '')
   PARSER = MVinl::Parser.new(LEXER, CONTEXT)
 
   def self.run
+    load_history
+
     while (input = Readline.readline("#{PS1} ", true))
-      Readline::HISTORY.pop if input.strip.empty?
+      if Readline::HISTORY.size > 1 && Readline::HISTORY[-1] == Readline::HISTORY[-2]
+        Readline::HISTORY.pop
+      end
 
-      if input == '^' || input == 'exit'
+      if ['^', 'exit'].include? input
         PARSER.finalize!
         break if PARSER.parsing_done?
       else
@@ -61,6 +64,22 @@ module MVinl::REPL
         warn e.message
       end
     end
+
+    save_history
+  end
+
+  private_class_method def self.load_history
+    return unless File.exist? HISTORY_FILE
+
+    File.foreach(HISTORY_FILE) do |line|
+      Readline::HISTORY << line.chomp
+    end
+  end
+
+  private_class_method def self.save_history
+    File.open(HISTORY_FILE, 'w') do |file|
+      Readline::HISTORY.each { |entry| file.puts(entry) }
+    end
   end
 end
 

data/lib/mvinl/context.rb

@@ -1,10 +1,15 @@
 # frozen-string-literal: true
 
+require 'pry'
+
 module MVinl
   # Lexer and parser shared context
   class Context
     attr_accessor :variables, :functions, :state
 
+    RESERVED = %I[def]
+    CONSTANTS = {}
+
     def initialize
       reset
     end
@@ -17,8 +22,33 @@ module MVinl
         in_var: false,
         in_keyword_arg: false,
         keyword_arg_depth: 0,
+        lines: 0,
         depth: 0
       }
     end
+
+    def define_function(name, args, body)
+      @functions[name] = { args: args, body: body }
+    end
+
+    def define_constant(name, value)
+      if RESERVED.include? name
+        nil
+      elsif CONSTANTS[name]
+        false
+      else
+        @state[:in_var] = false
+        CONSTANTS[name] = value
+      end
+    end
+
+    def define_variable(name, value)
+      if RESERVED.include? name
+        nil
+      else
+        @state[:in_var] = false
+        @variables[name] = value
+      end
+    end
   end
 end

data/lib/mvinl/info.rb

@@ -6,7 +6,7 @@
 # See Copyright Notice in mvnil.rb
 
 module MVinl
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   Version = VERSION
   Copyright = 'Copyright (c) 2024, Daniel Sierpiński'
 end

data/lib/mvinl/lexer.rb

@@ -16,11 +16,8 @@ module MVinl
     attr_reader :eos
 
     ID_REGEX = /[a-zA-Z_][a-zA-Z0-9_]*/
-
-    RESERVED = %w[def as style].freeze
-
     TOKENS = {
-      KEYWORD: /#{RESERVED[0]}|#{RESERVED[1]}|#{RESERVED[2]}/,
+      KEYWORD: Regexp.union(Context::RESERVED),
       OPEN_PAREN: /\(/,
       CLOSE_PAREN: /\)/,
       NEW_LINE: /(?:[ \t]*(?:\r?\n)[ \t]*)+/,
@@ -28,6 +25,7 @@ module MVinl
       KEYWORD_ARG: /(#{ID_REGEX}):/,
       ID: ID_REGEX,
       GROUP: /@(#{ID_REGEX})/,
+      CONSTANT: /!([A-Z][A-Z0-9_]*)/,
       VARIABLE: /!(#{ID_REGEX})/,
       FLOAT: /[+-]?\d+\.\d+/,
       NUMBER: /[+-]?\d+/,
@@ -55,8 +53,11 @@ module MVinl
       return process_eos if @ss.eos?
 
       # Check if variable name been used
+      MVinl::Context::CONSTANTS.each_key do |const_name|
+        return [:CONSTANT_CALL, const_name] if @ss.scan(/\A#{Regexp.escape const_name.to_s}\b/)
+      end
       @context.variables.each_key do |var_name|
-        return [:VARIABLE_CALL, @context.variables[var_name]] if @ss.scan(/\A#{Regexp.escape var_name.to_s}\b/)
+        return [:VARIABLE_CALL, var_name] if @ss.scan(/\A#{Regexp.escape var_name.to_s}\b/)
       end
 
       TOKENS.each do |type, regex|
@@ -67,6 +68,7 @@ module MVinl
       end
       case @last_type
       when :NEW_LINE
+        @context.state[:lines] += 1
         return next_token if continuation_line?
 
         [:END_TAG, "\n"]
@@ -110,6 +112,7 @@ module MVinl
 
         @in_group = true
         [:GROUP, @ss[1]]
+      when :CONSTANT then [:CONSTANT, @ss[1]]
       when :VARIABLE then [:VARIABLE, @ss[1]]
       when :ID then [:ID, @ss.matched]
       when :NUMBER, :FLOAT, :STRING, :SYMBOL, :MULTILINE_STRING

data/lib/mvinl/parser.rb

@@ -21,6 +21,9 @@ class MVinl::Parser < MVinl::Program
 
   def parse
     do_parse
+  rescue Racc::ParseError => e
+    puts "Parsing error at #{@context.state[:lines]}: #{e.message}"
+    nil
   end
 
   def feed(input)

data/lib/mvinl.rb

@@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =end
 
+require 'mvinl/context'
 require 'mvinl/parser'
 require 'mvinl/lexer'
-require 'mvinl/context'
 
 # Library entry point
 module MVinl

data/spec/complex_vars.mvnl

@@ -0,0 +1,5 @@
+!a 5
+def (foo (* a 2))
+!a 10
+
+x (foo)

data/spec/multiline_string.mvnl

@@ -0,0 +1,5 @@
+!a "Hello," \
+   "MVinl" \
+   "!"
+
+x a

data/spec/program_spec.rb

@@ -1,8 +1,6 @@
 # frozen-string-literal: true
 
 require_relative 'spec_helper'
-require 'mvinl'
-require 'pry'
 
 describe MVinl, '#eval' do
   context 'no input' do
@@ -39,7 +37,7 @@ describe MVinl, '#eval' do
       MVinl.eval('!n 0')
       expect(MVinl.context.variables[:n]).to be_truthy
     end
-    it 'stores a two variables' do
+    it 'stores two variables' do
       MVinl.eval('!n 3 !m 6')
       expect(MVinl.context.variables[:n] && MVinl.context.variables[:m]).to be_truthy
     end
@@ -53,6 +51,17 @@ describe MVinl, '#eval' do
     end
   end
 
+  context 'constants' do
+    it 'stores a single constant' do
+      MVinl.eval('!N 50')
+      expect(MVinl::Context::CONSTANTS[:N]).to be_truthy
+    end
+    it 'evaluates a single constant' do
+      result = MVinl.eval('x N')
+      expect(result).to eq({ x: [[50], {}] })
+    end
+  end
+
   context 'functions' do
     it 'stores function definition with \'+\' OPER and no arguments' do
       MVinl.eval('def (f (+ 1))')
@@ -112,5 +121,20 @@ describe MVinl, '#eval_from_file' do
                                        line_height: 25, padding: 8
                                      }] } })
     end
+    it 'evaluates an example with variables' do
+      MVinl.reset
+      result = MVinl.eval_from_file('spec/vars.mvnl')
+      expect(result).to eq({ x: [[5], { fun: 10 }] })
+    end
+    it 'function respects variable change' do
+      MVinl.reset
+      result = MVinl.eval_from_file('spec/complex_vars.mvnl')
+      expect(result).to eq({ x: [[20], {}] })
+    end
+    it 'evaluates multiline string' do
+      MVinl.reset
+      result = MVinl.eval_from_file('spec/multiline_string.mvnl')
+      expect(result).to eq({ x: [['Hello, MVinl !'], {}] })
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
 # frozen-string-literal: true
 
 $LOAD_PATH.unshift File.expand_path('lib', __dir__)
+
+require 'mvinl'

data/spec/vars.mvnl

@@ -0,0 +1,4 @@
+!a 5
+def (foo (* 2 a))
+
+x a fun: (foo)

data/syntax/mvinl.tab.rb

@@ -8,7 +8,7 @@ require 'racc/parser.rb'
 module MVinl
   class Program < Racc::Parser
 
-module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 121)
+module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 144)
   class MVinl::ParserError < StandardError; end
 
   private
@@ -22,16 +22,12 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 121)
     properties ||  Hash.new
   end
 
-
-  def define_variable(name, value)
-    @context.state[:in_var] = false
-    @context.variables[name] = value
-    value
+  def evaluate_const(const_name)
+    MVinl::Context::CONSTANTS[const_name]
   end
 
-  def define_function(name, args, body)
-  @context.functions[name.to_sym] = {args: args, body: body}
-    nil
+  def evaluate_var(var_name)
+    @context.variables[var_name]
   end
 
   def evaluate_pn(operator, operands, context = {})
@@ -53,6 +49,14 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 121)
       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
@@ -79,152 +83,166 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 121)
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -13,    12,   -13,   -13,   -13,   -13,     2,    16,     7,     9,
-    10,    25,    26,   -13,    36,    16,    36,    16,   -13,    11,
-    20,    21,    22,    24,    25,    26,    28,    28,    47,    50,
-    31,    16,    20,    21,    22,    24,    25,    26,    16,    28,
-    47,    50,    16,    16,    21,    22,    24,    25,    26,    45,
-    28,    47,   nil,   nil,    16,    21,    22,    24,    25,    26,
-   nil,    28,    47,   nil,   nil,    16,    21,    22,    24,    25,
-    26,   nil,    28,    47,   nil,   nil,    16,   -19,    20,    21,
-    22,    24,    25,    26,   nil,    28,    20,    21,    22,    24,
-    25,    26,   nil,    28,    20,    21,    22,    24,    25,    26,
-   nil,    28 ]
+   -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 = [
-    14,     2,    14,    14,    14,    14,     1,     4,     1,     1,
-     1,    26,    26,    14,    27,    27,    53,    53,    14,     1,
-    40,    40,    40,    40,    40,    40,    11,    40,    40,    40,
-    13,    40,    41,    41,    41,    41,    41,    41,    29,    41,
-    41,    41,    30,    41,    42,    42,    42,    42,    42,    38,
-    42,    52,   nil,   nil,    42,    60,    60,    60,    60,    60,
-   nil,    60,    60,   nil,   nil,    60,    61,    61,    61,    61,
-    61,   nil,    61,    61,   nil,   nil,    61,    32,    32,    32,
-    32,    32,    32,    32,   nil,    32,     8,     8,     8,     8,
-     8,     8,   nil,     8,    44,    44,    44,    44,    44,    44,
-   nil,    44 ]
+    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,   -11,   nil,   nil,   nil,    79,   nil,
-   nil,    12,   nil,    25,     0,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     0,    -3,   nil,    20,
-    24,   nil,    71,   nil,   nil,   nil,   nil,   nil,    43,   nil,
-    13,    25,    36,   nil,    87,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    36,    -1,   nil,   nil,   nil,   nil,   nil,   nil,
-    47,    58,   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,   -10,   -49,    -2,    -3,    -4,    -5,    -6,   -49,    -8,
-   -10,   -49,    65,   -11,   -17,   -16,   -48,    -7,   -23,   -24,
-   -25,   -26,   -27,   -28,   -29,   -30,   -49,   -49,   -37,    -9,
-   -49,   -12,   -14,   -31,   -43,   -43,   -47,   -39,   -15,   -18,
-   -49,   -49,   -49,   -20,   -49,   -22,   -35,   -38,   -44,   -45,
-   -46,   -36,   -42,   -49,   -40,   -41,   -21,   -32,   -39,   -39,
-   -49,   -49,   -33,   -42,   -34 ]
+    -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 = [
-    30,    42,    15,     1,    35,    17,     4,    40,    41,     3,
-     5,     6,    46,    51,     8,    29,    55,    32,    38,    43,
-    44,    33,    60,    61,    57,    34,    52,    15,    37,    39,
-    59,    53,    62,    64,    55,    55,   nil,   nil,    49,    49,
-   nil,    56,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
-    53,    58 ]
+    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 = [
-    18,    19,    12,     1,    22,     7,     3,    23,    23,     2,
-     4,     5,    21,    21,     6,     3,    15,    10,    11,    13,
-    14,    17,    19,    19,    21,    12,    20,    12,    12,     7,
-    22,    18,    21,    21,    15,    15,   nil,   nil,    12,    12,
-   nil,     7,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    18,
-    18,    12 ]
+    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,     3,     8,     5,     9,    10,    13,    -3,   nil,   nil,
-     3,   -14,    -2,   -19,   -18,   -26,   nil,    -5,   -11,   -36,
-   -16,   -28,   -23,   -27 ]
+   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,    48,    13,    14,
-   nil,   nil,    54,   nil,   nil,    18,    19,    23,    27,   nil,
-    63,   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, 20, :_reduce_1,
-  2, 20, :_reduce_2,
-  2, 20, :_reduce_3,
-  2, 20, :_reduce_4,
-  2, 20, :_reduce_5,
-  2, 20, :_reduce_6,
-  2, 23, :_reduce_7,
-  1, 25, :_reduce_8,
-  2, 21, :_reduce_9,
-  0, 22, :_reduce_10,
-  2, 22, :_reduce_11,
-  3, 22, :_reduce_12,
-  1, 27, :_reduce_13,
-  2, 27, :_reduce_14,
-  3, 27, :_reduce_15,
-  1, 28, :_reduce_16,
-  0, 29, :_reduce_17,
-  2, 29, :_reduce_18,
-  0, 30, :_reduce_19,
-  2, 30, :_reduce_20,
-  2, 32, :_reduce_21,
-  1, 33, :_reduce_22,
-  1, 26, :_reduce_23,
-  1, 26, :_reduce_24,
-  1, 26, :_reduce_25,
-  1, 34, :_reduce_26,
-  1, 34, :_reduce_27,
-  1, 34, :_reduce_28,
-  1, 34, :_reduce_29,
-  1, 36, :_reduce_30,
-  2, 36, :_reduce_31,
-  6, 24, :_reduce_32,
-  4, 39, :_reduce_33,
-  4, 39, :_reduce_34,
-  4, 35, :_reduce_35,
-  4, 35, :_reduce_36,
-  1, 37, :_reduce_37,
-  1, 40, :_reduce_38,
-  0, 38, :_reduce_39,
-  2, 38, :_reduce_40,
-  2, 38, :_reduce_41,
-  2, 38, :_reduce_42,
+  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,
+  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,
-  1, 41, :_reduce_47,
-  1, 31, :_reduce_48 ]
+  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 = 49
+racc_reduce_n = 55
 
-racc_shift_n = 65
+racc_shift_n = 72
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :EOS => 2,
   :VARIABLE => 3,
-  :GROUP => 4,
-  :END_TAG => 5,
-  :KEYWORD_ARG => 6,
-  :VARIABLE_CALL => 7,
-  :NUMBER => 8,
-  :FLOAT => 9,
-  :SYMBOL => 10,
-  :STRING => 11,
-  :MULTILINE_STRING => 12,
-  :DEF => 13,
-  :OPEN_PAREN => 14,
-  :CLOSE_PAREN => 15,
-  :polish_notation => 16,
-  :OPER => 17,
-  :ID => 18 }
-
-racc_nt_base = 19
+  :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
 
@@ -250,9 +268,11 @@ Racc_token_to_s_table = [
   "error",
   "EOS",
   "VARIABLE",
+  "CONSTANT",
   "GROUP",
   "END_TAG",
   "KEYWORD_ARG",
+  "CONSTANT_CALL",
   "VARIABLE_CALL",
   "NUMBER",
   "FLOAT",
@@ -269,10 +289,12 @@ Racc_token_to_s_table = [
   "program",
   "group",
   "properties",
+  "constant_def",
   "variable_def",
   "function_def",
   "var_def_name",
   "super_value",
+  "const_def_name",
   "property",
   "prop_id",
   "positional_args",
@@ -333,94 +355,121 @@ module_eval(<<'.,.,', 'mvinl.y', 17)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 20)
+module_eval(<<'.,.,', 'mvinl.y', 18)
   def _reduce_7(val, _values)
-     define_variable(val[0], val[1])
+     val[0]
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 23)
   def _reduce_8(val, _values)
-     @context.state[:in_var] = true; val[0].to_sym
+    	@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)
-     {val[0].to_sym => create_group(val[1])}
+     @context.state[:in_var] = true; val[0].to_sym
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 29)
+module_eval(<<'.,.,', 'mvinl.y', 33)
   def _reduce_10(val, _values)
-     Hash.new
+    	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', 30)
+module_eval(<<'.,.,', 'mvinl.y', 43)
   def _reduce_11(val, _values)
-     val[0].merge(val[1])
+     @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)
-     val[0].merge(val[1])
+     {val[0].to_sym => create_group(val[1])}
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 34)
+module_eval(<<'.,.,', 'mvinl.y', 49)
   def _reduce_13(val, _values)
-     create_property(val[0])
+     Hash.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 35)
+module_eval(<<'.,.,', 'mvinl.y', 50)
   def _reduce_14(val, _values)
-     create_property(val[0], val[1])
+     val[0].merge(val[1])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 36)
+module_eval(<<'.,.,', 'mvinl.y', 51)
   def _reduce_15(val, _values)
-     create_property(val[0], val[1], val[2])
+     val[0].merge(val[1])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 39)
+module_eval(<<'.,.,', 'mvinl.y', 54)
   def _reduce_16(val, _values)
-     @context.state[:in_prop] = true; val[0]
+     create_property(val[0])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 42)
+module_eval(<<'.,.,', 'mvinl.y', 55)
   def _reduce_17(val, _values)
-     Array.new
+     create_property(val[0], val[1])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 43)
+module_eval(<<'.,.,', 'mvinl.y', 56)
   def _reduce_18(val, _values)
-     val[0] << val[1]
+     create_property(val[0], val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 46)
+module_eval(<<'.,.,', 'mvinl.y', 59)
   def _reduce_19(val, _values)
-     Hash.new
+     @context.state[:in_prop] = true; val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 49)
+module_eval(<<'.,.,', 'mvinl.y', 62)
   def _reduce_20(val, _values)
+     Array.new
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 63)
+  def _reduce_21(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 66)
+  def _reduce_22(val, _values)
+     Hash.new
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 69)
+  def _reduce_23(val, _values)
     	@context.state[:keyword_arg_depth] = 0
 	val[0].merge(val[1])
 
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 56)
-  def _reduce_21(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 76)
+  def _reduce_24(val, _values)
     	@context.state[:in_keyword_arg] = false
 	@context.state[:keyword_arg_depth] += 1
 	{val[0].to_sym => val[1]}
@@ -428,165 +477,183 @@ module_eval(<<'.,.,', 'mvinl.y', 56)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 62)
-  def _reduce_22(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 82)
+  def _reduce_25(val, _values)
      @context.state[:in_keyword_arg] = true; val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 65)
-  def _reduce_23(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 85)
+  def _reduce_26(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 66)
-  def _reduce_24(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 86)
+  def _reduce_27(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 67)
-  def _reduce_25(val, _values)
-     val[0]
+module_eval(<<'.,.,', 'mvinl.y', 87)
+  def _reduce_28(val, _values)
+     MVinl::Context::CONSTANTS[val[0]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 70)
-  def _reduce_26(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 88)
+  def _reduce_29(val, _values)
+     @context.variables[val[0]]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 91)
+  def _reduce_30(val, _values)
      val[0].to_i
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 71)
-  def _reduce_27(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 92)
+  def _reduce_31(val, _values)
      val[0].to_f
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 72)
-  def _reduce_28(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 93)
+  def _reduce_32(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 73)
-  def _reduce_29(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 94)
+  def _reduce_33(val, _values)
      val[0].to_sym
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 76)
-  def _reduce_30(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 97)
+  def _reduce_34(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 77)
-  def _reduce_31(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 98)
+  def _reduce_35(val, _values)
      "#{val[0]} #{val[1]}"
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 82)
-  def _reduce_32(val, _values)
-    	  define_function(val[2], val[3], val[4])
+module_eval(<<'.,.,', 'mvinl.y', 103)
+  def _reduce_36(val, _values)
+    	@context.define_function(val[2], val[3], val[4])
 
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 86)
-  def _reduce_33(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 107)
+  def _reduce_37(val, _values)
      [val[1], *val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 87)
-  def _reduce_34(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 108)
+  def _reduce_38(val, _values)
      [val[1], *val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 90)
-  def _reduce_35(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 111)
+  def _reduce_39(val, _values)
      evaluate_pn(val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 91)
-  def _reduce_36(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 112)
+  def _reduce_40(val, _values)
      evaluate_pn(val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 94)
-  def _reduce_37(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 115)
+  def _reduce_41(val, _values)
      @context.state[:depth] += 1
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 97)
-  def _reduce_38(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 118)
+  def _reduce_42(val, _values)
      @context.state[:depth] -= 1
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 100)
-  def _reduce_39(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 121)
+  def _reduce_43(val, _values)
      Array.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 101)
-  def _reduce_40(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 122)
+  def _reduce_44(val, _values)
      val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 102)
-  def _reduce_41(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 123)
+  def _reduce_45(val, _values)
      val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 103)
-  def _reduce_42(val, _values)
+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', 106)
-  def _reduce_43(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 129)
+  def _reduce_49(val, _values)
      Array.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 107)
-  def _reduce_44(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 130)
+  def _reduce_50(val, _values)
      val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 108)
-  def _reduce_45(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 131)
+  def _reduce_51(val, _values)
      val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 109)
-  def _reduce_46(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 132)
+  def _reduce_52(val, _values)
      val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 112)
-  def _reduce_47(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 135)
+  def _reduce_53(val, _values)
      val[0].to_sym
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 115)
-  def _reduce_48(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 138)
+  def _reduce_54(val, _values)
      val[0].to_sym
   end
 .,.,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mvinl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - siery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2024-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pp
@@ -47,9 +47,12 @@ files:
 - lib/mvinl/parser.rb
 - mvinl.gemspec
 - rakelib/build.rake
+- spec/complex_vars.mvnl
+- spec/multiline_string.mvnl
 - spec/program_spec.rb
 - spec/spec_helper.rb
 - spec/stack.mvnl
+- spec/vars.mvnl
 - syntax/mvinl.tab.rb
 homepage: https://rubygems.org/gems/mvinl
 licenses: