Changeset 12764


Ignore:
Timestamp:
06/21/10 21:58:29 (12 years ago)
Author:
ehuelsmann
Message:

Work-in-progress commit: saving current state;
no real functional changes.

Location:
branches/generic-class-file/abcl/src/org/armedbear/lisp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-system.lisp

    r12624 r12764  
    9898      (load (do-compile "compiler-pass1.lisp"))
    9999      (load (do-compile "compiler-pass2.lisp"))
     100      (load (do-compile "jvm-class-file.lisp"))
    100101      (load (do-compile "jvm.lisp"))
    101102      (load (do-compile "source-transform.lisp"))
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12749 r12764  
    17521752  descriptor-index)
    17531753
    1754 (defstruct (java-method (:conc-name method-) (:constructor %make-method))
    1755   access-flags
    1756   name
    1757   descriptor
     1754(defstruct (java-method (:include method)
     1755                        (:conc-name method-)
     1756                        (:constructor %make-method))
    17581757  name-index
    17591758  descriptor-index
     
    49064905  `(let* ((,pathname (make-temp-file))
    49074906    (,class-file (make-class-file :pathname ,pathname
    4908                :lambda-list ,lambda-list)))
     4907                                             :lambda-list ,lambda-list)))
    49094908     (unwind-protect
    49104909    (progn ,@body)
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp

    r12690 r12764  
    4646  (require "DUMP-FORM")
    4747  (require "OPCODES")
     48  (require "JVM-CLASS-FILE")
    4849  (require "JAVA")
    4950  (require "COMPILER-PASS1")
     
    8687(defvar *declared-functions* nil)
    8788
    88 (defstruct (abcl-class-file (:constructor %make-abcl-class-file))
     89(defstruct (abcl-class-file (:include class-file)
     90                            (:constructor %make-abcl-class-file))
    8991  pathname ; pathname of output file
    9092  lambda-name
    91   class
    92   superclass
    9393  lambda-list ; as advertised
    9494  pool
    9595  (pool-count 1)
    9696  (pool-entries (make-hash-table :test #'equal))
    97   fields
    98   methods
    9997  static-code
    10098  objects ;; an alist of externalized objects and their field names
Note: See TracChangeset for help on using the changeset viewer.