rubymotionlisp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cd26bad53833fe2ee3f15b08e989595f835762a
-  data.tar.gz: 8bc181d5653cb58ce352f6ca4e1ff79a0d66e6fc
+  metadata.gz: 79d1cf36fe85338600c33a3085d4d211d9e6dd5d
+  data.tar.gz: 951f1a587966f6e528e00b7159ae7512045e70f2
 SHA512:
-  metadata.gz: 85e9ff41520cad81442bb0299bd9087e296dc3cc250df0f9b316d1201201d27ab585f9770cb96b1590833c3d50e49e364537b9321b1a79b06a5e9dba93d1428a
-  data.tar.gz: 5e27bb3023a10c31605901fcfb9c8493a441371129e0a59c50389d00b73ee928170299096be4a2a689fb0808eeb228e3efa8c4b13e23f28c7ca072c7b7972b4a
+  metadata.gz: 3d13696668fe0df15257d56f11c3984eebd96b32ebd98c1af083601be8859f298a230f80316008f4924fc2a094155773e7ae667f50aa8f255947bd29914783ce
+  data.tar.gz: 7ff8677aae52bf3bdcc100dce2cdd5768da64ffd92f060c95ad475a7653676d377b04f57d3ab780448f0188cec751529527c8a7cf6135ba2718deb2f64a72944

data/lib/rubylisp/exception.rb

@@ -30,7 +30,7 @@ module Lisp
         unless handlers.nil?
           handler = handler_or_nil(handlers, for: name)
           unless handler.nil?
-            handler.apply_to_without_evaluating(args, in: frame)
+            handler.apply_to_without_evaluating(args, frame)
             break
           end
         end

data/lib/rubylisp/ffi_class.rb

@@ -93,7 +93,7 @@ module Lisp
         local_env = Lisp::EnvironmentFrame.extending(env)
         local_env.bind_locally(Symbol.named("self"), Lisp::NativeObject.with_value(self))
         processed_args = args.map {|a| Lisp::ClassObject.convert_to_lisp(a)}
-        Lisp::ClassObject.convert_to_ruby(body.apply_to(Lisp::ConsCell.array_to_list(processed_args), in: local_env), in: local_env)
+        Lisp::ClassObject.convert_to_ruby(body.apply_to(Lisp::ConsCell.array_to_list(processed_args), local_env), local_env)
       end
       Lisp::String.with_value("OK")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubymotionlisp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dave Astels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies: []
 description: An embeddable Lisp as an extension language for RubyMotion
 email: dastels@icloud.com
@@ -17,7 +17,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/rubylisp.rb
 - lib/rubylisp/alist.rb
 - lib/rubylisp/assignment.rb
 - lib/rubylisp/atom.rb
@@ -26,7 +25,6 @@ files:
 - lib/rubylisp/builtins.rb
 - lib/rubylisp/character.rb
 - lib/rubylisp/cons_cell.rb
-- lib/rubylisp/debug.rb
 - lib/rubylisp/environment_frame.rb
 - lib/rubylisp/equivalence.rb
 - lib/rubylisp/exception.rb

data/lib/rubylisp.rb

@@ -1,2 +0,0 @@
-require 'set'
-Dir[File.dirname(__FILE__) + '/rubylisp/*.rb'].each {|file| require file }

data/lib/rubylisp/debug.rb

@@ -1,238 +0,0 @@
-# Copyright 2014 David R. Astels.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-  
-module Lisp
-
-  class Debug
-
-    class <<self
-      attr_accessor :trace, :on_error, :on_entry, :single_step, :interactive, :target_env, :eval_in_debug_repl
-    end
-      
-
-    def self.register
-      self.trace = false
-      self.on_error = false
-      self.on_entry = Set.new
-      self.single_step = false
-      self.interactive = false
-
-      Primitive.register("debug-trace") {|args, env| Lisp::Debug::debug_trace_impl(args, env) }
-      Primitive.register("debug-on-error") {|args, env| Lisp::Debug::debug_on_error_impl(args, env) }
-      Primitive.register("debug-on-entry") {|args, env| Lisp::Debug::debug_on_entry_impl(args, env) }
-      Primitive.register("add-debug-on-entry") {|args, env| Lisp::Debug::add_debug_on_entry_impl(args, env) }
-      Primitive.register("remove-debug-on-entry") {|args, env| Lisp::Debug::remove_debug_on_entry_impl(args, env) }
-      Primitive.register("debug") {|args, env| Lisp::Debug::debug_impl(args, env) }
-      Primitive.register("dump") {|args, env| Lisp::Debug::dump_imp2l(args, env) }
-    end
-
-
-    def self.debug_trace_impl(args, env)
-      return Lisp::Debug.process_error("debug-trace requires 1 argument", env) unless args.length == 1
-      flag = args.car.evaluate(env)
-      return Lisp::Debug.process_error("the argument to debug-trace has to be a boolean", env) unless flag.boolean?
-      self.trace = flag.value
-      flag
-    end
-  
-    def self.debug_on_error_impl(args, env)
-      return Lisp::Debug.process_error("debug-on-error requires 1 argument", env) unless args.length == 1
-      flag = args.car.evaluate(env)
-      return Lisp::Debug.process_error("the argument to debug-on-error has to be a boolean", env) unless flag.boolean?
-      self.on_error = flag.value
-      flag
-    end
-  
-    def self.debug_on_entry_impl(args, env)
-      Lisp::ConsCell.array_to_list(self.on_entry.to_a.sort.map {|s| Lisp::String.with_value(s) })
-    end
-  
-    def self.add_debug_on_entry_impl(args, env)
-      return Lisp::Debug.process_error("add-debug-on-error requires 1 argument", env) unless args.length == 1
-      f = args.car.evaluate(env)
-      return Lisp::Debug.process_error("the argument to add-debug-on-error has to be a function", env) unless f.function? || f.primitive?
-
-      self.on_entry.add(f.name)
-      f
-    end
-  
-    def self.remove_debug_on_entry_impl(args, env)
-      return Lisp::Debug.process_error("remove-debug-on-error requires 1 argument", env) unless args.length == 1
-      f = args.car.evaluate(env)
-      return Lisp::Debug.process_error("the argument to remove-debug-on-error has to be a function", env) unless f.function?
-
-      self.on_entry.remove(f.name)
-      f
-    end
-  
-    def self.debug_impl(args, env)
-    end
-  
-    def self.dump_impl(args, env)
-      env.dump()
-    end
-
-
-    def self.process_state(tokens)
-      if tokens.size != 2
-        puts "Missing on/off"
-        [false, false]
-      else
-        case tokens[1]
-        when 'on'
-          [true, true]
-        when 'off'
-          [true, false]
-        else
-          puts "on/off expected."
-          [false, false]
-        end
-      end
-    end
-
-
-    def func_or_nil(fname, env)
-      f = env.value_of(Lisp::Symbol.named(fname))
-      if f.nil? || !f.function?
-        puts "No such function."
-        nil
-      else
-        f
-      end
-    end
-
-    
-    def self.debug_repl(env)
-      parser = Lisp::Parser.new
-      puts("Debugging: #{env.current_code[0]}")
-      while line = Readline.readline('D> ', true)
-        if !line.empty?
-          if line[0] == ':'
-            tokens = line[1..-1].split
-            case tokens[0]
-            when '(+'
-              f = func_or_nil(tokens[1], env)
-              self.on_entry.add(f.name) unless f.nil?
-            when '(-'
-              f = func_or_nil(tokens[1], env)
-              self.on_entry.delete(f.name) unless f.nil?
-            when '('
-              self.on_entry.to_a.sort.each {|f| puts f}
-            when '?'
-              puts "RubyLisp Debugger"
-              puts "-----------------"
-              puts ":(+ func  - debug on entry to func"
-              puts ":(- func  - don't debug on entry to func"
-              puts ":(        - show functions marked as debug on entry"
-              puts ":?        - show this command summary"
-              puts ":b        - show the environment stack"
-              puts ":c        - continue, exiting the debugger"
-              puts ":d        - do a full of the environment stack"
-              puts ":e on/off - Enable/disable debug on error"
-              puts ":f frame# - do a full dump of a single environment frame"
-              puts ":q        - quit GoLisp"
-              puts ":r sexpr  - return from the current evaluation with the specified value"
-              puts ":s        - single step (run to the next evaluation)"
-              puts ":t on/off - Enable/disable tracing"
-              puts ":u        - continue until the enclosing environment frame is returned to"
-              puts
-            when 'b'
-              env.dump_headers()
-              puts
-            when 'c'
-              self.target_env = nil
-              self.single_step = false
-              self.eval_in_debug_repl = false
-              return
-            when 'd'
-              env.dump
-            when 'e'
-              ok, state = process_state(tokens)
-              self.on_error = state if ok
-            when 'f'
-              if tokens.size != 2
-                puts "Missing frame number."
-              else
-                fnum = tokens[1].to_i
-                env.dump_single_frame(fnum)
-              end
-            when 'q'
-              exit()
-            when 'r'
-              self.eval_in_debug_repl = true
-              code = parser.parse(tokens[1..-1].join(' '))
-              return_value = code.evaluate(env)
-              self.eval_in_debug_repl = false
-              self.target_env = nil
-              self.single_step = false
-              self.eval_in_debug_repl = false
-              return return_value
-            when 's'
-              self.single_step = true
-              return
-            when 't'
-              ok, state = process_state(tokens)
-              self.trace = state if ok
-            when 'u'
-              if env.previous.nil?
-                puts "Already at top frame."
-              else
-                self.target_env = env
-                return
-              end
-            end
-          else
-            begin 
-              self.eval_in_debug_repl = true
-              code = parser.parse(line)
-              value = code.evaluate(env)
-              self.eval_in_debug_repl = false
-              puts value.to_s
-            rescue Exception => ex
-              puts "ERROR: #{ex}"
-              puts ex.backtrace
-            end
-          end
-        end
-      end
-    end
-
-    def self.process_error(error_message, env)
-      if self.on_error && self.interactive
-        puts "ERROR: #{error_message}"
-        self.debug_repl(env)
-      else
-        raise error_message
-      end
-    end
-
-
-    def self.print_dashes(level)
-      print("-" * level)
-    end
-
-    
-    def self.log_eval(sexpr, env)
-      if !self.eval_in_debug_repl && self.trace
-        depth = env.depth
-        print("% #d: " % depth)
-        print_dashes(depth)
-        puts("> #{sexpr.to_s}")
-      end
-    end
-
-
-    def self.log_result(result, env)
-      if !self.eval_in_debug_repl && self.trace
-        depth = env.depth
-        print("% #d: <" % depth)
-        print_dashes(depth)
-        puts(" #{result.to_s}")
-      end
-    end
-    
-  
-  end
-end