Changeset 15604 for trunk/abcl/src

Timestamp:

11/28/22 10:28:16 (4 months ago)

Author:

Mark Evenson

Message:

Made calling superclass constructors in jnew-runtime-class work

File:

• trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp

@@ -20 +20 @@
    lists of constructor, method and field definitions.
 
-   Constructor definitions - currently NOT supported - are lists of the form
+   Constructor definitions are lists of the form
    (argument-types function &optional super-invocation-arguments)
    where argument-types is a list of strings and function is a lisp function of
@@ -103 +103 @@
           (emit 'return)))
       (dolist (constructor constructors)
-        (destructuring-bind (argument-types function
-                             &key (modifiers '(:public)))
+        (destructuring-bind (argument-types function &optional super-args)
             constructor
           (let* ((argument-types (mapcar #'java::canonicalize-java-type argument-types))
                  (argc (length argument-types))
-                 (ctor (make-jvm-method :constructor :void argument-types :flags modifiers))
+                 (ctor (make-jvm-method :constructor :void argument-types))
                  (field-name (string (gensym "CONSTRUCTOR")))
                  (all-argc (1+ argc)))
@@ -120 +119 @@
 
               (aload 0)
-              (emit-invokespecial-init (class-file-superclass class-file) nil)
+              (dolist (arg super-args)
+                (aload arg))
+              (emit-invokespecial-init
+               (class-file-superclass class-file)
+               (map 'list
+                    (lambda (index) (elt argument-types (1- index)))
+                    super-args))
+                                            
 
               (aload 0)