Changeset 3543

Timestamp:

08/30/03 17:05:12 (20 years ago)

Author:

piso

Message:

C::%COMPILE

File:

• trunk/j/src/org/armedbear/lisp/compiler.lisp (modified) (7 diffs)

trunk/j/src/org/armedbear/lisp/compiler.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: compiler.lisp,v 1.36 2003-08-25 19:17:23 piso Exp $
+;;; $Id: compiler.lisp,v 1.37 2003-08-30 17:05:12 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -186 +186 @@
                  (cons first args)))))))
 
-
-(defun compile-package (pkg &key verbose)
-  (dolist (sym (sys::package-symbols pkg))
-    (when (fboundp sym)
-;;       (unless (or (special-operator-p sym) (macro-function sym))
-      (unless (special-operator-p sym)
-        (let ((f (fdefinition sym)))
-          (unless (compiled-function-p f)
-            (when verbose
-              (format t "compiling ~S~%" sym)
-              (finish-output))
-            (compile sym))))))
-  t)
-
-
-;; (defun compile (name &optional (definition (fdefinition name)))
-(defun compile (name &optional definition)
+(defun %compile (name &optional definition)
   (unless definition
     (setq definition (or (macro-function name) (fdefinition name))))
@@ -223 +207 @@
       (sys::%set-call-count result (sys::%call-count definition))
       (sys::%set-arglist result (sys::arglist definition))
-;;       (setf (fdefinition name) result))
       (if (macro-function name)
           (setf (fdefinition name) (sys::make-macro result))
@@ -229 +212 @@
     (values (or name result) nil nil)))
 
+(defun compile-package (pkg &key verbose)
+  (dolist (sym (sys::package-symbols pkg))
+    (when (fboundp sym)
+      ;;       (unless (or (special-operator-p sym) (macro-function sym))
+      (unless (special-operator-p sym)
+        (let ((f (fdefinition sym)))
+          (unless (compiled-function-p f)
+            (when verbose
+              (format t "compiling ~S~%" sym)
+              (finish-output))
+            (%compile sym))))))
+  t)
+
 (compile-package :compiler)
 (compile-package :sys)
@@ -234 +230 @@
 
 (in-package :cl)
+
+(defun compile (name &optional definition)
+  (c::%compile name definition))
 
 ;; Redefine DEFUN to compile the definition on the fly.
@@ -239 +238 @@
   `(prog1
     (sys::%defun ',name ',lambda-list ',body)
-    (compile ',name)))
+    (compiler::%compile ',name)))
 
 ;; Redefine DEFMACRO to compile the expansion function on the fly.
@@ -250 +249 @@
     `(progn
        (if (special-operator-p ',name)
-         (sys::%put ',name 'macroexpand-macro (sys::make-macro (compile nil ,expander)))
-         (sys::fset ',name (sys::make-macro (compile nil ,expander))))
+         (sys::%put ',name
+                    'macroexpand-macro
+                    (sys::make-macro (c::%compile nil ,expander)))
+         (sys::fset ',name
+                    (sys::make-macro (c::%compile nil ,expander))))
        ',name)))