lisp-interpreter 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0691fe861df7ee5e54aac3b2f291df8e517a48d
-  data.tar.gz: d370f3810b7e2e9caa9af9372f3ac2cc2ea1601f
+  metadata.gz: 1c06307db17d9007ce246997ac2100a2ac99ba95
+  data.tar.gz: 97d7681eb86cee8dc7090d70f1520d82e3eb3b6e
 SHA512:
-  metadata.gz: 16869c9165eaebbd985f3c866f25fdd0c55f18f21bd13c841b6aac63f6217134ef0464ee4962770088b13442bceaada40c1e69e371911cf5d316c462b3a60bb1
-  data.tar.gz: 31711dfa5b59c031d06aa2e67c4b68a5f3edd0cf41e02a88b83505d2e2ba5c9490ddce51a022b55a888de9617bb054ae1d638583c31047d3ef5fbf2712c7c470
+  metadata.gz: 4eaa3515460cf21508cb83f5d4d68a91631c30a9d4b1c51f7693f1831c83e81454ac531acacbd047a0e26bef4b7ea00b4bb0f370f1b161dfce0796043b143b76
+  data.tar.gz: 6a94f764325de0b5bf3693ea15f1df0a0aa250beab7654d017e6d3020934b5f4ab8d39e4f6746b13fa866569ef29012d68bf23ce856751ab14cb4bafc073a42e

data/README.md

@@ -130,25 +130,45 @@ list and pairs:
     
     (foldr cons '() '(1 2 3 4 5)); (1 2 3 4 5)
     
-    (filter (<= 3) '(1 2 3 4 5)); (1 2 3)
+    (filter (lambda (x) (<= x 3)) '(1 2 3 4 5)); (1 2 3)
     
-    (member 2 (list 1 2 3 4)); (2 3 4
+    (member 2 (list 1 2 3 4)); (2 3 4)
     
 functions and procedures:
     
-    (lambda (x) (* 2 x)); <Proc>
+    (lambda (x) (* 2 x)); <#Closure>
     
     ((lambda (x) (* 2 x)) 5); 10
     
     (apply + '(1 2 3)); 6
     
     ((compose fn1 fn2) val); (fn1 (fn2 val))
+
+    (compose fn1 fn2); #<Closure>
+
+errors:
+
+    (+ 1 2 #t); "Invalid data type, expected <number> got <boolean>"
+
+    (string-length 123); "Invalid data type, expected <string> got <number>"
+
+    (string-join "SAMPLE"); "Invalid data type, expected <list> got <string>"
+
+    (substring "sample"); "Incorrect number of arguments, expected [2, 3] got 1"
+
+    (x); "x is not a function"
+
+    x; "Unbound symbol x"
     
 other:
     
-    (define x 5) ; 5
+    (define x 5); 5
+
+    (define x (lambda (x) (* 2 x))); <#Closure>
     
-    (define (even? x) (if (equal? (remainder x 2) 0) #t #f))
+    (define (even? x) (if (equal? (remainder x 2) 0) #t #f)); <#Closure>
+
+    (define map foldl); <Function foldl>
     
     (even? 4); #t
     

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

@@ -13,7 +13,7 @@ module ErrorMessages
   end
 
   def no_procedure_build(name)
-    'No procedure found ' + name.to_s
+    name.to_s + ' is not function'
   end
 
   def unbound_symbol_err(symbol)

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

@@ -71,7 +71,8 @@ module Optimize
       value = value.to_s unless value.is_a? Array
       value = calc_input_val ['(', t, *value, ')']
     end
-    value
+    is_arr = value.is_a? Array
+    is_arr ? value[0] : value
   end
 
   def build_compose_expr(funcs)

data/lib/lisp/interpreter/tokenizer.rb

@@ -111,7 +111,7 @@ class Tokenizer
 
   def check_car_cdr(arr)
     result = arr[1].match(/c[ad]{2,}r/)
-    raise arr[1].to_s + ' is not a function' if result.nil?
+    raise no_procedure_build arr[1].to_s if result.nil?
     car_cdr_infinite arr
   end
 
@@ -140,7 +140,7 @@ class Tokenizer
   end
 
   def validate_call_method(m_name)
-    raise m_name.to_s + ' is not a function' if valid_var m_name.to_s
+    raise no_procedure_build m_name.to_s if valid_var m_name.to_s
   end
 
   def call_predefined_method(m_name, arr)

data/lib/lisp/interpreter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Zaki Petrov
@@ -79,11 +79,8 @@ files:
 - lib/lisp/interpreter/core/numbers.rb
 - lib/lisp/interpreter/core/object.rb
 - lib/lisp/interpreter/core/strings.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
 - lib/lisp/interpreter/tokenizer.rb
 - lib/lisp/interpreter/validator.rb
 - lib/lisp/interpreter/value_finder.rb

data/lib/lisp/interpreter/list.rb

@@ -1,183 +0,0 @@
-# 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

@@ -1,162 +0,0 @@
-# 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/strings.rb

@@ -1,135 +0,0 @@
-# Helper functions for SchemeStrings
-module SchemeStringsHelper
-  def substring_builder(str, from, to)
-    result = (str[1..-2])[from..(to.nil? ? -1 : to - 1)]
-    return '""' if result.nil?
-    '"' + result + '"'
-  end
-
-  def find_delimeter(other)
-    return ' ' if other.nil?
-    other[1..-2]
-  end
-
-  def build_as_string_helper(other, idx)
-    value = other[0..idx].join(' ').gsub('( ', '(').gsub(' )', ')')
-    [value, other[idx + 1..-1]]
-  end
-
-  def build_next_value_as_string(other)
-    idx = find_idx_for_list other
-    if other[0] == '('
-      build_as_string_helper other, idx
-    elsif other[0..1].join == '\'('
-      [(get_raw_value other[0..idx]), other[idx + 1..-1]]
-    else
-      [other[0], other[1..-1]]
-    end
-  end
-
-  def build_character(char)
-    '#\\' + (char == ' ' ? 'space' : char)
-  end
-
-  def remove_carriage(str)
-    str = str[1..-2]
-    str.gsub('\n', '').gsub('\r', '').gsub('\t', '').strip.squeeze(' ')
-  end
-
-  def arg_function_validator(other, vars = 1)
-    raise arg_err_build other.size, vars if other.size != vars
-    result = other[0..vars - 1].all? { |v| check_for_string v }
-    raise 'Invalid data type' unless result
-    result
-  end
-
-  def string_join_helper(other, dilimeter)
-    values = split_list_as_string other.to_s
-    delim_result = find_delimeter dilimeter
-    '"' + (values.join delim_result) + '"'
-  end
-
-  def strjoin_validate(other)
-    raise arg_err_build '[1, 2]', other.size unless other.size.between? 1, 2
-    raise 'Invalid data type' unless other[0].to_s.list?
-  end
-end
-
-# Scheme numbers module
-module SchemeStrings
-  include SchemeStringsHelper
-  def substring(other)
-    raise arg_err_build '[2, 3]', other.size unless other.size.between? 2, 3
-    str, from, to = other
-    arg_function_validator [str]
-    valid = (check_for_num from) && (to.nil? || (check_for_num to))
-    raise 'Incorrect parameter type' unless valid
-    substring_builder str, from.to_num, to.to_num
-  end
-
-  def string?(other)
-    raise arg_err_build 1, other.size if other.size != 1
-    result = check_for_string other[0].to_s
-    result ? '#t' : '#f'
-  end
-
-  def strlen(other)
-    arg_function_validator other
-    other[0][1..-2].length
-  end
-
-  def strupcase(other)
-    arg_function_validator other
-    other[0].upcase
-  end
-
-  def strdowncase(other)
-    arg_function_validator other
-    other[0].downcase
-  end
-
-  def strcontains(other)
-    arg_function_validator other, 2
-    result = other[0][1..-2].include? other[1][1..-2]
-    result ? '#t' : '#f'
-  end
-
-  def strsplit(other)
-    arg_function_validator other
-    str = remove_carriage other[0]
-    result = str.split(' ').map { |s| '"' + s + '"' }
-    build_list result
-  end
-
-  def strlist(other)
-    arg_function_validator other
-    result = other[0][1..-2].chars.map { |c| build_character c }
-    build_list result
-  end
-
-  def strreplace(other)
-    arg_function_validator other, 3
-    str, to_replace, replace_with = other.map { |t| t[1..-2] }
-    '"' + (str.gsub to_replace, replace_with) + '"'
-  end
-
-  def strprefix(other)
-    arg_function_validator other, 2
-    str, to_check = other.map { |t| t[1..-2] }
-    result = str.start_with? to_check
-    result ? '#t' : '#f'
-  end
-
-  def strsufix(other)
-    arg_function_validator other, 2
-    str, to_check = other.map { |t| t[1..-2] }
-    result = str.end_with? to_check
-    result ? '#t' : '#f'
-  end
-
-  def strjoin(other)
-    strjoin_validate other
-    arg_function_validator [other[1]] if other.size == 2
-    string_join_helper other[0], other[1]
-  end
-end