lisp-interpreter 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65e89fbe8025750a006c6c098017b1f65242fd6
-  data.tar.gz: 555c606c9d3ed1367a41c6c82c569e4afc4a25c8
+  metadata.gz: e42cb76ae181c2c05ab42aa889adbdacf005a035
+  data.tar.gz: c2cd98fddb347ba1cf6d4a0fee387bec7b07f253
 SHA512:
-  metadata.gz: c1e32ed761f22a0dab7fd5d4072e4457650fc4ff4efeb98628e172b63fcd7363cc4395decfd99bcaab9fef6f028b76e8b2de06ab380002fb23542aa30e2233bf
-  data.tar.gz: 60ea067619421cb4d173b9ef99ef725a16c03c43a5643fcf6e25771878cdd012ccf65d1c6c2f6081a1d959558fac5ad401ca67c1b773c516660c7dc264b8eb53
+  metadata.gz: 70baacf442ee6d7ab3642ca52924ba49786facddd316a4c67c435fbe9f8977c5b8e9ef8876f24ffcdc2dbdcc0ce272f57dff9753faecd4985d84f105d8df4ed4
+  data.tar.gz: b90ca4a20c0c1161acd606270455153d89af7c00df3fed5f9911f64d91f7f3b5386e859d27a4a7ec42c505998684941e8f3eef714c916bef80f8cf6403ff85e1

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/zaki1993/Ruby-Project/lisp-interpreter" }
+source 'https://rubygems.org'
+r_name = 'https://github.com/zaki1993/Ruby-Project/lisp-interpreter'
+git_source(:github) { |_repo_name| r_name }
 
 # Specify your gem's dependencies in lisp-interpreter.gemspec
 gemspec

data/README.md

@@ -96,7 +96,7 @@ strings:
     
 list and pairs:
     
-    (null? \'()); #t
+    (null? '()); #t
     
     (cons 1 2); (1 . 2)
     

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: :spec

data/lib/lisp/interpreter/checker.rb

@@ -0,0 +1,44 @@
+# Check if variable is specific type
+module SchemeChecker
+  def check_for_bool(token)
+    return true if token.boolean?
+    is_instance_var = check_instance_var token
+    return (check_for_bool get_var token) if is_instance_var
+    false
+  end
+
+  def check_for_string(token)
+    return true if token.string?
+    is_instance_var = check_instance_var token
+    return (check_for_string get_var token) if is_instance_var
+    false
+  end
+
+  def check_for_num(token)
+    return true if token.to_s.number?
+    is_instance_var = check_instance_var token
+    return (check_for_num get_var token) if is_instance_var
+    false
+  end
+
+  def check_for_quote(token)
+    return true if token[0].quote?
+    is_instance_var = check_instance_var token
+    return (check_for_num get_var token) if is_instance_var
+    false
+  end
+
+  def check_for_symbol(var)
+    var = var.join('') if var.is_a? Array
+    return true if var.character?
+    is_instance_var = check_instance_var var
+    return (check_for_character get_var var) if is_instance_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/core/list.rb

@@ -14,17 +14,6 @@ module SchemeListsHelper
     result
   end
 
-  def find_to_evaluate_or_not(tokens, no_quotes = false)
-    if tokens[0..1].join == '(list'
-      evaluate_list tokens[2..-2], no_quotes
-    elsif tokens[0..1].join == '(cons'
-      result = cons tokens[2..-2]
-      result[2..-2].split(' ')
-    else
-      no_eval_list tokens[2..-2], no_quotes
-    end
-  end
-
   def find_idx_for_list(tokens)
     if tokens[0] == '('
       find_bracket_idx tokens, 0
@@ -103,11 +92,23 @@ module SchemeListsHelper
     [func, other]
   end
 
-  def car_cdr_infinite_helper(value, fn)
-    fn.reverse[1..-2].each_char do |t|
-      value = t == 'a' ? (car [value]) : (cdr [value])
+  def build_function_car_cdr(fn)
+    prepare_call = ['(', fn, 'x', ')']
+    fn[1..-2].each_char do |t|
+      prepare_call += (t == 'a' ? ['(', 'car'] : ['(', 'cdr'])
     end
-    value
+    prepare_call << 'x'
+    (fn.size - 2).times { prepare_call << ')' }
+    prepare_call
+  end
+
+  def generate_infinite_car_cdr(fn)
+    prepare_call = build_function_car_cdr fn
+    define_function prepare_call
+  end
+
+  def call_car_cdr_infinite(fn, values)
+    @procs[fn.to_s].call values
   end
 end
 
@@ -177,7 +178,8 @@ module SchemeLists
   def car_cdr_infinite(other)
     fn = other[1]
     values = find_all_values other[2..-2]
-    raise 'Incorrect number of arguments' unless values.size == 1
-    car_cdr_infinite_helper values[0], fn
+    return call_car_cdr_infinite fn, values if @procs.key? fn.to_s
+    raise arg_err_build 1, values.size unless values.size == 1
+    (generate_infinite_car_cdr fn).call values[0]
   end
 end

data/lib/lisp/interpreter/core/object.rb

@@ -41,13 +41,9 @@ class Object
   end
 
   def type
-    return '<list>' if list?
-    return '<pair>' if pair?
-    return '<string>' if string?
-    return '<number>' if number?
-    return '<character>' if character?
-    return '<boolean>' if boolean?
-    '<quote>'
+    fns = %w[list pair string number character boolean quote]
+    res = fns.reject { |t| fns.index(t) unless send t + '?' }
+    '<' + res[0] + '>'
   end
 
   private

data/lib/lisp/interpreter/helpers/value_finder.rb

@@ -55,6 +55,8 @@ module ValueFinder
 
   def find_next_value(other)
     return [other[0], other[1..-1]] if other[0].is_a? Proc
+    match_inf = other[0].to_s.match(/c[ad]{2,}r/)
+    return [(generate_infinite_car_cdr other[0]), other[1..-1]] if match_inf
     find_value_helper other
   end
 
@@ -80,7 +82,7 @@ module ValueFinder
     else
       return if token.empty?
       token = token.join('') if token.is_a? Array
-      return token if token =~ /c[ad]{2,}r/
+      return (generate_infinite_car_cdr token) if token =~ /c[ad]{2,}r/
       get_var token.to_s
     end
   end

data/lib/lisp/interpreter/parser.rb

@@ -111,7 +111,7 @@ class Parser
 
   def find_result_type(res, methods)
     return '#<Closure>' if res.is_a? Proc
-    is_func = (methods.key? res.to_s) || res.to_s.match(/c[ad]{2,}r/)
+    is_func = (methods.key? res.to_s)
     return '#<Function ' + res.to_s + '>' if is_func
     res.to_s
   end

data/lib/lisp/interpreter/version.rb

@@ -1,5 +1,5 @@
 module Lisp
   module Interpreter
-    VERSION = '0.4.4'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/lisp-interpreter.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'lisp/interpreter/version'
@@ -9,25 +10,23 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Zaki Petrov']
   spec.email         = ['zaki1993@abv.bg\n']
 
-  spec.summary       = %q{Lisp interpreter gem}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.summary       = 'Lisp interpreter gem'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
     raise 'RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes.'
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test)/})
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Zaki Petrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - bin/start.rb
 - bin/zakichan.bat
 - lib/lisp/interpreter.rb
+- lib/lisp/interpreter/checker.rb
 - lib/lisp/interpreter/core/boolean.rb
 - lib/lisp/interpreter/core/errors.rb
 - lib/lisp/interpreter/core/functional.rb