mvinl 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e1464b5085d8cd24dc9b43f22063e675a8f6d249a2c3d716e29367726032e16
-  data.tar.gz: 0f8ee1fa140bf083afda23c1004e02bf3a8b3e0fcccd55f19d39135305b6b2dd
+  metadata.gz: 4ceac64e8ec7e1ff3f8fab41d82d4b69a577098bca195f7ed01205dfc3b54b2d
+  data.tar.gz: f8592113d9ac37d001048f8f49c4e46e4c1f09d6209e32800f73f821549fab61
 SHA512:
-  metadata.gz: 449b3f884f41165b9892fa70e9a776dbd7208261ad1d237189d252fcec7f09fe6688873324b8045b9a85b1fdf7e707591057f4e1e7bf899fa48170f8e2cbf9a4
-  data.tar.gz: 0a09d81f07dcbc1c9253048526b3e60606b7a48c657f040c4a76e7d639d104b14148d5e2e640574429f4d1181eb85974543f74ec2b87077c29f3befe07aa2d76
+  metadata.gz: e31891e65cde3f3de7124ec7665eaf89561f3a5db04201e03c316ee214e09b5d67db5f79d108eee5ddeae30daaddea187dbe27bcec2881aa7ff1bb4970b50536
+  data.tar.gz: 2b05bef7791eec6129ba210fd146f3ea575098d7ab70afe44cf709297319d2915ad7d5c876cf0dfe64a9f177dc299bb46a17a3769ed40d0317b77d6d0ebdbeb2

data/bin/imvnl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen-string-literal: true
 
-=begin engine.rb
+=begin imvnl
 Copyright (c) 2018, 2024, Daniel Sierpiński All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -27,14 +27,16 @@ require 'readline'
 require 'pry'
 require 'mvinl/lexer'
 require 'mvinl/parser'
+require 'mvinl/context'
 require 'mvinl/info'
 
 PSL = "mvnl(#{MVinl::Version})".freeze
 PS1 = "#{PSL}>".freeze
 
 module MVinl::REPL
-  LEXER = MVinl::Lexer.new('')
-  PARSER = MVinl::Parser.new(LEXER)
+  CONTEXT = MVinl::Context.new
+  LEXER = MVinl::Lexer.new(CONTEXT, '')
+  PARSER = MVinl::Parser.new(LEXER, CONTEXT)
 
   def self.run
     while (input = Readline.readline("#{PS1} ", true))

data/lib/mvinl/context.rb

@@ -0,0 +1,24 @@
+# frozen-string-literal: true
+
+module MVinl
+  # Lexer and parser shared context
+  class Context
+    attr_accessor :variables, :functions, :state
+
+    def initialize
+      reset
+    end
+
+    def reset
+      @variables = {}
+      @functions = {}
+      @state = {
+        in_prop: false,
+        in_var: false,
+        in_keyword_arg: false,
+        keyword_arg_depth: 0,
+        depth: 0
+      }
+    end
+  end
+end

data/lib/mvinl/info.rb

@@ -1,12 +1,12 @@
 # frozen-string-literal: true
 
-# engine.rb
+# info.rb
 # Copyright (c) 2024, Daniel Sierpiński All rights reserved.
 #
 # See Copyright Notice in mvnil.rb
 
 module MVinl
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   Version = VERSION
   Copyright = 'Copyright (c) 2024, Daniel Sierpiński'
 end

data/lib/mvinl/lexer.rb

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-=begin engine.rb
+=begin lexer.rb
 Copyright (c) 2024, Daniel Sierpiński All rights reserved.
 
 See Copyright Notice in mvnil.rb
@@ -28,6 +28,7 @@ module MVinl
       KEYWORD_ARG: /(#{ID_REGEX}):/,
       ID: ID_REGEX,
       GROUP: /@(#{ID_REGEX})/,
+      VARIABLE: /!(#{ID_REGEX})/,
       FLOAT: /[+-]?\d+\.\d+/,
       NUMBER: /[+-]?\d+/,
       MULTILINE_STRING: /"((?:\\.|[^"\\])*)"\s*\\\s*/,
@@ -38,7 +39,8 @@ module MVinl
       END_TAG: /\./
     }.freeze
 
-    def initialize(input)
+    def initialize(context, input = '')
+      @context = context
       @ss = StringScanner.new(input)
       @args_n = 0
       @in_group = false
@@ -52,6 +54,11 @@ module MVinl
     def next_token
       return process_eos if @ss.eos?
 
+      # Check if variable name been used
+      @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/)
+      end
+
       TOKENS.each do |type, regex|
         if @ss.scan regex
           @last_type = type
@@ -72,13 +79,13 @@ module MVinl
         next_token
       when :OPEN_PAREN then [:OPEN_PAREN, '(']
       when :CLOSE_PAREN
-        unless Parser::STATE[:depth].positive?
+        unless @context.state[:depth].positive?
           raise UnexpectedTokenError, 'CLOSE_PARAM found with no matching OPEN_PARAM'
         end
 
         [:CLOSE_PAREN, ')']
       when :OPER
-        unless Parser::STATE[:depth].positive?
+        unless @context.state[:depth].positive?
           raise UnexpectedTokenError, 'OPER found with no matching OPEN_PARAM'
         end
 
@@ -88,30 +95,29 @@ module MVinl
 
         [:KEYWORD, @ss.matched]
       when :KEYWORD_ARG
-        if !Parser::STATE[:in_prop]
+        if !@context.state[:in_prop]
           raise UnexpectedTokenError, 'Looking for identifier but found KEYWORD_ARG'
-        elsif Parser::STATE[:in_keyword_arg]
+        elsif @context.state[:in_keyword_arg]
           raise UnexpectedTokenError, 'Looking for a keyword argument value but found KEYWORD_ARG'
         end
 
         [:KEYWORD_ARG, @ss[1]]
       when :GROUP
         # Group gets canceled whenever encountered another group id or a matching end tag
-        if Parser::STATE[:in_keyword_arg]
+        if @context.state[:in_keyword_arg]
           raise UnexpectedTokenError, 'Looking for a keyword argument value but found GROUP'
         end
 
         @in_group = true
         [:GROUP, @ss[1]]
+      when :VARIABLE then [:VARIABLE, @ss[1]]
       when :ID then [:ID, @ss.matched]
-      when :MULTILINE_STRING
-        [:MULTILINE_STRING, @ss[1]]
-      when :NUMBER, :FLOAT, :STRING, :SYMBOL
+      when :NUMBER, :FLOAT, :STRING, :SYMBOL, :MULTILINE_STRING
         # Values can't be used outside an property or a lambda
-        if !Parser::STATE[:in_prop] && !Parser::STATE[:depth].positive?
+        if !@context.state[:in_prop] && !@context.state[:depth].positive? && !@context.state[:in_var]
           raise UnexpectedTokenError, "Looking for ID or OPEN_PAREN but found #{@last_type}"
-        elsif !Parser::STATE[:in_keyword_arg] && Parser::STATE[:keyword_arg_depth].positive? &&
-            !Parser::STATE[:depth].positive?
+        elsif !@context.state[:in_keyword_arg] && @context.state[:keyword_arg_depth].positive? &&
+              !@context.state[:depth].positive? && !@context.state[:in_var]
           raise UnexpectedTokenError, "Looking for END_TAG or KEYWORD_ARG but found #{@last_type}"
         end
 
@@ -140,8 +146,8 @@ module MVinl
 
       # Auto end properties
       lookahead = @ss.check(/\A(?:#{TOKENS[:GROUP]}|#{TOKENS[:ID]}$|#{TOKENS[:END_TAG]}|#{TOKENS[:NEW_LINE]})/)
-      warn "Continue? in_prop?: #{Parser::STATE[:in_prop].inspect}, lookahead: #{lookahead.inspect}"
-      Parser::STATE[:in_prop] ? !lookahead : true
+      warn "Continue? in_prop?: #{@context.state[:in_prop].inspect}, lookahead: #{lookahead.inspect}"
+      @context.state[:in_prop] ? !lookahead : true
     end
 
     # Move the cursor to the next new line tag

data/lib/mvinl/parser.rb

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-=begin engine.rb
+=begin parser.rb
 Copyright (c) 2024, Daniel Sierpiński All rights reserved.
 
 See Copyright Notice in mvnil.rb
@@ -8,15 +8,25 @@ See Copyright Notice in mvnil.rb
 
 require 'mvinl.tab'
 
+# Generated parser class
 class MVinl::Parser < MVinl::Program
-  def initialize(lexer, debug: false)
-    @yydebug = debug
+  def initialize(lexer, context, debug: false)
     @lexer = lexer
+    @context = context
+    @yydebug = debug
     @tokens = []
     @done = false
     super()
   end
 
+  def parse
+    do_parse
+  end
+
+  def feed(input)
+    @lexer.feed input
+  end
+
   def next_token
     if @tokens.empty?
       @lexer.next_token
@@ -36,8 +46,4 @@ class MVinl::Parser < MVinl::Program
   def parsing_done?
     @done && @tokens.empty?
   end
-
-  def parse
-    do_parse
-  end
 end

data/lib/mvinl.rb

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-=begin engine.rb
+=begin mvinl.rb
 Copyright (c) 2018, 2024, Daniel Sierpiński All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,14 +24,27 @@ THE SOFTWARE.
 
 require 'mvinl/parser'
 require 'mvinl/lexer'
+require 'mvinl/context'
 
+# Library entry point
 module MVinl
+  @context = Context.new
+  @parser = Parser.new(Lexer.new(@context, ''), @context)
+
   def self.eval(input)
-    parser = Parser.new(Lexer.new(input))
-    parser.parse
+    @parser.feed input
+    @parser.parse
   end
 
   def self.eval_from_file(path)
     self.eval File.read(path)
   end
+
+  def self.context
+    @context
+  end
+
+  def self.reset
+    @context.reset
+  end
 end

data/rakelib/build.rake

@@ -1,32 +1,11 @@
 # frozen-string-literal: true
 
-require 'rubygems/package'
-require 'mvinl/info'
+require 'bundler/gem_tasks'
 
-require 'pry'
-require 'shellwords'
-
-GRAMMAR_FILE = 'syntax/mvinl.y'
-COMPILED_FILE = 'syntax/mvinl.tab.rb'
-
-gemspec = Gem::Specification.load 'mvinl.gemspec'
-gemfile = "#{gemspec.name}-#{gemspec.version}.gem"
-
-task push: [:build] do
-  #binding.pry
-  system('gem', 'push', '-v', Shellwords.escape(gemspec.version.to_s), Shellwords.escape(gemspec.name))
-end
-
-task install: [:build] do
-  Gem.install(gemfile)
-  puts "Installed #{gemfile}"
-end
-
-task build: [:compile] do
-  Gem::Package.build(gemspec)
-  puts "Build #{gemfile}"
-end
+desc 'Push MVinl gem; use this task in stead of \'release\''
+task push: %I[compile build release]
 
+desc 'Compile the grammar file'
 task :compile do
   system('racc', GRAMMAR_FILE, '-o', COMPILED_FILE)
 end

data/spec/program_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative 'spec_helper'
 require 'mvinl'
+require 'pry'
 
 describe MVinl, '#eval' do
   context 'no input' do
@@ -10,78 +11,106 @@ describe MVinl, '#eval' do
       expect(result).to eq({})
     end
   end
+
   context 'groups' do
     it 'retruns a single group' do
       result = MVinl.eval('@x')
       expect(result).to eq({ x: {} })
     end
-
     it 'returns two groups' do
       result = MVinl.eval('@x @y')
       expect(result).to eq({ x: {}, y: {} })
     end
   end
+
   context 'properties' do
     it 'return a single property' do
       result = MVinl.eval('@x a')
       expect(result).to eq({ x: { a: [[], {}] } })
     end
-
     it 'returns two properties' do
       result = MVinl.eval('@x a b')
       expect(result).to eq({ x: { a: [[], {}], b: [[], {}] } })
     end
   end
 
+  context 'variables' do
+    it 'stores a single variable' do
+      MVinl.eval('!n 0')
+      expect(MVinl.context.variables[:n]).to be_truthy
+    end
+    it 'stores a two variables' do
+      MVinl.eval('!n 3 !m 6')
+      expect(MVinl.context.variables[:n] && MVinl.context.variables[:m]).to be_truthy
+    end
+    it 'stores a single variable with it\'s value' do
+      MVinl.eval('!n 5')
+      expect(MVinl.context.variables[:n]).to eq 5
+    end
+    it 'evaluates a single variable' do
+      result = MVinl.eval('!n 5 x n')
+      expect(result).to eq({ x: [[5], {}] })
+    end
+  end
+
   context 'functions' do
-    it 'Stores function definition with \'+\' OPER and no arguments' do
+    it 'stores function definition with \'+\' OPER and no arguments' do
       MVinl.eval('def (f (+ 1))')
-      expect(MVinl::Parser::FUNCTIONS).to eq({ f: { args: [], body: [:+, 1] } })
+      expect(MVinl.context.functions).to eq({ f: { args: [], body: [:+, 1] } })
     end
-
-    it 'Stores function definition with \'-\' OPER and no arguments' do
+    it 'stores function definition with \'-\' OPER and no arguments' do
       MVinl.eval('def (f (- 1))')
-      expect(MVinl::Parser::FUNCTIONS).to eq({ f: { args: [], body: [:-, 1] } })
+      expect(MVinl.context.functions).to eq({ f: { args: [], body: [:-, 1] } })
     end
-
-    it 'Stores function definition with \'*\' OPER and no arguments' do
+    it 'stores function definition with \'*\' OPER and no arguments' do
       MVinl.eval('def (f (* 1))')
-      expect(MVinl::Parser::FUNCTIONS).to eq({ f: { args: [], body: [:*, 1] } })
+      expect(MVinl.context.functions).to eq({ f: { args: [], body: [:*, 1] } })
     end
-
-    it 'Stores function definition with \'/\' OPER and no arguments' do
+    it 'stores function definition with \'/\' OPER and no arguments' do
       MVinl.eval('def (f (/ 1))')
-      expect(MVinl::Parser::FUNCTIONS).to eq({ f: { args: [], body: [:/, 1] } })
+      expect(MVinl.context.functions).to eq({ f: { args: [], body: [:/, 1] } })
     end
-
-    it 'Stores function definition with \'%\' OPER and no arguments' do
+    it 'stores function definition with \'%\' OPER and no arguments' do
       MVinl.eval('def (f (% 1))')
-      expect(MVinl::Parser::FUNCTIONS).to eq({ f: { args: [], body: [:%, 1] } })
+      expect(MVinl.context.functions).to eq({ f: { args: [], body: [:%, 1] } })
     end
-
-    it 'Stores function definition with a single argument' do
+    it 'stores function definition with a single argument' do
       MVinl.eval('def (f a (+ a a))')
-      expect(MVinl::Parser::FUNCTIONS).to eq({ f: { args: %I[a], body: %I[+ a a] } })
+      expect(MVinl.context.functions).to eq({ f: { args: %I[a], body: %I[+ a a] } })
     end
-
-    it 'Stores function definition with two arguments' do
+    it 'stores function definition with two arguments' do
       MVinl.eval('def (f a b (+ a b))')
-      expect(MVinl::Parser::FUNCTIONS).to eq({ f: { args: %I[a b], body: %I[+ a b] } })
+      expect(MVinl.context.functions).to eq({ f: { args: %I[a b], body: %I[+ a b] } })
     end
-
-    it 'Evaluate anonimous function' do
-      result = MVinl.eval('@x x (+ 2 2)')
-      expect(result).to eq({ x: { x: [[4], {}] } })
+    it 'evaluates anonimous function' do
+      result = MVinl.eval('x (+ 2 2)')
+      expect(result).to eq({ x: [[4], {}] })
     end
-
-    it 'Evaluate function' do
-      result = MVinl.eval('def (foo (+ 5)) @x x (foo)')
-      expect(result).to eq({ x: { x: [[5], {}] } })
+    it 'evaluates function' do
+      result = MVinl.eval('def (foo (+ 5)) x (foo)')
+      expect(result).to eq({ x: [[5], {}] })
+    end
+    it 'evaluates function calling another function' do
+      result = MVinl.eval('def (foo (+ 5)) def (bar (foo)) x (bar)')
+      expect(result).to eq({ x: [[5], {}] })
+    end
+    it 'evaluates function inside a variable' do
+      MVinl.eval('def (foo (+ 7)) !n (foo)')
+      expect(MVinl.context.variables[:n]).to eq 7
     end
+  end
+end
 
-    it 'Evaluate function calling another function' do
-      result = MVinl.eval('def (foo (+ 5)) def (bar (foo)) @x x (bar)')
-      expect(result).to eq({ x: { x: [[5], {}] } })
+describe MVinl, '#eval_from_file' do
+  context 'stack example' do
+    it 'evaluates a basic example' do
+      MVinl.reset
+      result = MVinl.eval_from_file('spec/stack.mvnl')
+      expect(result).to eq({ menu: { Menu: [[], { New_Game: :state_next, Exit: :abord }] },
+                             game: { Mouse: [[], {}], Board: [[3, 3], {}],
+                                     Button: [['󰮱  Hello Vinl!'], {
+                                       line_height: 25, padding: 8
+                                     }] } })
     end
   end
 end

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', 121)
   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,8 +22,15 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 112)
     properties ||  Hash.new
   end
 
+
+  def define_variable(name, value)
+    @context.state[:in_var] = false
+    @context.variables[name] = value
+    value
+  end
+
   def define_function(name, args, body)
-  FUNCTIONS[name.to_sym] = {args: args, body: body}
+  @context.functions[name.to_sym] = {args: args, body: body}
     nil
   end
 
@@ -47,8 +45,8 @@ 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
@@ -81,137 +79,152 @@ 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 ]
+   -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 ]
 
 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 ]
+    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 ]
 
 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,     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 ]
 
 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,   -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 ]
 
 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 ]
+    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 ]
 
 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 ]
+    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 ]
 
 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,     3,     8,     5,     9,    10,    13,    -3,   nil,   nil,
+     3,   -14,    -2,   -19,   -18,   -26,   nil,    -5,   -11,   -36,
+   -16,   -28,   -23,   -27 ]
 
 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,    48,    13,    14,
+   nil,   nil,    54,   nil,   nil,    18,    19,    23,    27,   nil,
+    63,   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, 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,
+  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,
-  1, 37, :_reduce_42,
-  1, 26, :_reduce_43 ]
+  2, 38, :_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 ]
 
-racc_reduce_n = 44
+racc_reduce_n = 49
 
-racc_shift_n = 59
+racc_shift_n = 65
 
 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,
+  :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
 
 racc_use_result_var = false
 
@@ -236,9 +249,11 @@ Racc_token_to_s_table = [
   "$end",
   "error",
   "EOS",
+  "VARIABLE",
   "GROUP",
   "END_TAG",
   "KEYWORD_ARG",
+  "VARIABLE_CALL",
   "NUMBER",
   "FLOAT",
   "SYMBOL",
@@ -253,14 +268,16 @@ Racc_token_to_s_table = [
   "$start",
   "program",
   "group",
-  "function_def",
   "properties",
+  "variable_def",
+  "function_def",
+  "var_def_name",
+  "super_value",
   "property",
   "prop_id",
   "positional_args",
   "keyword_args",
   "identifier",
-  "super_value",
   "keyword_arg",
   "keyword_arg_id",
   "value",
@@ -294,7 +311,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,128 +321,128 @@ 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', 20)
   def _reduce_7(val, _values)
-     val[0].merge(val[1])
+     define_variable(val[0], val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 23)
   def _reduce_8(val, _values)
-     val[0].merge(val[1])
+     @context.state[:in_var] = true; val[0].to_sym
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 26)
   def _reduce_9(val, _values)
-     create_property(val[0])
+     {val[0].to_sym => create_group(val[1])}
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 27)
+module_eval(<<'.,.,', 'mvinl.y', 29)
   def _reduce_10(val, _values)
-     create_property(val[0], val[1])
+     Hash.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 28)
+module_eval(<<'.,.,', 'mvinl.y', 30)
   def _reduce_11(val, _values)
-     create_property(val[0], val[1], val[2])
+     val[0].merge(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 31)
   def _reduce_12(val, _values)
-     STATE[:in_prop] = true; val[0]
+     val[0].merge(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 34)
   def _reduce_13(val, _values)
-     Array.new
+     create_property(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 35)
   def _reduce_14(val, _values)
-     val[0] << val[1]
+     create_property(val[0], val[1])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 38)
+module_eval(<<'.,.,', 'mvinl.y', 36)
   def _reduce_15(val, _values)
-     Hash.new
+     create_property(val[0], val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 41)
+module_eval(<<'.,.,', 'mvinl.y', 39)
   def _reduce_16(val, _values)
-    	STATE[:keyword_arg_depth] = 0
-	val[0].merge(val[1])
-
+     @context.state[:in_prop] = true; val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 48)
+module_eval(<<'.,.,', 'mvinl.y', 42)
   def _reduce_17(val, _values)
-    	STATE[:in_keyword_arg] = false
-	STATE[:keyword_arg_depth] += 1
-	{val[0].to_sym => val[1]}
-
+     Array.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 54)
+module_eval(<<'.,.,', 'mvinl.y', 43)
   def _reduce_18(val, _values)
-     STATE[:in_keyword_arg] = true; val[0]
+     val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 57)
+module_eval(<<'.,.,', 'mvinl.y', 46)
   def _reduce_19(val, _values)
-     val[0]
+     Hash.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 58)
+module_eval(<<'.,.,', 'mvinl.y', 49)
   def _reduce_20(val, _values)
-     val[0]
+    	@context.state[:keyword_arg_depth] = 0
+	val[0].merge(val[1])
+
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 61)
+module_eval(<<'.,.,', 'mvinl.y', 56)
   def _reduce_21(val, _values)
-     val[0].to_i
+    	@context.state[:in_keyword_arg] = false
+	@context.state[:keyword_arg_depth] += 1
+	{val[0].to_sym => val[1]}
+
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 62)
   def _reduce_22(val, _values)
-     val[0].to_f
+     @context.state[:in_keyword_arg] = true; val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 63)
+module_eval(<<'.,.,', 'mvinl.y', 65)
   def _reduce_23(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 64)
+module_eval(<<'.,.,', 'mvinl.y', 66)
   def _reduce_24(val, _values)
-     val[0].to_sym
+     val[0]
   end
 .,.,
 
@@ -435,98 +452,98 @@ module_eval(<<'.,.,', 'mvinl.y', 67)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 68)
+module_eval(<<'.,.,', 'mvinl.y', 70)
   def _reduce_26(val, _values)
-     "#{val[0]} #{val[1]}"
+     val[0].to_i
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 73)
+module_eval(<<'.,.,', 'mvinl.y', 71)
   def _reduce_27(val, _values)
-    	  define_function(val[2], val[3], val[4])
-
+     val[0].to_f
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 77)
+module_eval(<<'.,.,', 'mvinl.y', 72)
   def _reduce_28(val, _values)
-     [val[1], *val[2]]
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 78)
+module_eval(<<'.,.,', 'mvinl.y', 73)
   def _reduce_29(val, _values)
-     [val[1], *val[2]]
+     val[0].to_sym
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 81)
+module_eval(<<'.,.,', 'mvinl.y', 76)
   def _reduce_30(val, _values)
-     evaluate_pn(val[1], val[2])
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 82)
+module_eval(<<'.,.,', 'mvinl.y', 77)
   def _reduce_31(val, _values)
-     evaluate_pn(val[1], val[2])
+     "#{val[0]} #{val[1]}"
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 85)
+module_eval(<<'.,.,', 'mvinl.y', 82)
   def _reduce_32(val, _values)
-     STATE[:depth] += 1
+    	  define_function(val[2], val[3], val[4])
+
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 88)
+module_eval(<<'.,.,', 'mvinl.y', 86)
   def _reduce_33(val, _values)
-     STATE[:depth] -= 1
+     [val[1], *val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 91)
+module_eval(<<'.,.,', 'mvinl.y', 87)
   def _reduce_34(val, _values)
-     Array.new
+     [val[1], *val[2]]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 92)
+module_eval(<<'.,.,', 'mvinl.y', 90)
   def _reduce_35(val, _values)
-     val[0] << val[1]
+     evaluate_pn(val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 93)
+module_eval(<<'.,.,', 'mvinl.y', 91)
   def _reduce_36(val, _values)
-     val[0] << val[1]
+     evaluate_pn(val[1], val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 94)
   def _reduce_37(val, _values)
-     val[0] << val[1]
+     @context.state[:depth] += 1
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 97)
   def _reduce_38(val, _values)
-     Array.new
+     @context.state[:depth] -= 1
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 98)
+module_eval(<<'.,.,', 'mvinl.y', 100)
   def _reduce_39(val, _values)
-     val[0] << val[1]
+     Array.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 99)
+module_eval(<<'.,.,', 'mvinl.y', 101)
   def _reduce_40(val, _values)
      val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 100)
+module_eval(<<'.,.,', 'mvinl.y', 102)
   def _reduce_41(val, _values)
      val[0] << val[1]
   end
@@ -534,12 +551,42 @@ module_eval(<<'.,.,', 'mvinl.y', 100)
 
 module_eval(<<'.,.,', 'mvinl.y', 103)
   def _reduce_42(val, _values)
-     val[0].to_sym
+     val[0] << val[1]
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 106)
   def _reduce_43(val, _values)
+     Array.new
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 107)
+  def _reduce_44(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 108)
+  def _reduce_45(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 109)
+  def _reduce_46(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 112)
+  def _reduce_47(val, _values)
+     val[0].to_sym
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 115)
+  def _reduce_48(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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - siery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-07 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pp
@@ -41,6 +41,7 @@ files:
 - bin/imvnl
 - edit/mvinl.vim
 - lib/mvinl.rb
+- lib/mvinl/context.rb
 - lib/mvinl/info.rb
 - lib/mvinl/lexer.rb
 - lib/mvinl/parser.rb