mvinl 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f891e7bb1683b84d918155e32b06fdf03ae4d00791676e4b1dc467c30d495b90
-  data.tar.gz: c96e8a9930ed532580014843594d70d3fb025089fdd06708e9440b5316c2a772
+  metadata.gz: 2e1464b5085d8cd24dc9b43f22063e675a8f6d249a2c3d716e29367726032e16
+  data.tar.gz: 0f8ee1fa140bf083afda23c1004e02bf3a8b3e0fcccd55f19d39135305b6b2dd
 SHA512:
-  metadata.gz: febf482245e910fe310efae6a5aaaa115769830475678ba8b0e8b0d65dee6b0b4e22f5a4d9d5e5236f5a8e35e0125f55d406a155c6e2b3e4441ced8f7dfe05de
-  data.tar.gz: fb604a7c640da0406c0d0a1190ba0a684491728cd1b9b666da5e870bd754b50d8ebde6ad5a2e3dfea0aecab98e98fc60e7dfbb3d35f94526d5294e981ef91bb1
+  metadata.gz: 449b3f884f41165b9892fa70e9a776dbd7208261ad1d237189d252fcec7f09fe6688873324b8045b9a85b1fdf7e707591057f4e1e7bf899fa48170f8e2cbf9a4
+  data.tar.gz: 0a09d81f07dcbc1c9253048526b3e60606b7a48c657f040c4a76e7d639d104b14148d5e2e640574429f4d1181eb85974543f74ec2b87077c29f3befe07aa2d76

data/README.md

@@ -15,8 +15,8 @@ gem install mvinl
 or build and install it from this repo if you have it downloaded
 
 ```
-gem build
-gem install ./mvinl-0.1.0.gem
+rake build
+rake install
 ```
 
 ## Usage
@@ -46,7 +46,7 @@ def (center x (/ x 2))
   Buttom (center 1920)
          (center 1080)
          "Hello, MVinl!"
-        font_size: 21     # END_TAG is optional
+         font_size: 21     # END_TAG is optional
 ```
 
 ## Contribute

data/Rakefile

@@ -1,5 +1,11 @@
-task default: %w[spec]
+# frozen-string-literal: true
 
-task :spec do
-  rspec
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec, :tag) do |t, task_args|
+    t.rspec_opts = ENV['SPEC_OPTS'] || '--format documentation'
+  end
+  task default: :spec
+rescue LoadError
+  warn 'Could not run rspec'
 end

data/lib/mvinl/info.rb

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

data/lib/mvinl/lexer.rb

@@ -28,7 +28,9 @@ module MVinl
       KEYWORD_ARG: /(#{ID_REGEX}):/,
       ID: ID_REGEX,
       GROUP: /@(#{ID_REGEX})/,
+      FLOAT: /[+-]?\d+\.\d+/,
       NUMBER: /[+-]?\d+/,
+      MULTILINE_STRING: /"((?:\\.|[^"\\])*)"\s*\\\s*/,
       STRING: /"((?:\\.|[^"\\])*)"/,
       SYMBOL: /:(#{ID_REGEX})/,
       COMMENT: /#/,
@@ -71,7 +73,7 @@ module MVinl
       when :OPEN_PAREN then [:OPEN_PAREN, '(']
       when :CLOSE_PAREN
         unless Parser::STATE[:depth].positive?
-          raise UnexpectedTokenError, 'CLOSE_PARAM found winth no matching OPEN_PARAM'
+          raise UnexpectedTokenError, 'CLOSE_PARAM found with no matching OPEN_PARAM'
         end
 
         [:CLOSE_PAREN, ')']
@@ -102,7 +104,9 @@ module MVinl
         @in_group = true
         [:GROUP, @ss[1]]
       when :ID then [:ID, @ss.matched]
-      when :NUMBER, :STRING, :SYMBOL
+      when :MULTILINE_STRING
+        [:MULTILINE_STRING, @ss[1]]
+      when :NUMBER, :FLOAT, :STRING, :SYMBOL
         # Values can't be used outside an property or a lambda
         if !Parser::STATE[:in_prop] && !Parser::STATE[:depth].positive?
           raise UnexpectedTokenError, "Looking for ID or OPEN_PAREN but found #{@last_type}"

data/lib/mvinl/parser.rb

@@ -6,7 +6,7 @@ Copyright (c) 2024, Daniel Sierpiński All rights reserved.
 See Copyright Notice in mvnil.rb
 =end
 
-require_relative '../../syntax/mvinl.tab'
+require 'mvinl.tab'
 
 class MVinl::Parser < MVinl::Program
   def initialize(lexer, debug: false)

data/mvinl.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   # Compile syntax file
   s.files.delete(GRAMMAR_FILE)
   s.files << COMPILED_FILE
-  s.require_paths = %w[lib bin s rakelib syntax]
+  s.require_paths = %w[lib syntax]
   s.executables << 'imvnl'
 
   s.add_dependency 'pp', '~> 0.6.2'

data/rakelib/build.rake

@@ -1,8 +1,32 @@
 # frozen-string-literal: true
 
+require 'rubygems/package'
+require 'mvinl/info'
+
+require 'pry'
+require 'shellwords'
+
 GRAMMAR_FILE = 'syntax/mvinl.y'
 COMPILED_FILE = 'syntax/mvinl.tab.rb'
 
-task 'build' do
+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
+
+task :compile do
   system('racc', GRAMMAR_FILE, '-o', COMPILED_FILE)
 end

data/spec/program_spec.rb

@@ -0,0 +1,87 @@
+# frozen-string-literal: true
+
+require_relative 'spec_helper'
+require 'mvinl'
+
+describe MVinl, '#eval' do
+  context 'no input' do
+    it 'returns an empty hash' do
+      result = MVinl.eval('')
+      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 'functions' 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] } })
+    end
+
+    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] } })
+    end
+
+    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] } })
+    end
+
+    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] } })
+    end
+
+    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] } })
+    end
+
+    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] } })
+    end
+
+    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] } })
+    end
+
+    it 'Evaluate anonimous function' do
+      result = MVinl.eval('@x x (+ 2 2)')
+      expect(result).to eq({ x: { x: [[4], {}] } })
+    end
+
+    it 'Evaluate function' do
+      result = MVinl.eval('def (foo (+ 5)) @x x (foo)')
+      expect(result).to eq({ x: { x: [[5], {}] } })
+    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], {}] } })
+    end
+  end
+end

data/spec/spec_helper.rb

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

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', 105)
+module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 112)
 
   FUNCTIONS = {}
   STATE = {
@@ -47,8 +47,8 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 105)
       end
     end
 
-    if FUNCTIONS.key?(operator.to_sym)
-      function = FUNCTIONS[operator.to_sym]
+    if FUNCTIONS.key?(operator)
+      function = FUNCTIONS[operator]
       raise MVinl::ParserError, "Argument mismatch for #{operator}" if operands.size != function[:args].size
 
       # Map arguments to operands
@@ -59,7 +59,7 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 105)
       evaluate_pn(function[0], function[1..], new_context)
     else
       begin
-        operands.reduce(operator.to_sym)
+        operands.reduce(operator)
       rescue NoMethodError
         raise MVinl::ParserError, "Unknown operator: #{operator}"
       end
@@ -81,107 +81,116 @@ module_eval(<<'...end mvinl.y/module_eval...', 'mvinl.y', 105)
 ##### State transition tables begin ###
 
 racc_action_table = [
-     2,     8,     5,     6,    30,    26,    27,    28,    15,     7,
-    11,    11,    15,    15,    26,    27,    28,    15,    17,    11,
-    41,    48,    15,    26,    27,    28,    37,    41,    11,    41,
-    48,    15,    26,    27,    28,    43,   nil,    11,    41,    15,
-    15,    26,    27,    28,   nil,   nil,    11,    41,   nil,    15,
-   -14,   -14,   -14,   -14,   nil,   nil,    11,   -16,    26,    27,
-    28,   nil,   nil,    11,    26,    27,    28,   nil,   nil,    11 ]
+    -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 ]
 
 racc_action_check = [
-     1,     2,     1,     1,    20,    21,    21,    21,    20,     1,
-    21,     7,     9,    21,    38,    38,    38,    10,    12,    38,
-    38,    38,    38,    39,    39,    39,    22,    31,    39,    39,
-    39,    39,    50,    50,    50,    32,   nil,    50,    50,    32,
-    50,    51,    51,    51,   nil,   nil,    51,    51,   nil,    51,
-    13,    13,    13,    13,   nil,   nil,    13,    18,    18,    18,
-    18,   nil,   nil,    18,    36,    36,    36,   nil,   nil,    36 ]
+    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 ]
 
 racc_action_pointer = [
-   nil,     0,     1,   nil,   nil,   nil,   nil,     0,   nil,    -2,
-     3,   nil,    14,    45,   nil,   nil,   nil,   nil,    52,   nil,
-    -6,    -1,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    15,    25,   nil,   nil,   nil,    58,   nil,     8,    17,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    26,    35,   nil,   nil,   nil ]
+   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 ]
 
 racc_action_default = [
-    -1,   -41,   -41,    -2,    -3,    -4,    -6,   -41,    55,    -5,
-   -41,   -30,    -7,    -9,   -13,   -40,   -32,    -8,   -10,   -12,
-   -41,   -41,   -11,   -15,   -20,   -21,   -22,   -23,   -24,   -36,
-   -36,   -35,   -41,   -33,   -34,   -17,   -41,   -19,   -41,   -41,
-   -25,   -31,   -32,   -32,   -18,   -28,   -37,   -38,   -39,   -29,
-   -41,   -41,   -26,   -35,   -27 ]
+    -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 ]
 
 racc_goto_table = [
-    10,    14,    16,    34,    23,    38,    39,     1,    21,    40,
-     3,     4,    29,     9,    32,    12,    45,    49,    13,    18,
-    22,    19,    44,    35,    42,    36,    31,   nil,    52,    54,
-    47,    47,    34,    34,    50,    51,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    32,    32 ]
+    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 ]
 
 racc_goto_check = [
-    15,    10,    10,    14,    11,    19,    19,     1,    16,    18,
-     2,     3,    10,     4,    15,     5,    18,    18,     6,     7,
-     8,     9,    11,    12,    10,    13,    17,   nil,    18,    18,
-    10,    10,    14,    14,    16,    16,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    15,    15 ]
+    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 ]
 
 racc_goto_pointer = [
-   nil,     7,     9,    10,     7,     6,     9,     6,     2,     8,
-    -8,   -14,     1,     3,   -18,    -7,    -8,     5,   -22,   -24 ]
+   nil,     8,    12,    13,     9,     7,     8,     5,     1,    -8,
+   -13,     0,     1,   -16,   nil,     0,    -7,    -9,    11,   -22,
+   -26,   -29 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,
-    33,    46,   nil,   nil,    24,    20,   nil,    53,   nil,   nil ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    33,
+    52,   nil,   nil,    22,    23,    26,    30,   nil,    57,   nil,
+   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  0, 16, :_reduce_1,
-  2, 16, :_reduce_2,
-  2, 16, :_reduce_3,
-  2, 16, :_reduce_4,
-  2, 17, :_reduce_5,
-  0, 19, :_reduce_6,
-  2, 19, :_reduce_7,
-  3, 19, :_reduce_8,
-  1, 20, :_reduce_9,
-  2, 20, :_reduce_10,
-  3, 20, :_reduce_11,
-  2, 20, :_reduce_12,
-  1, 21, :_reduce_13,
-  0, 22, :_reduce_14,
-  2, 22, :_reduce_15,
-  0, 23, :_reduce_16,
-  2, 23, :_reduce_17,
-  2, 27, :_reduce_18,
-  1, 28, :_reduce_19,
-  1, 26, :_reduce_20,
-  1, 26, :_reduce_21,
-  1, 29, :_reduce_22,
-  1, 29, :_reduce_23,
-  1, 29, :_reduce_24,
-  6, 18, :_reduce_25,
-  4, 32, :_reduce_26,
-  4, 32, :_reduce_27,
-  4, 24, :_reduce_28,
-  4, 24, :_reduce_29,
-  1, 30, :_reduce_30,
-  1, 33, :_reduce_31,
-  0, 31, :_reduce_32,
-  2, 31, :_reduce_33,
-  2, 31, :_reduce_34,
-  2, 31, :_reduce_35,
-  0, 34, :_reduce_36,
+  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,
-  2, 34, :_reduce_38,
-  2, 34, :_reduce_39,
-  1, 25, :_reduce_40 ]
+  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 = 41
+racc_reduce_n = 44
 
-racc_shift_n = 55
+racc_shift_n = 59
 
 racc_token_table = {
   false => 0,
@@ -191,16 +200,18 @@ racc_token_table = {
   :END_TAG => 4,
   :KEYWORD_ARG => 5,
   :NUMBER => 6,
-  :STRING => 7,
+  :FLOAT => 7,
   :SYMBOL => 8,
-  :DEF => 9,
-  :OPER => 10,
-  :OPEN_PAREN => 11,
-  :CLOSE_PAREN => 12,
-  :polish_notation => 13,
-  :ID => 14 }
+  :STRING => 9,
+  :MULTILINE_STRING => 10,
+  :DEF => 11,
+  :OPEN_PAREN => 12,
+  :CLOSE_PAREN => 13,
+  :polish_notation => 14,
+  :OPER => 15,
+  :ID => 16 }
 
-racc_nt_base = 15
+racc_nt_base = 17
 
 racc_use_result_var = false
 
@@ -229,13 +240,15 @@ Racc_token_to_s_table = [
   "END_TAG",
   "KEYWORD_ARG",
   "NUMBER",
-  "STRING",
+  "FLOAT",
   "SYMBOL",
+  "STRING",
+  "MULTILINE_STRING",
   "DEF",
-  "OPER",
   "OPEN_PAREN",
   "CLOSE_PAREN",
   "polish_notation",
+  "OPER",
   "ID",
   "$start",
   "program",
@@ -246,16 +259,18 @@ Racc_token_to_s_table = [
   "prop_id",
   "positional_args",
   "keyword_args",
-  "lambda",
   "identifier",
   "super_value",
   "keyword_arg",
   "keyword_arg_id",
   "value",
+  "lambda",
+  "string",
   "open_paren",
   "args",
   "polish_notation_def",
   "close_paren",
+  "operator",
   "params" ]
 Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
@@ -331,46 +346,40 @@ module_eval(<<'.,.,', 'mvinl.y', 28)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 29)
+module_eval(<<'.,.,', 'mvinl.y', 31)
   def _reduce_12(val, _values)
-     create_property(val[0], val[1])
+     STATE[:in_prop] = true; val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 32)
+module_eval(<<'.,.,', 'mvinl.y', 34)
   def _reduce_13(val, _values)
-     STATE[:in_prop] = true; val[0]
+     Array.new
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 35)
   def _reduce_14(val, _values)
-     Array.new
-  end
-.,.,
-
-module_eval(<<'.,.,', 'mvinl.y', 36)
-  def _reduce_15(val, _values)
      val[0] << val[1]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 39)
-  def _reduce_16(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 38)
+  def _reduce_15(val, _values)
      Hash.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 42)
-  def _reduce_17(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 41)
+  def _reduce_16(val, _values)
     	STATE[:keyword_arg_depth] = 0
 	val[0].merge(val[1])
 
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 49)
-  def _reduce_18(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 48)
+  def _reduce_17(val, _values)
     	STATE[:in_keyword_arg] = false
 	STATE[:keyword_arg_depth] += 1
 	{val[0].to_sym => val[1]}
@@ -378,27 +387,33 @@ module_eval(<<'.,.,', 'mvinl.y', 49)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 55)
-  def _reduce_19(val, _values)
+module_eval(<<'.,.,', 'mvinl.y', 54)
+  def _reduce_18(val, _values)
      STATE[:in_keyword_arg] = true; val[0]
   end
 .,.,
 
+module_eval(<<'.,.,', 'mvinl.y', 57)
+  def _reduce_19(val, _values)
+     val[0]
+  end
+.,.,
+
 module_eval(<<'.,.,', 'mvinl.y', 58)
   def _reduce_20(val, _values)
      val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 59)
+module_eval(<<'.,.,', 'mvinl.y', 61)
   def _reduce_21(val, _values)
-     val[0]
+     val[0].to_i
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 62)
   def _reduce_22(val, _values)
-     val[0].to_i
+     val[0].to_f
   end
 .,.,
 
@@ -414,68 +429,68 @@ module_eval(<<'.,.,', 'mvinl.y', 64)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 69)
+module_eval(<<'.,.,', 'mvinl.y', 67)
   def _reduce_25(val, _values)
-    	  define_function(val[2], val[3], val[4])
-
+     val[0]
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 73)
+module_eval(<<'.,.,', 'mvinl.y', 68)
   def _reduce_26(val, _values)
-     [val[1], *val[2]]
+     "#{val[0]} #{val[1]}"
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 74)
+module_eval(<<'.,.,', 'mvinl.y', 73)
   def _reduce_27(val, _values)
-     [val[1], *val[2]]
+    	  define_function(val[2], val[3], val[4])
+
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 77)
   def _reduce_28(val, _values)
-     evaluate_pn(val[1], val[2])
+     [val[1], *val[2]]
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 78)
   def _reduce_29(val, _values)
-     evaluate_pn(val[1], val[2])
+     [val[1], *val[2]]
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 81)
   def _reduce_30(val, _values)
-     STATE[:depth] += 1
+     evaluate_pn(val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 84)
+module_eval(<<'.,.,', 'mvinl.y', 82)
   def _reduce_31(val, _values)
-     STATE[:depth] -= 1
+     evaluate_pn(val[1], val[2])
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 87)
+module_eval(<<'.,.,', 'mvinl.y', 85)
   def _reduce_32(val, _values)
-     Array.new
+     STATE[:depth] += 1
   end
 .,.,
 
 module_eval(<<'.,.,', 'mvinl.y', 88)
   def _reduce_33(val, _values)
-     val[0] << val[1]
+     STATE[:depth] -= 1
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 89)
+module_eval(<<'.,.,', 'mvinl.y', 91)
   def _reduce_34(val, _values)
-     val[0] << val[1]
+     Array.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 90)
+module_eval(<<'.,.,', 'mvinl.y', 92)
   def _reduce_35(val, _values)
      val[0] << val[1]
   end
@@ -483,7 +498,7 @@ module_eval(<<'.,.,', 'mvinl.y', 90)
 
 module_eval(<<'.,.,', 'mvinl.y', 93)
   def _reduce_36(val, _values)
-     Array.new
+     val[0] << val[1]
   end
 .,.,
 
@@ -493,13 +508,13 @@ module_eval(<<'.,.,', 'mvinl.y', 94)
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 95)
+module_eval(<<'.,.,', 'mvinl.y', 97)
   def _reduce_38(val, _values)
-     val[0] << val[1]
+     Array.new
   end
 .,.,
 
-module_eval(<<'.,.,', 'mvinl.y', 96)
+module_eval(<<'.,.,', 'mvinl.y', 98)
   def _reduce_39(val, _values)
      val[0] << val[1]
   end
@@ -507,6 +522,24 @@ module_eval(<<'.,.,', 'mvinl.y', 96)
 
 module_eval(<<'.,.,', 'mvinl.y', 99)
   def _reduce_40(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 100)
+  def _reduce_41(val, _values)
+     val[0] << val[1]
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 103)
+  def _reduce_42(val, _values)
+     val[0].to_sym
+  end
+.,.,
+
+module_eval(<<'.,.,', 'mvinl.y', 106)
+  def _reduce_43(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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - siery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pp
@@ -46,6 +46,8 @@ files:
 - lib/mvinl/parser.rb
 - mvinl.gemspec
 - rakelib/build.rake
+- spec/program_spec.rb
+- spec/spec_helper.rb
 - spec/stack.mvnl
 - syntax/mvinl.tab.rb
 homepage: https://rubygems.org/gems/mvinl
@@ -57,9 +59,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- bin
-- s
-- rakelib
 - syntax
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: