lisp-interpreter 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6584d9c2b08667819afb7881eb05cb0bf48ef8e
-  data.tar.gz: 925a17053ce726096af39feca3c3323ba1c2c522
+  metadata.gz: 31b5afb412627509393e82cd31613a47029d6de8
+  data.tar.gz: 5fb55aedca3ff30a6a41f9a808379a9483feb03c
 SHA512:
-  metadata.gz: f77bb6673b06e2ade1e66b9b6ecb505cc22bb61e9412082fdd73f1edc17f0286753c3cbf199807fd6d8b62d34960e494c488a5e95885036e1c076f8a6f81787c
-  data.tar.gz: 6569b82688035c53ed943e8955b2cde78aadedb648d2f7d62a45eae9d2138db314af86f5429ea06291beabb0a845f5c31b4b4bf4d9d318bf38ce14299e9cf920
+  metadata.gz: 1c1101cea234ab1711fc5208d344199fc492032c214448442c23eaba3c7940b0cb9792f374845e52b92f5e00d5525bb49e938b8091a7d4450bed56347831e64f
+  data.tar.gz: 15b95c4869df5dd227fbd243a0d6a53fe4ce008bc94ac6e58b09bcf99206d465f10e9821146f2438fd57e5698cf32fbe559c0d84e3ac71bb32f12e476b1dd7c6

data/lib/lisp/interpreter/list.rb

@@ -102,6 +102,13 @@ module SchemeListsHelper
     raise arg_err_build 'at least 2', 1 if other.empty?
     [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])
+    end
+    value
+  end
 end
 
 # Scheme lists module
@@ -166,4 +173,11 @@ module SchemeLists
     values = find_list_function_value other
     build_list values.shuffle
   end
+
+  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
+  end
 end

data/lib/lisp/interpreter/parser.rb

@@ -24,7 +24,7 @@ class Parser
       print 'zakichan> ' if @env_type == Environment::PROD
       token = ''
       until (validate_token token).nil? && token != ''
-        crr_input = STDIN.gets.chomp
+        crr_input = STDIN.gets.chomp + ' '
         token << crr_input
         break if crr_input == ''
       end
@@ -47,17 +47,16 @@ class Parser
   def read_file_helper(token)
     pattern = /^ghci .*\.[.ss|.scm]+$/
     result = (token =~ pattern)
-    if result.nil?
-      token = token[5..-1].nil? ? token[4..-1] : token[5..-1]
-      msg = 'File with name "' + token + '" is not valid scheme file'
-      return msg
-    end
-    true
+    return unless result.nil?
+    token = token[5..-1].nil? ? token[4..-1] : token[5..-1]
+    msg = 'File with name "' + token + '" is not valid scheme file'
+    msg
   end
 
   def read_file_reader(f, expr)
-    while (c = f.read(1))
-      expr << c
+    last_value = ''
+    f.each do |line|
+      expr << line
       if (validate_token expr).nil? && expr != ''
         last_value = parse expr
         expr = ''
@@ -74,10 +73,10 @@ class Parser
 
   def read_file(token)
     res = read_file_helper token
-    return res if res.is_a? String
+    return finalize_result res if res.is_a? String
     filename = token[5..-1]
     return read_file_executor filename if File.exist? filename
-    'File with name "' + filename + '" does not exist!'
+    finalize_result 'File with name "' + filename + '" does not exist!'
   end
 
   def parse(token)
@@ -89,7 +88,7 @@ class Parser
       else
         token_error
       end
-    print_result result unless result.to_s.empty?
+    finalize_result result unless result.to_s.empty?
   end
 
   def validate_token(token)
@@ -100,10 +99,27 @@ class Parser
     end
   end
 
-  def print_result(result)
+  def finalize_result(result)
+    result = format_result result
+    display_result result if @env_type == Environment::PROD
+    result
+  end
+
+  def format_result(result)
     to_remove = result.to_s.list? || result.to_s.pair? || result.to_s.quote?
     result = result.delete('\'') if to_remove
-    puts result if @env_type == Environment::PROD
     result
   end
+
+  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/)
+    return '#<Function ' + res.to_s + '>' if is_func
+    res.to_s
+  end
+
+  def display_result(result)
+    to_print = find_result_type result, @tokenizer.syntax_methods
+    puts to_print
+  end
 end

data/lib/lisp/interpreter/tokenizer.rb

@@ -80,6 +80,10 @@ module TokenizerHelper
     valid = valid_var var
     valid ? var : (raise 'Unbound symbol "' + var + '"')
   end
+
+  def syntax_methods
+    @functions
+  end
 end
 
 # Tokenizer class
@@ -108,7 +112,7 @@ class Tokenizer
 
   def check_car_cdr(arr)
     result = arr[1].match(/c[ad]{2,}r/)
-    raise 'No procedure found' if result.nil?
+    raise arr[1].to_s + ' is not a function' if result.nil?
     car_cdr_infinite arr
   end
 
@@ -131,12 +135,17 @@ class Tokenizer
     end
   end
 
+  def validate_call_method(m_name)
+    raise m_name.to_s + ' is not a function' if valid_var m_name.to_s
+  end
+
   def call_predefined_method(m_name, arr)
     return special_check_proc m_name, arr if m_name.is_a? Proc
     if @do_not_calculate.include? m_name
       send m_name.to_s, arr[2..-2]
     elsif !m_name.nil?
       values = find_all_values arr[2..-2]
+      validate_call_method m_name
       send m_name.to_s, values
     end
   end
@@ -170,6 +179,7 @@ class Tokenizer
     else
       return if token.empty?
       token = token.join('') if token.is_a? Array
+      return token if token =~ /c[ad]{2,}r/
       get_var token.to_s
     end
   end

data/lib/lisp/interpreter/version.rb

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

data/spec/lisp/interpreter_spec.rb

@@ -720,6 +720,20 @@ RSpec.describe Lisp::Interpreter do
     end
   end
 
+  describe 'car_cdr_infinite' do
+    it 'throws error when <p> is the empty list' do
+      expect(@p.parse('(cadr null)')).to eq car_cdr_err '\'()', 'cdr'
+      expect(@p.parse('(cdar (list))')).to eq car_cdr_err '\'()', 'car'
+      expect(@p.parse('(caaadr \'())')).to eq car_cdr_err '\'()', 'cdr'
+    end
+
+    it 'returns the element of <p> depending of car and cdr' do
+      expect(@p.parse('(cadr (list 1 2 3))')).to eq '2'
+      expect(@p.parse('(caar (list (list 1 2) 2))')).to eq '1'
+      expect(@p.parse('(cdar (list (list 1 2) 4))')).to eq '(2)'
+    end
+  end
+
   describe '(list? v)' do
     it 'returns true if <v> is empty list' do
       expect(@p.parse('(list? null)')).to eq '#t'
@@ -994,12 +1008,12 @@ RSpec.describe Lisp::Interpreter do
 
   describe 'file read' do
     it 'reads from .ss file' do
-      expr1 = 'ghci D:/Github/Ruby-Project/lisp-interpreter/spec/lisp/test.ss'
+      expr1 = 'ghci spec/lisp/test.ss'
       expect(@p.parse(expr1)).to be_instance_of(Proc)
     end
 
     it 'reads from .scm file' do
-      expr1 = 'ghci D:/Github/Ruby-Project/lisp-interpreter/spec/lisp/test.scm'
+      expr1 = 'ghci spec/lisp/test.scm'
       expect(@p.parse(expr1)).to eq 3
     end
 

data/spec/lisp/test.scm

@@ -1 +1,3 @@
-(+ 1 2)
+(+ 1 5)
+(+ 1
+2) 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Zaki Petrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Lisp interpreter gem