rubylisp 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb5f9ceceb5366ea22a1684c23f1f891baff4ee9
-  data.tar.gz: 4dcf3352fe2c53178012846dd428a55e25e6ff5e
+  metadata.gz: 766ad09a55015bc092208b72f53402b9d937449a
+  data.tar.gz: 3861fd772f1f62324bf636387c5cc8ba73ce89a6
 SHA512:
-  metadata.gz: 8b6a30a4b7811e1c08bd49710de04c17ac2cce55a0bd9cd375e5f71c58c386c7c0a70c1335c79cb40d55fc558e06812568b48990b178f39fb0b0264451f5db30
-  data.tar.gz: 8cd9f89766f14601094794fa31404629e5780ce5072ad95abfd346b4733152c7962fa68c17234e475247458e7d65a93985ab7a6fe4bd61ff769c1df60c9293c2
+  metadata.gz: ec857ef3a5c1c82446acf3dffd9a0a90c2b355bf528b2c50e8aeb879b6eeeffd14566fa28bdbcedd272da3de746da3da6f503fecaa831fa08169330ad07c634c
+  data.tar.gz: cebd6a7be2904d8f7390d5bd05162b5d92e7092fba83ee73e76945042c493674704af1f4aaad734fb215f78b2b72f7ad948e44d5cb12f9f8d31436ab5d4d7dea

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?

metadata

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