Changeset 8406

Timestamp:

01/27/05 13:10:50 (16 years ago)

Author:

piso

Message:

Work in progress (tested).

File:

• trunk/j/src/org/armedbear/lisp/jvm.lisp (modified) (5 diffs)

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

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003-2005 Peter Graves
-;;; $Id: jvm.lisp,v 1.373 2005-01-27 02:17:58 piso Exp $
+;;; $Id: jvm.lisp,v 1.374 2005-01-27 13:10:50 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -138 +138 @@
              ))))
 
-(defstruct compiland
+(defstruct (compiland (:print-function print-compiland))
   name
   (kind :external) ; :INTERNAL or :EXTERNAL
@@ -151 +151 @@
   class-file ; class-file object
   )
+
+(defun print-compiland (compiland stream depth)
+  (%format stream "#<~S ~S>" 'compiland (compiland-name compiland)))
 
 (defvar *current-compiland* nil)
@@ -4858 +4861 @@
         (*safety* 0)
         (*debug* 0))
+
+    (aver (not (null (compiland-class-file xep))))
+
     ;; Pass 1.
     (p1-compiland xep)
@@ -4892 +4898 @@
 
 
-      (when *magic*
+      (when (and *magic* (null (compiland-parent compiland)))
         (when (memq '&OPTIONAL lambda-list)
           (unless (or (memq '&KEY lambda-list) (memq '&REST lambda-list))