[armedbear-cvs] r13533 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Tue Aug 23 05:48:24 2011
New Revision: 13533

Log:
Remove two unnecessary EVAL-WHEN forms.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp	Tue Aug 23 03:43:03 2011	(r13532)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp	Tue Aug 23 05:48:24 2011	(r13533)
@@ -31,37 +31,35 @@
 
 (in-package "JVM")
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (require "LOOP")
-  (require "FORMAT")
-  (require "CLOS")
-  (require "PRINT-OBJECT")
-  (require "COMPILER-TYPES")
-  (require "KNOWN-FUNCTIONS")
-  (require "KNOWN-SYMBOLS")
-  (require "DUMP-FORM")
-  (require "OPCODES")
-  (require "JAVA"))
-
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun generate-inline-expansion (name lambda-list body
-				    &optional (args nil args-p))
-    "Generates code that can be used to expand a named local function inline. It can work either per-function (no args provided) or per-call."
-    (if args-p
-	(expand-function-call-inline
-	 nil lambda-list
-	 (copy-tree `((block ,name , at body)))
-	 args)
-	(cond ((intersection lambda-list
-			     '(&optional &rest &key &allow-other-keys &aux)
-			     :test #'eq)
-	       nil)
-	      (t
-	       (setf body (copy-tree body))
-	       (list 'LAMBDA lambda-list
-		     (list* 'BLOCK name body))))))
-    ) ; EVAL-WHEN
+(require "LOOP")
+(require "FORMAT")
+(require "CLOS")
+(require "PRINT-OBJECT")
+(require "COMPILER-TYPES")
+(require "KNOWN-FUNCTIONS")
+(require "KNOWN-SYMBOLS")
+(require "DUMP-FORM")
+(require "OPCODES")
+(require "JAVA")
+
+
+(defun generate-inline-expansion (name lambda-list body
+                                  &optional (args nil args-p))
+  "Generates code that can be used to expand a named local function inline.
+It can work either per-function (no args provided) or per-call."
+  (if args-p
+      (expand-function-call-inline nil lambda-list
+                                   (copy-tree `((block ,name , at body)))
+                                   args)
+      (cond ((intersection lambda-list
+                           '(&optional &rest &key &allow-other-keys &aux)
+                           :test #'eq)
+             nil)
+            (t
+             (setf body (copy-tree body))
+             (list 'LAMBDA lambda-list
+                   (list* 'BLOCK name body))))))
+
 
 ;;; Pass 1.