lisp-interpreter 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac8ea2951af78891e06278ec6ae00b35858f875
-  data.tar.gz: e8a83f418220ff4fba37e74bb52223fd9e34e80f
+  metadata.gz: a65e89fbe8025750a006c6c098017b1f65242fd6
+  data.tar.gz: 555c606c9d3ed1367a41c6c82c569e4afc4a25c8
 SHA512:
-  metadata.gz: 690b6efb7cf32a7e8534d54ef4521e0eaf28f7ec8aa66e70973901236e39754d2b46fb45d3c5b263571e6af115641cd6631d530fdbdf47853d918689de51a9a0
-  data.tar.gz: 411a2c4f8239fb7e0bd86d0589e7c5a10a7d5917b47d3dfd9500f69fb039288ade0b1c8d0b6c1416e5b25ce275f3aa405f176c97b74db27b654757e518586d08
+  metadata.gz: c1e32ed761f22a0dab7fd5d4072e4457650fc4ff4efeb98628e172b63fcd7363cc4395decfd99bcaab9fef6f028b76e8b2de06ab380002fb23542aa30e2233bf
+  data.tar.gz: 60ea067619421cb4d173b9ef99ef725a16c03c43a5643fcf6e25771878cdd012ccf65d1c6c2f6081a1d959558fac5ad401ca67c1b773c516660c7dc264b8eb53

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

@@ -169,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
+    raise var.to_s + ' is not valid variable name' unless valid_var_name var
     define_var_stl var, values
   end
 
@@ -186,7 +186,7 @@ module FunctionalSchemeHelper
 
   def define_func_helper(other, params, args)
     temp = set_values_define other, params, args
-    calc_input_val temp
+    (find_all_values temp)[-1]
   end
 
   def arg_finder_helper(name, args)

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

@@ -0,0 +1,44 @@
+require_relative 'object'
+require_relative 'stl_functions'
+require_relative 'errors'
+require_relative 'numbers'
+require_relative 'strings'
+require_relative 'boolean'
+require_relative 'list'
+require_relative 'functional'
+
+# Module for loading stl functions and keywords
+module StlLoader
+  include SchemeStl
+  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
+  end
+end

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

@@ -0,0 +1,31 @@
+# STL functions
+module SchemeStl
+  DO_NOT_CALCULATE_FUNCTIONS =
+    %w[
+      foldl foldr map filter
+      if apply numerator denominator
+      lambda compose define
+    ].freeze
+
+  SPECIAL_CHARACTER_FUNCTIONS =
+    {
+      'string-downcase'  => 'strdowncase', 'string-upcase'  => 'strupcase',
+      'string-contains?' => 'strcontains', 'string-length'  => 'strlen',
+      'string->list'     => 'strlist',     'string-split'   => 'strsplit',
+      'string-sufix?'    => 'strsufix',    'string-prefix?' => 'strprefix',
+      'string-replace'   => 'strreplace',  'string-join'    => 'strjoin'
+    }.freeze
+
+  PREDEFINED_FUNCTIONS =
+    %w[
+      define not equal? if quotient remainder modulo numerator denominator
+      min max sub1 add1 abs string? substring null? cons null list car
+      cdr list? pair? length reverse remove shuffle map foldl foldr filter
+      member lambda apply compose
+    ].freeze
+
+  RESERVED_KEYWORDS =
+    {
+      'null' => '\'()'
+    }.freeze
+end

data/lib/lisp/interpreter/{value_finder.rb → helpers/value_finder.rb}

@@ -57,4 +57,31 @@ module ValueFinder
     return [other[0], other[1..-1]] if other[0].is_a? Proc
     find_value_helper other
   end
+
+  def set_var(var, value)
+    valid = (valid_var value.to_s) || (value.is_a? Proc)
+    raise 'Invalid parameter' unless valid || (value.is_a? Symbol)
+    return if var == value.to_s
+    @procs[var] = value
+  end
+
+  def get_var(var)
+    check = check_instance_var var
+    return @procs[var.to_s] if check
+    val = (predefined_method_caller [var])
+    return val unless val.nil?
+    valid = valid_var var
+    valid ? var : (raise unbound_symbol_err var)
+  end
+
+  def get_raw_value(token)
+    if token.pair? || token.list?
+      build_list no_eval_list token[2..-2]
+    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
 end

data/lib/lisp/interpreter/parser.rb

@@ -1,5 +1,3 @@
-require_relative 'core/errors'
-require_relative 'validator'
 require_relative 'tokenizer'
 
 # Environment type

data/lib/lisp/interpreter/tokenizer.rb

@@ -1,95 +1,12 @@
-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'
-
-# Tokenizer helper
-module TokenizerHelper
-  def initialize
-    @other = []
-    @procs = {}
-    @do_not_calculate = init_do_not_calculate_fn
-    @reserved = init_reserved_fn
-    set_reserved_keywords
-    @functions = init_functions
-    init_predefined.each { |f| @functions[f] = f }
-  end
-
-  def reset
-    @other = []
-  end
-
-  def init_do_not_calculate_fn
-    %w[
-      foldl foldr map filter
-      if apply numerator denominator
-      lambda compose define
-    ]
-  end
-
-  def init_functions
-    {
-      'string-downcase'  => 'strdowncase', 'string-upcase'  => 'strupcase',
-      'string-contains?' => 'strcontains', 'string-length'  => 'strlen',
-      'string->list'     => 'strlist',     'string-split'   => 'strsplit',
-      'string-sufix?'    => 'strsufix',    'string-prefix?' => 'strprefix',
-      'string-replace'   => 'strreplace',  'string-join'    => 'strjoin'
-    }
-  end
-
-  def init_predefined
-    %w[
-      define not equal? if quotient remainder modulo numerator denominator
-      min max sub1 add1 abs string? substring null? cons null list car
-      cdr list? pair? length reverse remove shuffle map foldl foldr filter
-      member lambda apply compose
-    ]
-  end
-
-  def init_reserved_fn
-    {
-      'null' => '\'()',
-      'ghci' => ''
-    }
-  end
-
-  def set_reserved_keywords
-    @reserved.each do |key, value|
-      @procs[key.to_s] = value
-    end
-  end
-
-  def set_var(var, value)
-    valid = (valid_var value.to_s) || (value.is_a? Proc)
-    raise 'Invalid parameter' unless valid || (value.is_a? Symbol)
-    return if var == value.to_s
-    @procs[var] = value
-  end
-
-  def get_var(var)
-    check = check_instance_var var
-    return @procs[var.to_s] if check
-    val = (predefined_method_caller [var])
-    return val unless val.nil?
-    valid = valid_var var
-    valid ? var : (raise unbound_symbol_err var)
-  end
-
-  def syntax_methods
-    @functions
-  end
-end
+require_relative 'core/loader'
+require_relative 'helpers/value_finder'
+require_relative 'helpers/checker'
+require_relative 'helpers/validator'
 
 # Tokenizer class
 class Tokenizer
+  include StlLoader
   include ErrorMessages
-  include TokenizerHelper
   include ValueFinder
   include SchemeChecker
   include Validator
@@ -99,8 +16,11 @@ class Tokenizer
   include SchemeLists
   include FunctionalScheme
 
+  def syntax_methods
+    @functions
+  end
+
   def tokenize(token)
-    reset
     token.delete('')
     @other = token
     begin
@@ -177,15 +97,4 @@ class Tokenizer
       end
     predefined_method_caller_helper m_name, operations
   end
-
-  def get_raw_value(token)
-    if token.pair? || token.list?
-      build_list no_eval_list token[2..-2]
-    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
 end

data/lib/lisp/interpreter/version.rb

@@ -1,5 +1,5 @@
 module Lisp
   module Interpreter
-    VERSION = '0.4.3'.freeze
+    VERSION = '0.4.4'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lisp-interpreter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Zaki Petrov
@@ -71,20 +71,21 @@ 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
 - lib/lisp/interpreter/core/list.rb
+- 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/strings.rb
-- lib/lisp/interpreter/functional.rb
+- lib/lisp/interpreter/helpers/checker.rb
+- lib/lisp/interpreter/helpers/validator.rb
+- lib/lisp/interpreter/helpers/value_finder.rb
 - lib/lisp/interpreter/parser.rb
 - lib/lisp/interpreter/run.rb
 - lib/lisp/interpreter/tokenizer.rb
-- lib/lisp/interpreter/validator.rb
-- lib/lisp/interpreter/value_finder.rb
 - lib/lisp/interpreter/version.rb
 - lisp-interpreter.gemspec
 - spec/lisp/interpreter_spec.rb

data/lib/lisp/interpreter/functional.rb

@@ -1,290 +0,0 @@
-# Optimization module
-module Optimize
-  def fold_values_helper(other)
-    other = other.map { |t| find_list_function_value [t] }
-    (equalize_lists other).transpose
-  end
-
-  def get_fold_values(other)
-    values = find_all_values other
-    raise arg_err_build 'at least 2', 0 if values.empty?
-    x = values[0]
-    y = fold_values_helper values[1..-1]
-    [x, y]
-  end
-
-  def rm_from_in_scope(scope, idx, def_vars)
-    i = find_bracket_idx scope, idx
-    def_vars[scope[idx + 2].to_s] = scope[idx + 3..i - 1]
-    scope.slice!(idx..i)
-    [i + 1, scope, def_vars]
-  end
-
-  def inner_scope_replace(scope, vars)
-    scope.each_with_index do |t, i|
-      scope[i] = vars[t.to_s] if vars.key? t.to_s
-    end
-    scope.flatten
-  end
-
-  def fetch_inner_scope(scope, idx = 0, def_vars = {})
-    until idx >= scope.size
-      if scope[idx] == 'define'
-        idx, scope, def_vars = rm_from_in_scope scope, idx - 1, def_vars
-      else
-        idx += 1
-      end
-    end
-    inner_scope_replace scope, def_vars
-  end
-
-  def filter_helper(func, values)
-    result =
-      if func.is_a? Proc
-        values.select { |t| func.call(*t) == '#t' }
-      else
-        values.select { |t| (send func, [t]) == '#t' }
-      end
-    build_list result
-  end
-
-  def apply_helper(func, values)
-    *vs, lst = values
-    raise 'Incorrect data type' unless lst.list?
-    (find_list_function_value [lst]).each { |t| vs << t }
-    return func.call(*vs) if func.is_a? Proc
-    send func, vs
-  end
-
-  def call_compose_helper(other)
-    tmp = ['(', *other[1..-1]]
-    idx = find_bracket_idx tmp, 0
-    funcs = find_all_values tmp[1..idx - 1]
-    return '' if tmp[idx + 1..-1].nil? && funcs.empty?
-    [funcs, idx, tmp]
-  end
-
-  def call_compose(other)
-    funcs, idx, tmp = call_compose_helper other
-    value = find_all_values tmp[idx + 1..-1]
-    funcs.reverse.each do |t|
-      value = value.to_s unless value.is_a? Array
-      value = calc_input_val ['(', t, *value, ')']
-    end
-    value
-  end
-
-  def build_compose_expr(funcs)
-    expr = ['(', 'x', ')']
-    funcs.each do |f|
-      expr << '('
-      expr << f
-    end
-    expr << 'x'
-    funcs.size.times { expr << ')' }
-    expr
-  end
-
-  def do_not_call_compose(other)
-    funcs = find_all_values other
-    raise 'Incorrect data type' if funcs.any? { |t| t.to_s.number? }
-    expr = build_compose_expr funcs
-    proc_lambda expr
-  end
-
-  def define_var_stl(var, values)
-    puts methods.to_s
-    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
-module FunctionalSchemeHelper
-  include Optimize
-  def foldl_helper(func, accum, lst)
-    return accum if lst.empty?
-    value = func.call(*lst[0], accum.to_s) if func.is_a? Proc
-    value = send func, [*lst[0], accum] if value.nil?
-    foldl_helper func, value.to_s, lst[1..-1]
-  end
-
-  def foldr_helper(func, accum, lst)
-    return accum if lst.empty?
-    value = foldr_helper func, accum, lst[1..-1]
-    return func.call(*lst[0], value.to_s) if func.is_a? Proc
-    send func, [*lst[0], value.to_s]
-  end
-
-  def equalize_lists(other)
-    min = other.map(&:size).min
-    other.map { |t| t[0..min - 1] }
-  end
-
-  def member_helper(to_check, values)
-    return '#f' unless values.include? to_check
-    idx = values.index(to_check)
-    build_list values[idx..-1]
-  end
-
-  def find_params_lambda(other)
-    raise 'Invalid syntax' if other[0] != '('
-    idx = find_bracket_idx other, 0
-    [other[1..idx - 1], other[idx + 1..-1]]
-  end
-
-  def eval_lambda(other)
-    idx = find_bracket_idx other.unshift('('), 0
-    to_eval = other[1..idx - 1]
-    (proc_lambda to_eval, true).call(*other[idx + 1..-1])
-  end
-
-  def proc_lambda_helper(other, params, args)
-    args = arg_finder args
-    raise arg_err_build params.size, args.size unless params.size == args.size
-    define_func_helper other.dup, params.dup, args
-  end
-
-  def proc_lambda(other, is_call = false)
-    params, other = find_params_lambda other
-    other = fetch_inner_scope other
-    valid = params.all? { |t| valid_var_name t } || is_call
-    raise 'Invalid syntax' unless valid
-    to_return = other[0..1].join == '(compose' && params.empty?
-    return calc_input_val other if to_return
-    proc = proc do |*args|
-      proc_lambda_helper other, params, args
-    end
-    proc
-  end
-
-  def fetch_define(other)
-    if other[0] == '('
-      define_function other
-    else
-      define_var other[0].to_s, (find_all_values other[1..-1])
-    end
-  end
-
-  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
-    define_var_stl var, values
-  end
-
-  def set_values_define(other, params, args)
-    args = [args] unless args.is_a? Array
-    other.each_with_index do |t, idx|
-      if params.include? t
-        i = params.index t
-        other[idx] = args[i]
-      end
-    end
-    other
-  end
-
-  def define_func_helper(other, params, args)
-    temp = set_values_define other, params, args
-    calc_input_val temp
-  end
-
-  def arg_finder_helper(name, args)
-    if !name.nil?
-      args = args[1..-1]
-      [name, args]
-    else
-      find_next_value args
-    end
-  end
-
-  def arg_finder(args)
-    result = []
-    until args.empty?
-      name = predefined_method_caller [args[0]]
-      temp, args = arg_finder_helper name, args
-      result << temp
-    end
-    result
-  end
-
-  def define_function(other)
-    idx = find_bracket_idx other, 0
-    name, *params = other[1..idx - 1]
-    build_fn = ['(', 'lambda', '(', *params, ')', *other[idx + 1..-1], ')']
-    define_var name, (find_all_values build_fn)
-  end
-end
-
-# Functional programming main functions
-module FunctionalScheme
-  include FunctionalSchemeHelper
-  def foldl(other)
-    raise arg_err_build 'at least 2', other.size if other.size < 2
-    func, other = valid_function other
-    val_one, val_two = get_fold_values other
-    foldl_helper func, val_one, val_two
-  end
-
-  def foldr(other)
-    raise arg_err_build 'at least 2', other.size if other.size < 2
-    func, other = valid_function other
-    val_one, val_two = get_fold_values other
-    foldr_helper func, val_one, val_two
-  end
-
-  def filter(other)
-    raise arg_err_build 2, other.size if other.size < 2
-    func, other = valid_function other
-    raise arg_err_build 2, 1 if other.empty?
-    values = find_all_values other
-    values = find_list_function_value [values[0]]
-    filter_helper func, values
-  end
-
-  def member(other)
-    raise arg_err_build 2, other.size unless other.size == 2
-    to_check = other[0]
-    split_val = split_list_string other[1]
-    raise 'Invalid argument' unless split_val.pair? || split_val.list?
-    values = find_all_values split_val[2..-2]
-    member_helper to_check, values
-  end
-
-  def remove(other)
-    raise arg_err_build 2, other.size unless other.size == 2
-    to_remove = other[0]
-    values = find_list_function_value [other[1]]
-    values.delete_at(values.index(to_remove) || values.length)
-    build_list values
-  end
-
-  def apply(other)
-    raise arg_err_build 'at least 2', 0 if other.nil? || other.empty?
-    func, other = valid_function other
-    raise arg_err_build 'at least 2', 1 if other.empty?
-    values = find_all_values other
-    apply_helper func, values
-  end
-
-  def compose(other)
-    if other[0] != 'compose'
-      do_not_call_compose other
-    else
-      call_compose other
-    end
-  end
-
-  def lambda(other)
-    if other[0] == 'lambda'
-      eval_lambda other[1..-1]
-    else
-      proc_lambda other
-    end
-  end
-
-  def define(other)
-    raise arg_err_build 2, other.size if other.size < 2
-    fetch_define other
-  end
-end