lisp-interpreter 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b5afb412627509393e82cd31613a47029d6de8
-  data.tar.gz: 5fb55aedca3ff30a6a41f9a808379a9483feb03c
+  metadata.gz: 0f2eed4083aad91446e2fd71b4b7ad1181e7c4d4
+  data.tar.gz: 553180b55363be657880ebeeefc78a46f410e95b
 SHA512:
-  metadata.gz: 1c1101cea234ab1711fc5208d344199fc492032c214448442c23eaba3c7940b0cb9792f374845e52b92f5e00d5525bb49e938b8091a7d4450bed56347831e64f
-  data.tar.gz: 15b95c4869df5dd227fbd243a0d6a53fe4ce008bc94ac6e58b09bcf99206d465f10e9821146f2438fd57e5698cf32fbe559c0d84e3ac71bb32f12e476b1dd7c6
+  metadata.gz: 67963dab535ddc3f856fb7dbe0b286eae6f0ac1d4a2d728d144374fe805639f489ecf57b50928d51ee47710e50d105e7b4cc3cb411406c72a4232efe587d82b5
+  data.tar.gz: 78bcaad6f467ad69d83af2afedc9d9f4c9631b9383f2a769dc56efc787e917a2cd98591eb5bd7ce6b74562f82ad4c4fd4839d61e47bc742d453dcb91506fa042

data/lib/lisp/interpreter/checker.rb

@@ -1,39 +1,38 @@
 # Check if variable is specific type
 module SchemeChecker
   def check_for_bool(token)
-    return true if ['#t', '#f'].include? token
+    return true if token.boolean?
     is_instance_var = check_instance_var token
-    return true if is_instance_var && (check_for_bool get_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 true if is_instance_var && (check_for_string get_var token)
+    return (check_for_string get_var token) if is_instance_var
     false
   end
 
-  def check_for_number(token)
+  def check_for_num(token)
     return true if token.to_s.number?
     is_instance_var = check_instance_var token
-    return true if is_instance_var && (check_for_number get_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 true if is_instance_var && (check_for_number get_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 == '#\space'
     return true if var.character?
     is_instance_var = check_instance_var var
-    return true if is_instance_var && (check_for_character get_var var)
+    return (check_for_character get_var var) if is_instance_var
     false
   end
 

data/lib/lisp/interpreter/{boolean.rb → core/boolean.rb}

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

data/lib/lisp/interpreter/{errors.rb → core/errors.rb}

@@ -11,6 +11,18 @@ module ErrorMessages
   def arg_err_build(exp, got)
     'Incorrect number of arguments, expected ' + exp.to_s + ' got ' + got.to_s
   end
+
+  def no_procedure_build(name)
+    'No procedure found ' + name.to_s
+  end
+
+  def unbound_symbol_err(symbol)
+    'Unbound symbol ' + symbol.to_s
+  end
+
+  def data_type_err(exp, got)
+    'Invalid data type, expected ' + exp.to_s + ' got ' + got.to_s
+  end
 end
 
 class SchemeException < RuntimeError

data/lib/lisp/interpreter/{functional.rb → core/functional.rb}

@@ -91,6 +91,12 @@ module Optimize
     expr = build_compose_expr funcs
     proc_lambda expr
   end
+
+  def define_var_stl(var, values)
+    valid_stl = methods.include? values.to_s[2..-3].to_sym
+    return set_var var, values.to_s[2..-3].to_sym if valid_stl
+    set_var var, values[0]
+  end
 end
 
 # FunctionalScheme helper
@@ -163,7 +169,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 var, values[0]
+    define_var_stl var, values
   end
 
   def set_values_define(other, params, args)

data/lib/lisp/interpreter/{list.rb → 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 'Invalid data type' unless other[0].list?
+    raise data_type_err '<list>', other[0].type unless other[0].list?
     split_list_as_string other[0].to_s
   end
 

data/lib/lisp/interpreter/{numbers.rb → 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 'Invalid data type' unless check_for_number other[0]
+    raise data_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 'Invalid data type' unless check_for_number num
+    raise data_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 'Invalid data type' unless check_for_number t
+      raise data_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 'Invalid data type' unless check_for_number result
+    raise data_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 'Invalid data type' unless check_for_number result
+    raise data_type_err '<number>', result.type unless check_for_num result
     result.to_num
   end
 

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

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

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

@@ -0,0 +1,140 @@
+# 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
+    res = other[0..vars - 1].reject { |v| check_for_string v }
+    raise data_type_err '<string>', res[0].type unless res.empty?
+    res
+  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 data_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
+  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]
+    substring_validator from, to
+    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

data/lib/lisp/interpreter/object.rb

@@ -10,6 +10,7 @@ class Object
   end
 
   def character?
+    return true if self == '#\space'
     (start_with? '#\\') && (('a'..'z').to_a.include? self[2]) && size == 3
   end
 
@@ -35,6 +36,20 @@ class Object
     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

data/lib/lisp/interpreter/parser.rb

@@ -1,4 +1,4 @@
-require_relative 'errors'
+require_relative 'core/errors'
 require_relative 'validator'
 require_relative 'tokenizer'
 

data/lib/lisp/interpreter/strings.rb

@@ -62,7 +62,7 @@ module SchemeStrings
     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_number from) && (to.nil? || (check_for_number to))
+    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

data/lib/lisp/interpreter/tokenizer.rb

@@ -1,13 +1,13 @@
-require_relative 'object'
-require_relative 'errors'
+require_relative 'core/object'
+require_relative 'core/errors'
+require_relative 'core/numbers'
+require_relative 'core/strings'
+require_relative 'core/boolean'
+require_relative 'core/list'
+require_relative 'core/functional'
 require_relative 'value_finder'
 require_relative 'checker'
 require_relative 'validator'
-require_relative 'numbers'
-require_relative 'strings'
-require_relative 'boolean'
-require_relative 'list'
-require_relative 'functional'
 
 # Tokenizer helper
 module TokenizerHelper
@@ -66,9 +66,8 @@ module TokenizerHelper
   end
 
   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
+    raise 'Invalid parameter' unless valid || (value.is_a? Symbol)
     @procs[var] = value
   end
 
@@ -78,7 +77,7 @@ module TokenizerHelper
     val = (predefined_method_caller [var])
     return val unless val.nil?
     valid = valid_var var
-    valid ? var : (raise 'Unbound symbol "' + var + '"')
+    valid ? var : (raise unbound_symbol_err var)
   end
 
   def syntax_methods
@@ -124,12 +123,17 @@ class Tokenizer
     call_predefined_method m_name, arr
   end
 
+  def check_for_stl_function(arr)
+    idx = find_bracket_idx arr, 1
+    func, = valid_function arr[1..idx]
+    values = find_all_values arr[idx + 1..-2]
+    return func.call(*values) if func.is_a? Proc
+    calc_input_val ['(', func, *values, ')']
+  end
+
   def special_check_proc(m_name, arr)
     if arr[0..1].join == '(('
-      idx = find_bracket_idx arr, 1
-      func, = valid_function arr[1..idx]
-      values = find_all_values arr[idx + 1..-2]
-      func.call(*values)
+      check_for_stl_function arr
     else
       m_name.call(*arr[2..-2])
     end

data/lib/lisp/interpreter/validator.rb

@@ -27,20 +27,20 @@ module Validator
 
   def valid_function(fn)
     idx = fn[0] == '(' ? (find_bracket_idx fn, 0) : 0
-    func =
+    f =
       if idx.zero?
         predefined_method_caller [fn[idx]]
       else
         calc_input_val fn[0..idx]
       end
-    raise 'No such procedure' if func.nil? && (!func.is_a? Proc)
-    [func, fn[idx + 1..-1]]
+    valid_function? f, fn, idx
+    [f, fn[idx + 1..-1]]
   end
 
   private
 
   def valid_literals(var)
-    number = check_for_number var
+    number = check_for_num var
     string = check_for_string var
     boolean = check_for_bool var
     symbol = check_for_symbol var
@@ -51,4 +51,9 @@ module Validator
   def valid_objects(var)
     var.list? || var.pair?
   end
+
+  def valid_function?(f, fn, idx)
+    idx = find_bracket_idx fn, 1 if fn[idx] == '\''
+    raise no_procedure_build fn[0..idx].join if f.nil? && (!f.is_a? Proc)
+  end
 end

data/lib/lisp/interpreter/version.rb

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

data/spec/lisp/interpreter_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
+require_relative '../../lib/lisp/interpreter/core/errors'
 
 RSpec.describe Lisp::Interpreter do
+  include ErrorMessages
   before do
     @p = Parser.new
     @p.parse('(define x 5)')
@@ -19,14 +21,6 @@ RSpec.describe Lisp::Interpreter do
       '(' + arr.join(' ') + ')'
     end
 
-    def arg_err_build(e, g)
-      'Incorrect number of arguments, expected ' + e.to_s + ' got ' + g.to_s
-    end
-
-    def unbound_symbol(sym)
-      'Unbound symbol "' + sym.to_s + '"'
-    end
-
     @p.parse('(define xl (lambda (x) (* 2 x)))')
     @p.parse('(define yl (lambda () 5))')
     @p.parse('(define zl (lambda ()))')
@@ -68,7 +62,7 @@ RSpec.describe Lisp::Interpreter do
 
   describe 'literals' do
     it 'throws invalid variable error when the data is invalid' do
-      expect(@p.parse('#\invalid')).to eq unbound_symbol '#\invalid'
+      expect(@p.parse('#\invalid')).to eq unbound_symbol_err '#\invalid'
     end
 
     it 'can parse integers' do
@@ -1002,7 +996,7 @@ RSpec.describe Lisp::Interpreter do
       expr1 = '(define prodfive (lambda (x)(define yy 5)(* x yy)))'
       expect(@p.parse(expr1)).to be_instance_of(Proc)
       expect(@p.parse('(prodfive 6)')).to eq 30
-      expect(@p.parse('yy')).to eq unbound_symbol 'yy'
+      expect(@p.parse('yy')).to eq unbound_symbol_err 'yy'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Zaki Petrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,12 +71,14 @@ files:
 - bin/start.rb
 - bin/zakichan.bat
 - lib/lisp/interpreter.rb
-- lib/lisp/interpreter/boolean.rb
 - lib/lisp/interpreter/checker.rb
-- lib/lisp/interpreter/errors.rb
-- lib/lisp/interpreter/functional.rb
-- lib/lisp/interpreter/list.rb
-- lib/lisp/interpreter/numbers.rb
+- lib/lisp/interpreter/core/boolean.rb
+- lib/lisp/interpreter/core/errors.rb
+- lib/lisp/interpreter/core/functional.rb
+- lib/lisp/interpreter/core/list.rb
+- 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/parser.rb
 - lib/lisp/interpreter/run.rb
@@ -85,6 +87,7 @@ 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