X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=static.el;h=b64440d65e8175075d7f52cffb5636dcba0642a4;hb=c70a964beaae278efd40e20371b362fc92aa74d4;hp=a47eb0548791cc71657d411e312b4ca0beb4e3b9;hpb=64c72f840d56c5f73d519205235d0d93834bae77;p=elisp%2Fapel.git

diff --git a/static.el b/static.el
index a47eb05..b64440d 100644
--- a/static.el
+++ b/static.el
@@ -51,16 +51,19 @@
 	       (list (quote quote) (, bodyform))
 	     (,@ (mapcar
 		  (if var
-		      (lambda (h)
-			(` ((, (car h))
-			    (list (quote funcall)
-				  (lambda ((, var)) (,@ (cdr h)))
-				  (list (quote quote) (, var))))))
-		    (lambda (h)
-		      (` ((, (car h)) (quote (progn (,@ (cdr h))))))))
+		      (function
+		       (lambda (h)
+			 (` ((, (car h))
+			     (list (quote funcall)
+				   (function (lambda ((, var)) (,@ (cdr h))))
+				   (list (quote quote) (, var)))))))
+		    (function
+		     (lambda (h)
+		       (` ((, (car h)) (quote (progn (,@ (cdr h)))))))))
 		  handlers))))))
 
-(defmacro static-defconst (symbol initvalue docstring)
+(put 'static-defconst 'lisp-indent-function 'defun)
+(defmacro static-defconst (symbol initvalue &optional docstring)
   "`defconst' expression but INITVALUE is evaluated at compile-time.
 
 The variable SYMBOL can be referenced at either compile-time or run-time."
@@ -68,10 +71,19 @@ The variable SYMBOL can be referenced at either compile-time or run-time."
     (eval (` (defconst (, symbol) (quote (, value)) (, docstring))))
     (` (defconst (, symbol) (quote (, value)) (, docstring)))))
 
+(defmacro static-cond (&rest clauses)
+  "`cond' expression but the car of each clause is evaluated at compile-time."
+  (while (and clauses
+	      (not (eval (car (car clauses)))))
+    (setq clauses (cdr clauses)))
+  (if clauses
+      (cons 'progn (cdr (car clauses)))))
+
 
 ;;; @ end
 ;;;
 
-(provide 'static)
+(require 'product)
+(product-provide (provide 'static) (require 'apel-ver))
 
 ;;; static.el ends here