Changeset 12781


Ignore:
Timestamp:
07/04/10 07:49:14 (12 years ago)
Author:
ehuelsmann
Message:

Small fixes found by test-writing.

File:
1 edited

Legend:

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

    r12779 r12781  
    154154
    155155(defun internal-field-type (field-type)
    156   (if (keywordp field-type)
     156  (if (symbolp field-type)
    157157      (map-primitive-type field-type)
    158158      (class-name-internal field-type)))
    159159
    160160(defun internal-field-ref (field-type)
    161   (if (keywordp field-type)
     161  (if (symbolp field-type)
    162162      (map-primitive-type field-type)
    163163      (class-ref field-type)))
    164164
    165165(defun descriptor (return-type &rest argument-types)
    166   (format nil "(~{~A~}~A)" (mapcar #'internal-field-ref argument-types)
     166  (format nil "(~{~A~})~A" (mapcar #'internal-field-ref argument-types)
    167167          (internal-field-type return-type)))
    168168
     
    402402
    403403(defun class-add-attribute (class attribute)
    404   (push atttribute (class-file-attributes class)))
     404  (push attribute (class-file-attributes class)))
    405405
    406406(defun class-attribute (class name)
     
    416416  (setf (class-file-access-flags class)
    417417        (map-flags (class-file-access-flags class)))
    418   (setf (class-file-class-name class)
    419         (pool-add-class (class-name-internal (class-file-class-name class))))
     418  (setf (class-file-class class)
     419        (pool-add-class (class-name-internal (class-file-class class))))
    420420  ;;  (finalize-interfaces)
    421421  (dolist (field (class-file-fields class))
     
    583583  "Creates an (empty) 'Code' attribute for the method."
    584584  (method-add-attribute
    585    (make-code-attribute (+ (length args)
     585   (make-code-attribute (+ (length (cdr (method-descriptor method)))
    586586                           (if (member :static (method-access-flags method))
    587587                               0 1))))) ;; 1 == implicit 'this'
Note: See TracChangeset for help on using the changeset viewer.