Ignore:
Timestamp:
11/25/10 13:52:51 (11 years ago)
Author:
ehuelsmann
Message:

Backport r13046; ANSI test regressions.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.23.x/abcl/src/org/armedbear/lisp/jvm-class-file.lisp

    r12932 r13047  
    8181|#
    8282
    83 (defstruct (class-name (:conc-name class-)
    84                        (:constructor %make-class-name))
     83(defstruct (jvm-class-name (:conc-name class-)
     84         (:constructor %make-jvm-class-name))
    8585  "Used for class identification.
    8686
     
    9797  )
    9898
    99 (defun make-class-name (name)
     99(defun make-jvm-class-name (name)
    100100  "Creates a `class-name' structure for the class or interface `name'.
    101101
     
    103103to 'internal' (JVM) representation by this function."
    104104  (setf name (substitute #\/ #\. name))
    105   (%make-class-name :name-internal name
    106                     :ref (concatenate 'string "L" name ";")))
     105  (%make-jvm-class-name :name-internal name
     106      :ref (concatenate 'string "L" name ";")))
    107107
    108108(defun class-array (class-name)
     
    121121    (let ((name-and-ref (concatenate 'string "[" (class-ref class-name))))
    122122      (setf (class-array-class class-name)
    123             (%make-class-name :name-internal name-and-ref
    124                               :ref name-and-ref))))
     123            (%make-jvm-class-name :name-internal name-and-ref
     124          :ref name-and-ref))))
    125125  (class-array-class class-name))
    126126
     
    128128  "Convenience macro to define constants for `class-name' structures,
    129129initialized from the `java-dotted-name'."
    130   `(defconstant ,symbol (make-class-name ,java-dotted-name)
     130  `(defconstant ,symbol (make-jvm-class-name ,java-dotted-name)
    131131     ,documentation))
    132132
     
    836836
    837837
    838 (defstruct (method (:constructor %make-method)
    839                    (:conc-name method-))
     838(defstruct (jvm-method (:constructor %make-jvm-method)
     839           (:conc-name method-))
    840840  "Holds information on the properties of methods in the class(-file)."
    841841  access-flags
     
    859859    (t name)))
    860860
    861 (defun make-method (name return args &key (flags '(:public)))
     861(defun make-jvm-method (name return args &key (flags '(:public)))
    862862  "Creates a method for addition to a class file."
    863   (%make-method :descriptor (cons return args)
    864                 :access-flags flags
    865                 :name (map-method-name name)))
     863  (%make-jvm-method :descriptor (cons return args)
     864        :access-flags flags
     865        :name (map-method-name name)))
    866866
    867867(defun method-add-attribute (method attribute)
Note: See TracChangeset for help on using the changeset viewer.