From 847077f77088e244c124e076bbef9a7c8930757a Mon Sep 17 00:00:00 2001
From: James Cash <james.nvc@gmail.com>
Date: Tue, 3 Jun 2008 03:46:29 -0400
Subject: [PATCH] Changing lisp to reflect moving extra/lisp/conses to
 extra/lists

---
 extra/lisp/lisp.factor                | 21 +++++++++++----------
 extra/lisp/parser/parser-tests.factor |  2 +-
 extra/lisp/parser/parser.factor       |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/extra/lisp/lisp.factor b/extra/lisp/lisp.factor
index 3d977df97f..b034619d0d 100644
--- a/extra/lisp/lisp.factor
+++ b/extra/lisp/lisp.factor
@@ -3,7 +3,7 @@
 USING: kernel peg sequences arrays strings combinators.lib
 namespaces combinators math locals locals.private accessors
 vectors syntax lisp.parser assocs parser sequences.lib words quotations
-fry lisp.conses ;
+fry lists ;
 IN: lisp
 
 DEFER: convert-form
@@ -11,20 +11,21 @@ DEFER: funcall
 DEFER: lookup-var
 DEFER: lisp-macro?
 DEFER: lookup-macro
+DEFER: macro-call
 
 ! Functions to convert s-exps to quotations
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 : convert-body ( cons -- quot )
-    [ ] [ convert-form compose ] reduce ; inline
+    [ ] [ convert-form compose ] reduce-cons ; inline
   
 : convert-if ( cons -- quot )
-    rest first3 [ convert-form ] tri@ '[ @ , , if ] ;
+    cdr first3 [ convert-form ] tri@ '[ @ , , if ] ;
     
 : convert-begin ( cons -- quot )  
-    rest [ convert-form ] [ ] map-as '[ , [ funcall ] each ] ;
+    cdr [ convert-form ] [ ] map-as '[ , [ funcall ] each ] ;
     
 : convert-cond ( cons -- quot )  
-    rest [ body>> first2 [ convert-form ] bi@ [ '[ @ funcall ] ] dip 2array ]
+    cdr [ body>> first2 [ convert-form ] bi@ [ '[ @ funcall ] ] dip 2array ]
     { } map-as '[ , cond ]  ;
     
 : convert-general-form ( cons -- quot )
@@ -34,12 +35,12 @@ DEFER: lookup-macro
 <PRIVATE  
 : localize-body ( assoc body -- assoc newbody )  
     [ dup lisp-symbol? [ over dupd [ name>> ] dip at swap or ]
-                     [ dup cons? [ body>> localize-body <s-exp> ] when ] if
-                   ] map ;
+                     [ dup cons? [ localize-body ] when ] if
+                   ] map-cons ;
     
 : localize-lambda ( body vars -- newbody newvars )
     make-locals dup push-locals swap
-    [ swap localize-body <s-exp> convert-form swap pop-locals ] dip swap ;
+    [ swap localize-body cons convert-form swap pop-locals ] dip swap ;
                    
 : split-lambda ( cons -- body vars )                   
     first3 -rot nip [ body>> ] bi@ [ name>> ] map ; inline
@@ -57,7 +58,7 @@ PRIVATE>
     split-lambda "&rest" over member? [ rest-lambda ] [ normal-lambda ] if ;
     
 : convert-quoted ( cons -- quot )  
-    cdr>> 1quotation ;
+    cdr 1quotation ;
     
 : form-dispatch ( lisp-symbol -- quot )
     name>>
@@ -73,7 +74,7 @@ PRIVATE>
     uncons lookup-macro macro-call convert-form ;
     
 : convert-list-form ( cons -- quot )  
-    dup car>>
+    dup car
     { { [ dup lisp-macro?  ] [ macro-expand ] }
       { [ dup lisp-symbol? ] [ form-dispatch ] } 
      [ drop convert-general-form ]
diff --git a/extra/lisp/parser/parser-tests.factor b/extra/lisp/parser/parser-tests.factor
index 9c33f635f9..41254db5b3 100644
--- a/extra/lisp/parser/parser-tests.factor
+++ b/extra/lisp/parser/parser-tests.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 James Cash
 ! See http://factorcode.org/license.txt for BSD license.
-USING: lisp.parser tools.test peg peg.ebnf lisp.conses ;
+USING: lisp.parser tools.test peg peg.ebnf lists ;
 
 IN: lisp.parser.tests
 
diff --git a/extra/lisp/parser/parser.factor b/extra/lisp/parser/parser.factor
index 9679c77209..1e37193d3a 100644
--- a/extra/lisp/parser/parser.factor
+++ b/extra/lisp/parser/parser.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 James Cash
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel peg peg.ebnf peg.expr math.parser sequences arrays strings
-combinators.lib math fry accessors lisp.conses ;
+combinators.lib math fry accessors lists ;
 
 IN: lisp.parser