lisp-interpreter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f2eed4083aad91446e2fd71b4b7ad1181e7c4d4
-  data.tar.gz: 553180b55363be657880ebeeefc78a46f410e95b
+  metadata.gz: d0691fe861df7ee5e54aac3b2f291df8e517a48d
+  data.tar.gz: d370f3810b7e2e9caa9af9372f3ac2cc2ea1601f
 SHA512:
-  metadata.gz: 67963dab535ddc3f856fb7dbe0b286eae6f0ac1d4a2d728d144374fe805639f489ecf57b50928d51ee47710e50d105e7b4cc3cb411406c72a4232efe587d82b5
-  data.tar.gz: 78bcaad6f467ad69d83af2afedc9d9f4c9631b9383f2a769dc56efc787e917a2cd98591eb5bd7ce6b74562f82ad4c4fd4839d61e47bc742d453dcb91506fa042
+  metadata.gz: 16869c9165eaebbd985f3c866f25fdd0c55f18f21bd13c841b6aac63f6217134ef0464ee4962770088b13442bceaada40c1e69e371911cf5d316c462b3a60bb1
+  data.tar.gz: 31711dfa5b59c031d06aa2e67c4b68a5f3edd0cf41e02a88b83505d2e2ba5c9490ddce51a022b55a888de9617bb054ae1d638583c31047d3ef5fbf2712c7c470

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

@@ -30,7 +30,7 @@ module SchemeBooleans
   def not(other)
     raise arg_err_build 1, other.size if other.size != 1
     valid = check_for_bool other[0]
-    raise data_type_err '<boolean>', other[0].type unless valid
+    raise type_err '<boolean>', other[0].type unless valid
     other[0] == '#t' ? '#f' : '#t'
   end
 

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

@@ -20,7 +20,7 @@ module ErrorMessages
     'Unbound symbol ' + symbol.to_s
   end
 
-  def data_type_err(exp, got)
+  def type_err(exp, got)
     'Invalid data type, expected ' + exp.to_s + ' got ' + got.to_s
   end
 end

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

@@ -76,7 +76,7 @@ module SchemeListsHelper
 
   def find_list_function_value(other)
     raise arg_err_build 1, other.size if other.size != 1
-    raise data_type_err '<list>', other[0].type unless other[0].list?
+    raise type_err '<list>', other[0].type unless other[0].list?
     split_list_as_string other[0].to_s
   end
 

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

@@ -2,7 +2,7 @@
 module SchemeNumbersHelper
   def get_one_arg_function(other)
     raise arg_err_build 1, other.size if other.size != 1
-    raise data_type_err '<number>', other[0].type unless check_for_num other[0]
+    raise type_err '<number>', other[0].type unless check_for_num other[0]
     other[0].to_num
   end
 
@@ -24,7 +24,7 @@ module SchemeNumbersHelper
 
   def get_num_denom(other)
     num, other = find_next_value other
-    raise data_type_err '<number>', num.type unless check_for_num num
+    raise type_err '<number>', num.type unless check_for_num num
     return [num, 1] if other.empty?
     denom, other = find_next_value other
     raise arg_err_build 1, other.size unless other.empty?
@@ -40,7 +40,7 @@ module SchemeNumbersHelper
 
   def convert_to_num(other)
     other.each do |t|
-      raise data_type_err '<number>', t.type unless check_for_num t
+      raise type_err '<number>', t.type unless check_for_num t
     end
     other.map(&:to_num)
   end
@@ -124,7 +124,7 @@ module SchemeNumbers
     raise arg_err_build 1, 0 if other.empty?
     other = num_denom_helper other
     result = (get_num_denom other)[0]
-    raise data_type_err '<number>', result.type unless check_for_num result
+    raise type_err '<number>', result.type unless check_for_num result
     result.to_num
   end
 
@@ -132,7 +132,7 @@ module SchemeNumbers
     raise arg_err_build 1, 0 if other.empty?
     other = num_denom_helper other
     result = (get_num_denom other)[1]
-    raise data_type_err '<number>', result.type unless check_for_num result
+    raise type_err '<number>', result.type unless check_for_num result
     result.to_num
   end
 

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

@@ -39,7 +39,7 @@ module SchemeStringsHelper
   def arg_function_validator(other, vars = 1)
     raise arg_err_build other.size, vars if other.size != vars
     res = other[0..vars - 1].reject { |v| check_for_string v }
-    raise data_type_err '<string>', res[0].type unless res.empty?
+    raise type_err '<string>', res[0].type unless res.empty?
     res
   end
 
@@ -51,13 +51,13 @@ module SchemeStringsHelper
 
   def strjoin_validate(other)
     raise arg_err_build '[1, 2]', other.size unless other.size.between? 1, 2
-    raise data_type_err '<list>', other[0].type unless other[0].to_s.list?
+    raise type_err '<list>', other[0].type unless other[0].to_s.list?
   end
 
   def substring_validator(from, to)
     valid = (check_for_num from) && (to.nil? || (check_for_num to))
     type = [from, to].first { |t| t.type if t.type != 'number' }
-    raise data_type_err '<number>', type unless valid
+    raise type_err '<number>', type unless valid
   end
 end
 

data/lib/lisp/interpreter/list.rb

@@ -0,0 +1,183 @@
+# Helper functions for SchemeLists
+module SchemeListsHelper
+  def evaluate_list(tokens, no_quotes)
+    find_all_values_list_evaluate tokens, no_quotes
+  end
+
+  def no_eval_list(tokens, no_quotes = false)
+    result = []
+    until tokens.empty?
+      value, tokens = build_next_value_as_string tokens
+      value = value[1..-2] if no_quotes && (check_for_string value.to_s)
+      result << value
+    end
+    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
+    elsif tokens[1] == '('
+      find_bracket_idx tokens, 1
+    end
+  end
+
+  def find_all_values_list_evaluate(tokens, no_quotes = false)
+    result = []
+    until tokens.empty?
+      x, tokens = find_next_value tokens
+      x = x[1..-2] if no_quotes && (check_for_string x.to_s)
+      result << x
+    end
+    result
+  end
+
+  def build_list(values)
+    '\'(' + values.join(' ') + ')'
+  end
+
+  def build_cons_from_list(values)
+    spacer = values[1].size == 3 ? '' : ' '
+    values[0].to_s + spacer + values[1][2..-2].to_s
+  end
+
+  def cons_helper(values)
+    result =
+      if values[1].to_s[0..1] == '\'('
+        build_cons_from_list values
+      else
+        values[0].to_s + ' . ' + values[1].to_s
+      end
+    '\'(' + result + ')'
+  end
+
+  def get_cons_values(tokens)
+    result = get_k_arguments tokens, false, 2
+    raise arg_err_build 2, result.size if result.size != 2
+    result
+  end
+
+  def split_list_string(list)
+    result = list.split(/(\(|\)|\.)|\ /)
+    result.delete('')
+    result
+  end
+
+  def find_list_function_value(other)
+    raise arg_err_build 1, other.size if other.size != 1
+    raise data_type_err 'list', other[0].type unless other[0].list?
+    split_list_as_string other[0].to_s
+  end
+
+  def split_list_as_string(list_as_string)
+    split_value = split_list_string list_as_string.to_s
+    no_eval_list split_value[2..-2]
+  end
+
+  def car_cdr_values(other)
+    raise arg_err_build 1, other.size if other.size != 1
+    return find_list_function_value other if other[0].list?
+    (split_list_string other[0].to_s)[2..-2] if other[0].pair?
+  end
+
+  def map_helper(lst, func)
+    return lst.map { |t| func.call(*t) } if func.is_a? Proc
+    lst.map { |t| send func, t }
+  end
+
+  def map_validate_helper(other)
+    raise arg_err_build 'at least 2', 0 if other.empty?
+    func, other = valid_function other
+    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
+module SchemeLists
+  include SchemeListsHelper
+  def cons(other)
+    raise arg_err_build 2, other.size if other.size != 2
+    cons_helper other
+  end
+
+  def list(other)
+    build_list other
+  end
+
+  def car(other)
+    value = car_cdr_values other
+    raise 'Cannot apply car on ' + other[0].to_s if value.nil? || value.empty?
+    value.shift
+  end
+
+  def cdr(other)
+    value = car_cdr_values other
+    raise 'Cannot apply cdr on ' + other[0].to_s if value.nil? || value.empty?
+    idx = value[1] == '.' ? 2 : 1
+    build_list value[idx..-1]
+  end
+
+  def list?(other)
+    raise arg_err_build 1, other.size if other.size != 1
+    other[0].to_s.list? ? '#t' : '#f'
+  end
+
+  def pair?(other)
+    raise arg_err_build 1, other.size if other.size != 1
+    other[0].to_s.pair? ? '#t' : '#f'
+  end
+
+  def null?(other)
+    raise arg_err_build 1, other.size if other.size != 1
+    return '#f' unless other[0].to_s.list?
+    other[0].to_s.size == 3 ? '#t' : '#f'
+  end
+
+  def length(other)
+    (find_list_function_value other).size
+  end
+
+  def reverse(other)
+    value = find_list_function_value other
+    build_list value.reverse
+  end
+
+  def map(other)
+    func, other = map_validate_helper other
+    lst = find_all_values other
+    lst = lst.map { |t| find_list_function_value [t] }
+    lst = (equalize_lists lst).transpose
+    build_list map_helper lst, func
+  end
+
+  def shuffle(other)
+    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/numbers.rb

@@ -0,0 +1,162 @@
+# Helper functions for SchemeNumbers
+module SchemeNumbersHelper
+  def get_one_arg_function(other)
+    raise arg_err_build 1, other.size if other.size != 1
+    raise type_err 'number', other[0].type unless check_for_num other[0]
+    other[0].to_num
+  end
+
+  def find_idx_numerators(other)
+    other[0] == '(' ? (find_bracket_idx other, 0) + 1 : 1
+  end
+
+  def num_denom_helper(other)
+    if other.size == 1
+      other = other[0].split('/')
+    else
+      _, temp = find_next_value other
+      raise arg_err_build 1, 0 unless temp[0] == '/' || temp.empty?
+      i = find_idx_numerators other
+      other.delete_at(i)
+    end
+    other
+  end
+
+  def get_num_denom(other)
+    num, other = find_next_value other
+    raise 'Invalid data type' unless check_for_num num
+    return [num, 1] if other.empty?
+    denom, other = find_next_value other
+    raise arg_err_build 1, other.size unless other.empty?
+    [num, denom]
+  end
+
+  def compare_value_arithmetic(other, oper)
+    raise arg_err_build 'at least 2', other.size if other.size < 2
+    other = convert_to_num other
+    result = other.each_cons(2).all? { |x, y| x.public_send oper, y }
+    result ? '#t' : '#f'
+  end
+
+  def convert_to_num(other)
+    other.each do |t|
+      raise 'Invalid data type' unless check_for_num t
+    end
+    other.map(&:to_num)
+  end
+
+  def divide_special_convert(other)
+    other = convert_to_num other
+    return [0] if other.size == 1 && other[0] == 0.0
+    other
+  end
+
+  def divide_number(a, b)
+    return a / b if (a / b).to_i.to_f == a / b.to_f
+    a / b.to_f
+  end
+end
+
+# Scheme numbers module
+module SchemeNumbers
+  include SchemeNumbersHelper
+
+  def <(other)
+    compare_value_arithmetic other, '<'
+  end
+
+  def >(other)
+    compare_value_arithmetic other, '>'
+  end
+
+  def <=(other)
+    compare_value_arithmetic other, '<='
+  end
+
+  def >=(other)
+    compare_value_arithmetic other, '>='
+  end
+
+  def +(other)
+    other = convert_to_num other
+    other.reduce(0, :+)
+  end
+
+  def -(other)
+    return 0 if other.empty?
+    other = convert_to_num other
+    return -other[0] if other.size == 1
+    other[0] + other[1..-1].reduce(0, :-)
+  end
+
+  def *(other)
+    other = convert_to_num other
+    other.reduce(1, :*)
+  end
+
+  def /(other)
+    raise arg_err_build 'at least 1', 0 if other.empty?
+    other = divide_special_convert other
+    return (divide_number 1, other[0].to_num) if other.size == 1
+    other[1..-1].inject(other[0]) { |res, t| divide_number res, t }
+  end
+
+  def quotient(other)
+    raise arg_err_build 2, other.size if other.size != 2
+    x, y = convert_to_num other
+    result = divide_number x, y
+    result < 0 ? result.ceil : result.floor
+  end
+
+  def remainder(other)
+    raise arg_err_build 2, other.size if other.size != 2
+    x, y = convert_to_num other
+    (x.abs % y.abs) * (x / x.abs)
+  end
+
+  def modulo(other)
+    raise arg_err_build 2, other.size if other.size != 2
+    x, y = convert_to_num other
+    x.modulo y
+  end
+
+  def numerator(other)
+    raise arg_err_build 1, 0 if other.empty?
+    other = num_denom_helper other
+    result = (get_num_denom other)[0]
+    raise 'Invalid data type' unless check_for_num result
+    result.to_num
+  end
+
+  def denominator(other)
+    raise arg_err_build 1, 0 if other.empty?
+    other = num_denom_helper other
+    result = (get_num_denom other)[1]
+    raise 'Invalid data type' unless check_for_num result
+    result.to_num
+  end
+
+  def abs(other)
+    (get_one_arg_function other).abs
+  end
+
+  def add1(other)
+    (get_one_arg_function other) + 1
+  end
+
+  def sub1(other)
+    (get_one_arg_function other) - 1
+  end
+
+  def min(other)
+    raise arg_err_build 'at least 1', 0 if other.empty?
+    other = convert_to_num other
+    other.min
+  end
+
+  def max(other)
+    raise arg_err_build 'at least 1', 0 if other.empty?
+    other = convert_to_num other
+    other.max
+  end
+end

data/lib/lisp/interpreter/version.rb

@@ -1,5 +1,5 @@
 module Lisp
   module Interpreter
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.4.1'.freeze
   end
 end

data/spec/lisp/interpreter_spec.rb

@@ -9,8 +9,7 @@ RSpec.describe Lisp::Interpreter do
     @p.parse('(define y 0.999)')
     @msg =
       {
-        'zero_div' => 'divided by 0',
-        'inv_type' => 'Invalid data type'
+        'zero_div' => 'divided by 0'
       }
 
     def car_cdr_err(got, fn)
@@ -43,19 +42,19 @@ RSpec.describe Lisp::Interpreter do
 
     context 'incorrect argument type' do
       it 'throws error when <number> is expected' do
-        expect(@p.parse('(+ #t)')).to eq @msg['inv_type']
+        expect(@p.parse('(+ #t)')).to eq type_err '<number>', '<boolean>'
       end
 
       it 'throws error when <string> is expected' do
-        expect(@p.parse('(string-length 1)')).to eq @msg['inv_type']
+        expect(@p.parse('(substring 1)')).to eq arg_err_build '[2, 3]', '1'
       end
 
       it 'throws error when <boolean> is expected' do
-        expect(@p.parse('(not \'apple)')).to eq @msg['inv_type']
+        expect(@p.parse('(not \'apple)')).to eq type_err '<boolean>', '<quote>'
       end
 
       it 'throws error when <list> is expected' do
-        expect(@p.parse('(length "not list")')).to eq @msg['inv_type']
+        expect(@p.parse('(length "str")')).to eq type_err '<list>', '<string>'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Zaki Petrov
@@ -79,7 +79,8 @@ files:
 - lib/lisp/interpreter/core/numbers.rb
 - lib/lisp/interpreter/core/object.rb
 - lib/lisp/interpreter/core/strings.rb
-- lib/lisp/interpreter/object.rb
+- lib/lisp/interpreter/list.rb
+- lib/lisp/interpreter/numbers.rb
 - lib/lisp/interpreter/parser.rb
 - lib/lisp/interpreter/run.rb
 - lib/lisp/interpreter/strings.rb
@@ -87,7 +88,6 @@ files:
 - lib/lisp/interpreter/validator.rb
 - lib/lisp/interpreter/value_finder.rb
 - lib/lisp/interpreter/version.rb
-- lisp-interpreter-0.3.5.gem
 - lisp-interpreter.gemspec
 - spec/lisp/interpreter_spec.rb
 - spec/lisp/test.scm

data/lib/lisp/interpreter/object.rb

@@ -1,66 +0,0 @@
-# redefine method in Object class
-class Object
-  def number?
-    to_f.to_s == to_s || to_i.to_s == to_s
-  end
-
-  def to_num
-    return to_f if to_f.to_s == to_s
-    return to_i if to_i.to_s == to_s
-  end
-
-  def character?
-    return true if self == '#\space'
-    (start_with? '#\\') && (('a'..'z').to_a.include? self[2]) && size == 3
-  end
-
-  def string?
-    return false unless self.class == String
-    (start_with? '"') && (end_with? '"') && (size != 1)
-  end
-
-  def list?
-    return false if size < 3
-    check_for_list
-  end
-
-  def pair?
-    res = object_split if is_a? String
-    res = to_a if is_a? Array
-    return true if res[-3] == '.'
-    list? && !res[2..-2].empty?
-  end
-
-  def quote?
-    return true if start_with? '\''
-    false
-  end
-
-  def boolean?
-    ['#t', '#f'].include? self
-  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'
-  end
-
-  private
-
-  def object_split
-    result = to_s.split(/(\(|\)|\.)|\ /)
-    result.delete('')
-    result
-  end
-
-  def check_for_list
-    res = to_a if is_a? Array
-    res = object_split if is_a? String
-    res[0..1].join == '\'(' && res[-1] == ')' && res[-3] != '.'
-  end
-end