lisp-interpreter 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '04861fa302be02832ee0c9046fd0cef4fcd26b23'
-  data.tar.gz: c9321964af29b7aba0e0cb7b9682d68f79795b68
+  metadata.gz: b6584d9c2b08667819afb7881eb05cb0bf48ef8e
+  data.tar.gz: 925a17053ce726096af39feca3c3323ba1c2c522
 SHA512:
-  metadata.gz: c33ff37553a332339d73ec5120cd56922126f481d8d7aaa3ae1bd68b7919ce542e6e6bc60e57231ac43e9078fe4cd265aaedd0f54b25f5575023508519eef63b
-  data.tar.gz: 496f3e3511eb5e7c478c49d3e42b24586a49bb90dd001367fcf7813cc3399cda2c8cc123e47eb84f0cce1f77b44791f806f803f5058aebf454fd3a3b9905679b
+  metadata.gz: f77bb6673b06e2ade1e66b9b6ecb505cc22bb61e9412082fdd73f1edc17f0286753c3cbf199807fd6d8b62d34960e494c488a5e95885036e1c076f8a6f81787c
+  data.tar.gz: 6569b82688035c53ed943e8955b2cde78aadedb648d2f7d62a45eae9d2138db314af86f5429ea06291beabb0a845f5c31b4b4bf4d9d318bf38ce14299e9cf920

data/lib/lisp/interpreter/checker.rb

@@ -28,12 +28,6 @@ module SchemeChecker
     false
   end
 
-  def check_instance_var(var)
-    return false if var.is_a? Proc
-    return false unless valid_var_name var
-    instance_variable_defined?("@#{var}")
-  end
-
   def check_for_symbol(var)
     var = var.join('') if var.is_a? Array
     return true if var == '#\space'
@@ -42,4 +36,10 @@ module SchemeChecker
     return true if is_instance_var && (check_for_character get_var var)
     false
   end
+
+  def check_instance_var(var)
+    return false if var.is_a? Proc
+    return false unless valid_var_name var
+    @procs.key? var.to_s
+  end
 end

data/lib/lisp/interpreter/functional.rb

@@ -163,7 +163,7 @@ module FunctionalSchemeHelper
   def define_var(var, values)
     raise arg_err_build 1, values.size if values.size != 1
     raise 'Invalid variable name' unless valid_var_name var
-    set_var_helper var, values[0]
+    set_var var, values[0]
   end
 
   def set_values_define(other, params, args)

data/lib/lisp/interpreter/tokenizer.rb

@@ -61,30 +61,20 @@ module TokenizerHelper
 
   def set_reserved_keywords
     @reserved.each do |key, value|
-      instance_variable_set("@#{key}", value)
+      @procs[key.to_s] = value
     end
   end
 
-  def set_var_helper(var, value)
+  def set_var(var, value)
+    raise 'Cannot predefine reserved keyword' if @reserved.key? var.to_s
     valid = (valid_var value.to_s) || (value.is_a? Proc)
     raise 'Invalid parameter' unless valid
-    if value.is_a? Proc
-      remove_instance_variable("@#{var}") if check_instance_var var
-      @procs[var] = value if value.is_a? Proc
-    else
-      @procs.delete var
-      set_var var, value
-    end
-  end
-
-  def set_var(var, value)
-    raise 'Cannot predefine reserved keyword' if @reserved.key? var
-    instance_variable_set("@#{var}", value)
+    @procs[var] = value
   end
 
   def get_var(var)
     check = check_instance_var var
-    return instance_variable_get("@#{var}") if check
+    return @procs[var.to_s] if check
     val = (predefined_method_caller [var])
     return val unless val.nil?
     valid = valid_var var

data/lib/lisp/interpreter/validator.rb

@@ -17,7 +17,8 @@ module Validator
   end
 
   def valid_var_name(var)
-    !var.match(/^[[:alpha:]]+$/).nil?
+    symbols = %r{[<|<=|=|>|>=|*|\/|+|-|&|^|#|@|]}
+    !var.match(/[[:alpha:]]/).nil? || !var.match(symbols).nil?
   end
 
   def valid_var(var)

data/lib/lisp/interpreter/version.rb

@@ -1,5 +1,5 @@
 module Lisp
   module Interpreter
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.3.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Zaki Petrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler