From 1acf9bc60b5e2589ccea776a99528bf8b99d5f22 Mon Sep 17 00:00:00 2001
From: James Cash <james.nvc@gmail.com>
Date: Sun, 18 May 2008 12:00:03 -0400
Subject: [PATCH] Lookup lisp-symbols in variable list

---
 extra/lisp/lisp.factor | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extra/lisp/lisp.factor b/extra/lisp/lisp.factor
index 32df8c5102..0c5ae34e3f 100644
--- a/extra/lisp/lisp.factor
+++ b/extra/lisp/lisp.factor
@@ -7,6 +7,7 @@ IN: lisp
 
 DEFER: convert-form
 DEFER: funcall
+DEFER: lookup-vars
 
 ! Functions to convert s-exps to quotations
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -23,7 +24,7 @@ DEFER: funcall
   rest [ [ convert-form map ] map ] [ % cond ] bake ;
   
 : convert-general-form ( s-exp -- quot )
-  unclip convert-form swap convert-body [ , % funcall ] bake ;
+  unclip convert-form swap convert-body [ , lookup-vars % funcall ] bake ;
 
 ! words for convert-lambda  
 <PRIVATE  
@@ -42,10 +43,10 @@ DEFER: funcall
 : rest-lambda ( body vars -- quot )  
   "&rest" swap [ remove ] [ index ] 2bi
   [ localize-lambda <lambda> ] dip
-  [ , cut swap [ % , ] bake , compose ] bake ;
+  [ , lookup-vars cut swap [ % , ] bake , compose ] bake ;
   
 : normal-lambda ( body vars -- quot )
-  localize-lambda <lambda> [ , compose ] bake ;
+  localize-lambda <lambda> [ lookup-vars , compose ] bake ;
 PRIVATE>
   
 : convert-lambda ( s-exp -- quot )  
@@ -90,5 +91,8 @@ ERROR: no-such-var var ;
 : funcall ( quot sym -- * )
   dup lisp-symbol?  [ name>> lisp-get ] when call ; inline
 
+: lookup-vars ( q -- p )  
+  [ dup lisp-symbol? [ name>> lisp-get ] when ] map ;
+  
 : define-primitve ( name vocab word -- )  
   swap lookup [ [ , ] compose call ] bake lisp-define ;
\ No newline at end of file