Changeset 12415


Ignore:
Timestamp:
02/02/10 21:01:41 (11 years ago)
Author:
ehuelsmann
Message:

Rename class-file to abcl-class-file in anticipation of

a more generic class file representation to come.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12413 r12415  
    21722172   local-function *declared-functions* ht g
    21732173   (setf g (symbol-name (gensym "LFUN")))
    2174    (let* ((pathname (class-file-pathname (local-function-class-file local-function)))
     2174   (let* ((pathname (abcl-class-file-pathname (local-function-class-file local-function)))
    21752175    (*code* *static-code*))
    21762176     ;; fixme *declare-inline*
     
    82468246
    82478247(defmacro with-open-class-file ((var class-file) &body body)
    8248   `(with-open-file (,var (class-file-pathname ,class-file)
     8248  `(with-open-file (,var (abcl-class-file-pathname ,class-file)
    82498249       :direction :output
    82508250       :element-type '(unsigned-byte 8)
     
    82538253
    82548254(defun write-class-file (class-file stream)
    8255   (let* ((super (class-file-superclass class-file))
    8256          (this-index (pool-class (class-file-class class-file)))
     8255  (let* ((super (abcl-class-file-superclass class-file))
     8256         (this-index (pool-class (abcl-class-file-class class-file)))
    82578257         (super-index (pool-class super))
    82588258         (constructor (make-constructor super
    8259                                         (class-file-lambda-name class-file)
    8260                                         (class-file-lambda-list class-file))))
     8259                                        (abcl-class-file-lambda-name class-file)
     8260                                        (abcl-class-file-lambda-list class-file))))
    82618261    (pool-name "Code") ; Must be in pool!
    82628262
     
    82848284      (write-field field stream))
    82858285    ;; methods count
    8286     (write-u2 (1+ (length (class-file-methods class-file))) stream)
     8286    (write-u2 (1+ (length (abcl-class-file-methods class-file))) stream)
    82878287    ;; methods
    8288     (dolist (method (class-file-methods class-file))
     8288    (dolist (method (abcl-class-file-methods class-file))
    82898289      (write-method method stream))
    82908290    (write-method constructor stream)
     
    83528352  (let* ((p1-result (compiland-p1-result compiland))
    83538353         (class-file (compiland-class-file compiland))
    8354          (*this-class* (class-file-class class-file))
     8354         (*this-class* (abcl-class-file-class class-file))
    83558355         (args (cadr p1-result))
    83568356         (closure-args (intersection *closure-variables*
     
    85698569    (setf (method-handlers execute-method) (nreverse *handlers*))
    85708570
    8571     (setf (class-file-superclass class-file)
     8571    (setf (abcl-class-file-superclass class-file)
    85728572          (if (or *hairy-arglist-p*
    85738573      (and *child-p* *closure-variables*))
     
    85758575      +lisp-primitive-class+))
    85768576
    8577     (setf (class-file-lambda-list class-file) args)
    8578 
    8579     (push execute-method (class-file-methods class-file)))
     8577    (setf (abcl-class-file-lambda-list class-file) args)
     8578
     8579    (push execute-method (abcl-class-file-methods class-file)))
    85808580  t)
    85818581
  • trunk/abcl/src/org/armedbear/lisp/jvm.lisp

    r12401 r12415  
    9090(defvar *declared-doubles* nil)
    9191
    92 (defstruct (class-file (:constructor %make-class-file))
     92(defstruct (abcl-class-file (:constructor %make-abcl-class-file))
    9393  pathname ; pathname of output file
    9494  lambda-name
     
    135135                         (class-name-from-filespec  pathname)
    136136                         (make-unique-class-name)))
    137          (class-file (%make-class-file :pathname pathname
    138                                        :class class-name
    139                                        :lambda-name lambda-name
    140                                        :lambda-list lambda-list)))
     137         (class-file (%make-abcl-class-file :pathname pathname
     138                                            :class class-name
     139                                            :lambda-name lambda-name
     140                                            :lambda-list lambda-list)))
    141141    class-file))
    142142
     
    144144  (let ((var (gensym)))
    145145    `(let* ((,var ,class-file)
    146             (*pool*               (class-file-pool ,var))
    147             (*pool-count*         (class-file-pool-count ,var))
    148             (*pool-entries*       (class-file-pool-entries ,var))
    149             (*fields*             (class-file-fields ,var))
    150             (*static-code*        (class-file-static-code ,var))
    151             (*declared-symbols*   (class-file-symbols ,var))
    152             (*declared-functions* (class-file-functions ,var))
    153             (*declared-strings*   (class-file-strings ,var))
    154             (*declared-integers*  (class-file-integers ,var))
    155             (*declared-floats*    (class-file-floats ,var))
    156             (*declared-doubles*   (class-file-doubles ,var)))
     146            (*pool*               (abcl-class-file-pool ,var))
     147            (*pool-count*         (abcl-class-file-pool-count ,var))
     148            (*pool-entries*       (abcl-class-file-pool-entries ,var))
     149            (*fields*             (abcl-class-file-fields ,var))
     150            (*static-code*        (abcl-class-file-static-code ,var))
     151            (*declared-symbols*   (abcl-class-file-symbols ,var))
     152            (*declared-functions* (abcl-class-file-functions ,var))
     153            (*declared-strings*   (abcl-class-file-strings ,var))
     154            (*declared-integers*  (abcl-class-file-integers ,var))
     155            (*declared-floats*    (abcl-class-file-floats ,var))
     156            (*declared-doubles*   (abcl-class-file-doubles ,var)))
    157157       (progn ,@body)
    158        (setf (class-file-pool ,var)         *pool*
    159              (class-file-pool-count ,var)   *pool-count*
    160              (class-file-pool-entries ,var) *pool-entries*
    161              (class-file-fields ,var)       *fields*
    162              (class-file-static-code ,var)  *static-code*
    163              (class-file-symbols ,var)      *declared-symbols*
    164              (class-file-functions ,var)    *declared-functions*
    165              (class-file-strings ,var)      *declared-strings*
    166              (class-file-integers ,var)     *declared-integers*
    167              (class-file-floats ,var)       *declared-floats*
    168              (class-file-doubles ,var)      *declared-doubles*))))
     158       (setf (abcl-class-file-pool ,var)         *pool*
     159             (abcl-class-file-pool-count ,var)   *pool-count*
     160             (abcl-class-file-pool-entries ,var) *pool-entries*
     161             (abcl-class-file-fields ,var)       *fields*
     162             (abcl-class-file-static-code ,var)  *static-code*
     163             (abcl-class-file-symbols ,var)      *declared-symbols*
     164             (abcl-class-file-functions ,var)    *declared-functions*
     165             (abcl-class-file-strings ,var)      *declared-strings*
     166             (abcl-class-file-integers ,var)     *declared-integers*
     167             (abcl-class-file-floats ,var)       *declared-floats*
     168             (abcl-class-file-doubles ,var)      *declared-doubles*))))
    169169
    170170(defstruct compiland
Note: See TracChangeset for help on using the changeset viewer.