lisp-interpreter 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95797273f33bc2b8be5709474ab1495d38bfb342
-  data.tar.gz: b16d5d97ee2d7d7d58b92685adb0fb7014bd3e4f
+  metadata.gz: 5cba48431d06d1753de8488615d06d0e96497e58
+  data.tar.gz: c746db86111666c4d8c176da69aa585e866d70a0
 SHA512:
-  metadata.gz: 9f5bf08dda0d96dd254e1905b67e70c73d042dfaa866b69f9f7fce80ed5ef6bd05610b0cd249d6b20aa97a1b07e8d2f01226afcbe2661338ad38479ab4cc028a
-  data.tar.gz: 811f88a1d5f579c6bc609a536be1d94eb514a115ddb94d7a86ae2190bcc769352b5d9e4d8903ecd44eae8e471e2f59fdaa32c9d40c59a83d5f08c643528f0de9
+  metadata.gz: 8cf8ea0df1f974639c2ff96afe4ca2fb76ff346638b34b47420369108dfec531a0893b712da39d655ea54078e15fbca1f06380ee3f981a47d8935747a847ca73
+  data.tar.gz: f249f299e0658dc49e7a53931747e3505c50c19bd72ab89a975e7018958fbb41abc012fa8a8b695b5a5d538031d1a8b1f9c68cbd7e8d7ac088b19feb9cd26535

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

@@ -37,7 +37,7 @@ module SchemeBooleans
   def if(other)
     raise arg_err_build 3, 0 if other.empty?
     expr, other = find_next_value other
-    raise arg_err_build 3, other.size + 1 if other.size != 2
+    raise arg_err_build 3, other.size + 1 if other.size < 2
     if_helper expr, other
   end
 end

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

@@ -24,6 +24,3 @@ module ErrorMessages
     'Invalid data type, expected ' + exp.to_s + ' got ' + got.to_s
   end
 end
-
-class SchemeException < RuntimeError
-end

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

@@ -149,8 +149,7 @@ module SchemeLists
 
   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'
+    other[0] == '\'()' ? '#t' : '#f'
   end
 
   def length(other)

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

@@ -1,5 +1,5 @@
 require_relative 'object'
-require_relative 'stl_functions'
+require_relative 'stl_constants'
 require_relative 'errors'
 require_relative 'numbers'
 require_relative 'strings'
@@ -13,32 +13,8 @@ module StlLoader
   def initialize
     @other = []
     @procs = {}
-    @do_not_calculate = init_do_not_calculate_fn
-    @reserved = init_reserved_fn
-    set_reserved_keywords
-    @functions = init_functions.dup
-    init_predefined.each { |f| @functions[f] = f }
-  end
-
-  def init_do_not_calculate_fn
-    DO_NOT_CALCULATE_FUNCTIONS
-  end
-
-  def init_functions
-    SPECIAL_CHARACTER_FUNCTIONS
-  end
-
-  def init_predefined
-    PREDEFINED_FUNCTIONS
-  end
-
-  def init_reserved_fn
-    RESERVED_KEYWORDS
-  end
-
-  def set_reserved_keywords
-    @reserved.each do |key, value|
-      @procs[key.to_s] = value
-    end
+    @functions = SPECIAL_CHARACTER_FUNCTIONS.dup
+    PREDEFINED_FUNCTIONS.each { |f| @functions[f] = f }
+    RESERVED_KEYWORDS.each { |key, value| @procs[key.to_s] = value }
   end
 end

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

@@ -10,25 +10,32 @@ module SchemeNumbersHelper
     other[0] == '(' ? (find_bracket_idx other, 0) + 1 : 1
   end
 
+  def rationalize_num(num)
+    [num.to_num.to_r.to_s]
+  end
+
   def num_denom_helper(other)
     if other.size == 1
-      other = other[0].split('/')
+      other = rationalize_num other[0] if check_for_num other[0]
+      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)
+      other = other.map { |t| t.to_s.split(%r{(\/)}) }.flatten
+      other.delete('')
+      get_num_denom other
     end
-    other
+  end
+
+  def num_denom_validator(temp)
+    raise arg_err_build 1, temp.size + 1 if (temp[0] != '/') && !temp.empty?
   end
 
   def get_num_denom(other)
-    num, other = find_next_value other
-    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?
-    [num, denom]
+    x, temp = find_next_value other
+    num_denom_validator temp
+    return [x, 1] if temp.empty?
+    y, temp = find_next_value temp[1..-1]
+    num_denom_validator temp
+    [x, y]
   end
 
   def compare_value_arithmetic(other, oper)
@@ -122,18 +129,14 @@ module SchemeNumbers
 
   def numerator(other)
     raise arg_err_build 1, 0 if other.empty?
-    other = num_denom_helper other
-    result = (get_num_denom other)[0]
-    raise type_err '<number>', result.type unless check_for_num result
-    result.to_num
+    nums = num_denom_helper other
+    nums[0].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 type_err '<number>', result.type unless check_for_num result
-    result.to_num
+    nums = num_denom_helper other
+    nums[1].to_num
   end
 
   def abs(other)

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

@@ -1,12 +1,15 @@
 # redefine method in Object class
+require 'bigdecimal'
+
+# Object class
 class Object
   def number?
-    to_f.to_s == to_s || to_i.to_s == to_s
+    match(/\A[-+]?[0-9]*\.?[0-9]+\Z/)
   end
 
   def to_num
-    return to_f if to_f.to_s == to_s
-    to_i if to_i.to_s == to_s
+    return to_f if to_s.include? '.'
+    to_i
   end
 
   def character?

data/lib/lisp/interpreter/core/{stl_functions.rb → stl_constants.rb}

@@ -1,4 +1,4 @@
-# STL functions
+# STL constants
 module SchemeStl
   DO_NOT_CALCULATE_FUNCTIONS =
     %w[

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

@@ -73,6 +73,7 @@ module ValueFinder
     val = (predefined_method_caller [var])
     return val unless val.nil?
     valid = valid_var var
+    var = var.to_num.to_s if check_for_num var
     valid ? var : (raise unbound_symbol_err var)
   end
 

data/lib/lisp/interpreter/parser.rb

@@ -22,7 +22,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
@@ -78,7 +78,7 @@ class Parser
   end
 
   def parse(token)
-    return read_file token if token.start_with? 'ghci'
+    return read_file token if (token.start_with? 'ghci ') && token.size > 4
     token_error = validate_token token
     result =
       if token_error.nil?

data/lib/lisp/interpreter/tokenizer.rb

@@ -66,7 +66,7 @@ class Tokenizer
 
   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
+    if DO_NOT_CALCULATE_FUNCTIONS.include? m_name
       send m_name.to_s, arr[2..-2]
     elsif !m_name.nil?
       values = find_all_values arr[2..-2]

data/lib/lisp/interpreter/version.rb

@@ -1,5 +1,5 @@
 module Lisp
   module Interpreter
-    VERSION = '0.5.2'.freeze
+    VERSION = '0.5.3'.freeze
   end
 end

data/spec/lisp/interpreter_spec.rb

@@ -64,12 +64,11 @@ RSpec.describe Lisp::Interpreter do
       expect(@p.parse('#\invalid')).to eq unbound_symbol_err '#\invalid'
     end
 
-    it 'can parse integers' do
+    it 'can parse numbers' do
       expect(@p.parse('1')).to eq '1'
-    end
-
-    it 'can parse floats' do
+      expect(@p.parse('0123')).to eq '123'
       expect(@p.parse('1.5')).to eq '1.5'
+      expect(@p.parse('0.500')).to eq '0.5'
     end
 
     it 'can parse strings' do
@@ -269,9 +268,9 @@ RSpec.describe Lisp::Interpreter do
     end
 
     it 'returns the numerator of <q> when <q> is float' do
-      expect(@p.parse('(numerator 5.3)')).to eq 5.3
-      expect(@p.parse('(numerator 1.5)')).to eq 1.5
-      expect(@p.parse('(numerator 0.7)')).to eq 0.7
+      expect(@p.parse('(numerator 5.3)')).to eq 5_967_269_506_265_907
+      expect(@p.parse('(numerator 1.5)')).to eq 3
+      expect(@p.parse('(numerator 0.7)')).to eq 3_152_519_739_159_347
     end
 
     it 'returns the numerator of <q> when <q> is rational' do
@@ -289,9 +288,9 @@ RSpec.describe Lisp::Interpreter do
     end
 
     it 'returns the denominator of <q> when <q> is float' do
-      expect(@p.parse('(denominator 5.3)')).to eq 1
-      expect(@p.parse('(denominator 1.5)')).to eq 1
-      expect(@p.parse('(denominator 0.7)')).to eq 1
+      expect(@p.parse('(denominator 5.3)')).to eq 1_125_899_906_842_624
+      expect(@p.parse('(denominator 1.5)')).to eq 2
+      expect(@p.parse('(denominator 0.7)')).to eq 4_503_599_627_370_496
     end
 
     it 'returns the denominator of <q> when <q> is rational' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Zaki Petrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,6 @@ 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
@@ -79,7 +78,7 @@ files:
 - lib/lisp/interpreter/core/loader.rb
 - lib/lisp/interpreter/core/numbers.rb
 - lib/lisp/interpreter/core/object.rb
-- lib/lisp/interpreter/core/stl_functions.rb
+- lib/lisp/interpreter/core/stl_constants.rb
 - lib/lisp/interpreter/core/strings.rb
 - lib/lisp/interpreter/helpers/checker.rb
 - lib/lisp/interpreter/helpers/validator.rb

data/lib/lisp/interpreter/checker.rb

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