Changing back to use a tuple for the parsed s-expression

extra/lisp/lisp.factor

@@ -7,7 +7,7 @@ IN: lisp
 DEFER: convert-form
 
 : convert-body ( s-exp -- quot )
-  [ convert-form ] map [ ] [ compose ] reduce ; inline
+  [ convert-form ] map reverse [ ] [ compose ] reduce ; inline
   
 : convert-if ( s-exp -- quot )
   1 tail [ convert-form ] map reverse first3  [ % , , if ] bake ;
@@ -24,11 +24,11 @@ DEFER: convert-form
 <PRIVATE  
 : localize-body ( vars body -- newbody )  
   [ dup lisp-symbol? [ tuck name>> swap member? [ name>> make-local ] [ ] if ]
-                     [ dup vector? [ localize-body ] [ nip ] if ] if ] with map ; inline
+                     [ dup s-exp? [ body>> localize-body <s-exp> ] [ nip ] if ] if ] with map ;
 PRIVATE>                     
   
 : convert-lambda ( s-exp -- quot )  
-  1 tail unclip reverse [ name>> ] map dup make-locals dup push-locals
+  first3 -rot nip [ body>> ] bi@ reverse [ name>> ] map dup make-locals dup push-locals
   [ swap localize-body convert-body ] dipd pop-locals swap <lambda> ;
   
 : convert-list-form ( s-exp -- quot )  
@@ -41,7 +41,7 @@ PRIVATE>
      } case ] [ drop convert-general-form ] if ;
   
 : convert-form ( lisp-form -- quot )
-  { { [ dup vector? ] [ convert-list-form ] }
+  { { [ dup s-exp? ] [ body>> convert-list-form ] }
    [ [ , ] [ ] make ]
   } cond ;
   

extra/lisp/parser/parser.factor

@@ -6,6 +6,9 @@ IN: lisp.parser
 TUPLE: lisp-symbol name ;
 C: <lisp-symbol> lisp-symbol
 
+TUPLE: s-exp body ;
+C: <s-exp> s-exp
+
 EBNF: lisp-expr
 _            = (" " | "\t" | "\n")*
 LPAREN       = "("
@@ -29,5 +32,5 @@ atom         = number
               | identifier
               | string
 list-item    = _ (atom|s-expression) _                        => [[ second ]]
-s-expression = LPAREN (list-item)* RPAREN             => [[ second ]]
+s-expression = LPAREN (list-item)* RPAREN             => [[ second <s-exp> ]]
 ;EBNF