Commit 03bcb3c4 authored by Frode Vatvedt Fjeld's avatar Frode Vatvedt Fjeld

Don't coerce to function.

parent 6f25bcd8
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
;;;; Created at: Thu Nov 2 17:45:05 2000 ;;;; Created at: Thu Nov 2 17:45:05 2000
;;;; Distribution: See the accompanying file COPYING. ;;;; Distribution: See the accompanying file COPYING.
;;;; ;;;;
;;;; $Id: eval.lisp,v 1.11 2006/04/28 23:20:47 ffjeld Exp $ ;;;; $Id: eval.lisp,v 1.12 2007/03/11 21:18:40 ffjeld Exp $
;;;; ;;;;
;;;;------------------------------------------------------------------ ;;;;------------------------------------------------------------------
...@@ -76,10 +76,17 @@ ...@@ -76,10 +76,17 @@
((muerte.cl:quote) t) ((muerte.cl:quote) t)
((muerte.cl:not) ((muerte.cl:not)
(movitz-constantp (second form))) (movitz-constantp (second form)))
((muerte.cl:+ muerte.cl:- muerte.cl:* muerte.cl:coerce) ((muerte.cl:+ muerte.cl:- muerte.cl:*)
(every (lambda (sub-form) (every (lambda (sub-form)
(movitz-constantp sub-form env)) (movitz-constantp sub-form env))
(cdr form))))) (cdr form)))
((muerte.cl:coerce)
(and (= 3 (length form))
(every (lambda (sub-form)
(movitz-constantp sub-form env))
(cdr form))
(not (member (movitz-eval (third form) env)
'(muerte.cl:function)))))))
(and compiler-macro-function (and compiler-macro-function
(not (movitz-env-get (car form) 'notinline nil env)) (not (movitz-env-get (car form) 'notinline nil env))
(not (eq form compiler-macro-expansion)) (not (eq form compiler-macro-expansion))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment