Add Interface Test

[cacao.git] / nat / Constructor.c

diff --git a/nat/Constructor.c b/nat/Constructor.c
index 63519c948ca28ba754db78f76a1a6b9b4591a916..1290fe98d3d2ee9e4b7bc2a7d2abf2642ec62715 100644 (file)
--- a/nat/Constructor.c
+++ b/nat/Constructor.c
@@ -28,7 +28,7 @@
 
    Changes: Joseph Wenninger
 
-   $Id: Constructor.c 873 2004-01-11 20:59:29Z twisti $
+   $Id: Constructor.c 1537 2004-11-18 12:12:05Z twisti $
 
 */
 
@@ -36,14 +36,16 @@
 #include <string.h>
 #include "jni.h"
 #include "builtin.h"
+#include "exceptions.h"
 #include "loader.h"
 #include "native.h"
 #include "tables.h"
 #include "asmpart.h"
-#include "toolbox/loging.h"
-#include "java_lang_Object.h"
-#include "java_lang_Class.h"
-#include "java_lang_reflect_Constructor.h"
+#include "options.h"
+#include "toolbox/logging.h"
+#include "nat/java_lang_Object.h"
+#include "nat/java_lang_Class.h"
+#include "nat/java_lang_reflect_Constructor.h"
 
 
 /*
@@ -54,27 +56,28 @@
 JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_Constructor_constructNative(JNIEnv *env, java_lang_reflect_Constructor *this, java_objectarray *parameters, java_lang_Class *clazz, s4 par3)
 {
 
+#if defined(__GNUC__)
 #warning fix me for parameters float/double and long long  parameters
+#endif
 
        methodinfo *m;
        java_objectheader *o;
 
-        
-       /*      log_text("Java_java_lang_reflect_Constructor_constructNative called");
-        log_plain_utf(((struct classinfo*)clazz)->name);*/
-/*     log_plain("\n"); */
-
        /* find initializer */
 
        if (!parameters) {
                if (this->parameterTypes->header.size != 0) {
-                       (*env)->ThrowNew(env, loader_load(utf_new_char("java/lang/IllegalArgumentException")), "wrong number of arguments");
+                       *exceptionptr =
+                               new_exception_message(string_java_lang_IllegalArgumentException,
+                                                                         "wrong number of arguments");
                        return 0;
                }
 
        } else {
                if (this->parameterTypes->header.size != parameters->header.size) {
-                       (*env)->ThrowNew(env, loader_load(utf_new_char("java/lang/IllegalArgumentException")), "wrong number of arguments");
+                       *exceptionptr =
+                               new_exception_message(string_java_lang_IllegalArgumentException,
+                                                                         "wrong number of arguments");
                        return 0;
                }
        }
@@ -98,7 +101,7 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_Constructor_construct
                /* && 
                   (m->descriptor == create_methodsig(this->parameterTypes,"V"))))*/
                {
-                       if (verbose) {
+                       if (opt_verbose) {
                                char logtext[MAXLOGTEXT];
                                sprintf(logtext, "Warning: class has no instance-initializer of specified type: ");
                                utf_sprint(logtext + strlen(logtext), ((classinfo *) clazz)->name);
@@ -107,7 +110,9 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_Constructor_construct
                                log_plain("\n");
                                class_showconstantpool((classinfo *) clazz);
                        }
+#if defined(__GNUC__)
 #warning throw an exception here, although this should never happen
+#endif
                        return (java_lang_Object *) o;
                }
 
@@ -128,8 +133,7 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_Constructor_construct
                log_text("Not supported number of arguments in Java_java_lang_reflect_Constructor");
        }
 #endif
-       /*log_plain_utf(m->descriptor);
-         log_text("calling constructor");*/
+
        (void) jni_method_invokeNativeHelper(env, m ,o, parameters); 
 
        return (java_lang_Object *) o;
@@ -143,11 +147,10 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_reflect_Constructor_construct
  */
 JNIEXPORT s4 JNICALL Java_java_lang_reflect_Constructor_getModifiers(JNIEnv *env, java_lang_reflect_Constructor *this)
 {
-       /*      log_text("Java_java_lang_reflect_Constructor_getModifiers called");*/
        classinfo *c = (classinfo *) (this->clazz);
 
        if ((this->slot < 0) || (this->slot >= c->methodscount))
-               panic("error illegal slot for method in class (getReturnType)");
+               panic("error illegal slot for constructor in class (getModifiers)");
 
        return (c->methods[this->slot]).flags & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED);
 }