rubymotionlisp 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88feeedc4e49b1ad79bfa294d7d6bc8b22900253
-  data.tar.gz: d0ce6a144e369aa47187a93651e06c96e1f8f95d
+  metadata.gz: dda4c6e2e0b9e98084434161a3c0442542e51e6c
+  data.tar.gz: 321a515ebc17e84c7c29fca9f479d87a9b9c253d
 SHA512:
-  metadata.gz: fd1ae7d9a5889c89fb2063b0feaf2edfdbb9e2758d3568efa1d972070063b76fbd28e6e94ccd218533712ea3134d1f64de4b29eba5de59c5b1ca0cb4137363d1
-  data.tar.gz: 752f28753649f20785cd69da11935e4cfd17001197514d7470e7ab7e07d2dd2889ebffeed76c167ca97580b7cd6cdbd1e9320801f6d9ad83dd1e5761a5281fa9
+  metadata.gz: d55fb467b861a95fd5d99fd97e67e74a92e4ad39f67625679487d433f3bf475effcafc293ac9d920ac5c5141d823d8e0effbe4295c9e8e8e4e525944638c6079
+  data.tar.gz: 75dd34314faf4e762c90805402cf530cdbce9902d1e28bb42931342a3d5e66eee359ed0d453037811f848d0c3d4110a8a893ab78daa43822c4905e3ef3503a2a

data/lib/rubylisp/builtins.rb

@@ -1,8 +1,15 @@
 module Lisp
 
+
+  def self.named_let_stack
+    @@named_let_stack ||= Array.new
+  end
+
+  
   class Initializer
 
     def self.initialize_global_environment
+      $named_let_stack = []
       Lisp::EnvironmentFrame.global.bind(Symbol.named("nil"), nil)
     end
 

data/lib/rubylisp/cons_cell.rb

@@ -248,6 +248,7 @@ module Lisp
     def evaluate(env)
       return self if empty?
       sexpr = if @car.symbol?
+                throw :named_let_application, @cdr.to_a.map {|a| a.evaluate(env)} if @car.eq?(Lisp.named_let_stack[-1])
                 key = @car
                 frame = nth(1)
                 value = nth(2)

data/lib/rubylisp/prim_special_forms.rb

@@ -348,9 +348,9 @@ module Lisp
     end
     
 
-    def self.let_impl(args, env)
+    def self.common_let_impl(args, env)
       bindings = args.car || Lisp::ConsCell.new
-      return Lisp::Debug.process_error("let requires a list of bindings as it's firest argument", env) unless bindings.list?
+      return Lisp::Debug.process_error("let requires a list of bindings as it's first argument", env) unless bindings.list?
       local_frame = EnvironmentFrame.extending(env, "let")
       local_frame.previous = env
       do_let_bindings(bindings, env, local_frame)
@@ -358,6 +358,39 @@ module Lisp
     end
 
 
+    def self.named_let_impl(args, env)
+      name = args.car
+      bindings = args.cadr || Lisp::ConsCell.new
+      binding_names = bindings.to_a.map {|b| b.car}
+      return Lisp::Debug.process_error("named let requires a list of bindings as it's second argument", env) unless bindings.list?
+      body = args.cddr
+      local_frame = EnvironmentFrame.extending(env, "let-#{name.to_s}")
+      local_frame.previous = env
+      do_let_bindings(bindings, env, local_frame)
+      Lisp.named_let_stack.push(name)
+      while true
+        new_values = catch :named_let_application do
+          result = body.evaluate_each(local_frame)
+          Lisp.named_let_stack.pop
+          return result
+        end
+        return Lisp::Debug.process_error("named let call requires the same number of values as bindings", env) unless binding_names.length == new_values.length
+        binding_names.zip(new_values) do |binding_pair|
+          local_frame.bind_locally(binding_pair[0], binding_pair[1])
+        end
+      end
+    end
+    
+
+    def self.let_impl(args, env)
+      if args.car.symbol?
+        named_let_impl(args, env)
+      else
+        common_let_impl(args, env)
+      end
+    end
+    
+
     def self.letstar_impl(args, env)
       bindings = args.car || Lisp::ConsCell.new
       return Lisp::Debug.process_error("let requires a list of bindings as it's firest argument", env) unless bindings.list?

data/lib/rubymotion/debug.rb

@@ -28,13 +28,37 @@ module Lisp
     end
 
 
+    # def self.log_eval(sexpr, env)
+    # end
+
+
+    # def self.log_result(result, env)
+    # end
+
+    def self.print_dashes(level)
+      NSLog("-" * level)
+    end
+
+    
     def self.log_eval(sexpr, env)
+      if !self.eval_in_debug_repl && self.trace
+        depth = env.depth
+        NSLog("% #d: " % depth)
+        print_dashes(depth)
+        NSLog("> #{sexpr.to_s}")
+      end
     end
 
 
     def self.log_result(result, env)
+      if !self.eval_in_debug_repl && self.trace
+        depth = env.depth
+        NSLog("% #d: <" % depth)
+        print_dashes(depth)
+        NSLog(" #{result.to_s}")
+      end
     end
-    
+
   
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubymotionlisp
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Dave Astels