 
 SYMBOL: lisp-env
 ERROR: no-such-var var ;
+    
+SYMBOL: macro-env
+    
+M: no-such-var summary drop "No such variable" ;
 
 : init-env ( -- )
-    H{ } clone lisp-env set ;
+    H{ } clone lisp-env set
+    H{ } clone macro-env set ;
 
 : lisp-define ( name quot -- )
     swap lisp-env get set-at ;
     
 : lisp-get ( name -- word )
-    dup lisp-env get at [ ] [ no-such-var throw ] ?if ;
+    dup lisp-env get at [ ] [ no-such-var ] ?if ;
     
 : lookup-var ( lisp-symbol -- quot )
     name>> lisp-get ;

! Functions to convert s-exps to quotations
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: convert-body ( cons -- quot )
    [ ] [ convert-form compose ] reduce-cons ; inline
  
: convert-if ( cons -- quot )
    cdr first3 [ convert-form ] tri@ '[ @ , , if ] ;
    
: convert-begin ( cons -- quot )  
    cdr [ convert-form ] [ ] map-as '[ , [ funcall ] each ] ;
    
: convert-cond ( cons -- quot )  
    cdr [ body>> first2 [ convert-form ] bi@ [ '[ @ funcall ] ] dip 2array ]
    { } map-as '[ , cond ]  ;
    
: convert-general-form ( cons -- quot )
    uncons convert-form swap convert-body swap '[ , @ funcall ] ;

! words for convert-lambda  
<PRIVATE  
: localize-body ( assoc body -- assoc newbody )  
    [ dup lisp-symbol? [ over dupd [ name>> ] dip at swap or ]
                     [ dup cons? [ localize-body ] when ] if
                   ] map-cons ;
    
: localize-lambda ( body vars -- newbody newvars )
    make-locals dup push-locals 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
    
: rest-lambda ( body vars -- quot )  
    "&rest" swap [ index ] [ remove ] 2bi
    localize-lambda <lambda>
    '[ , cut '[ @ , ] , compose ] ;

    dup lisp-symbol?  [ lookup-var ] when call ; inline
    
: define-primitive ( name vocab word -- )  
    swap lookup 1quotation '[ , compose call ] lisp-define ;
    
: lookup-macro ( lisp-symbol -- macro )
    name>> macro-env get at ;
    
: lisp-macro? ( car -- ? )
    dup lisp-symbol? [ name>> macro-env get key? ] [ drop f ] if ;