[multiple changes]

2000-01-04  Tom Tromey  <tromey@cygnus.com>

	* java/lang/reflect/natConstructor.cc (newInstance): Pass
	declaring class as return_type argument to
	_Jv_CallNonvirtualMethodA.
	* java/lang/reflect/natMethod.cc (_Jv_CallNonvirtualMethodA): In
	constructor case, create object and use it as `this' argument.
	* java/lang/Class.h (_getConstructors): Declare.
	(_getFields): Declare.
	* java/lang/Class.java (getConstructors): Wrote.
	(_getConstructors): New native method.
	(getDeclaredConstructors): Wrote.
	(_getFields): Declare new native method.
	* java/lang/natClass.cc (_Jv_LookupInterfaceMethod): Removed
	incorrect comment.
	(getMethod): Work correctly when class is primitive.
	(getDeclaredMethods): Likewise.  Compute offset using `method',
	not `mptr'.
	(getDeclaredMethod): Likewise.
	(getConstructor): Wrote.
	(ConstructorClass): New define.
	(getDeclaredConstructor): Wrote.
	(_getConstructors): New method.
	(_getFields): New method.
	(getFields): Wrote.

	* Makefile.in: Rebuilt.
	* Makefile.am (AM_CXXFLAGS): Added -D_GNU_SOURCE.

	* prims.cc: Remove `#pragma implementation'.
	* gcj/array.h: Remove `#pragma interface'.

	* prims.cc (_Jv_equaln): New function.
	* java/lang/Class.java (getSignature): Declare.
	* resolve.cc (_Jv_LookupDeclaredMethod): Moved to natClass.cc.
	* java/lang/natClass.cc (_Jv_LookupDeclaredMethod): Moved from
	resolve.cc.
	(getSignature): New method.
	(getDeclaredMethod): Wrote.
	(getMethod): Wrote.
	Include StringBuffer.h.
	* java/lang/Class.h (Class): Added _Jv_FromReflectedConstructor
	as a friend.  Unconditionally declare _Jv_LookupDeclaredMethod as
	a friend.
	(getSignature): Declare.
	* include/jvm.h (_Jv_GetTypesFromSignature): Declare.
	(_Jv_equaln): Declare.
	(_Jv_CallNonvirtualMethodA): Declare.
	* Makefile.in: Rebuilt.
	* Makefile.am (nat_source_files): Added natConstructor.cc.
	(java/lang/reflect/Constructor.h): New target.
	* java/lang/reflect/natConstructor.cc: New file.
	* java/lang/reflect/Constructor.java (newInstance): Now native.
	(declaringClass): Renamed from decl_class.
	(offset): Renamed from index.
	(getType): New native method.
	(getModifiers): Now native.
	(getParameterTypes): Call getType if required.
	(hashCode): Include hash code from declaring class.
	(modifiers): Removed.
	(toString): Call getType if required.
	* gcj/method.h (_Jv_FromReflectedConstructor): New function.
	* java/lang/reflect/natMethod.cc (hack_call): New method.
	Removed `#if 0' around FFI code.
	Include <gnu/gcj/RawData.h>.
	(invoke): Use _Jv_CallNonvirtualMethodA.  Throw
	IllegalArgumentException when argument object and class disagree.
	(_Jv_GetTypesFromSignature): New function.
	(getType): Use it.
	(ObjectClass): New define.
	(_Jv_CallNonvirtualMethodA): New function.
	* java/lang/reflect/Method.java (hack_trampoline): New method.
	(hack_call): New native method.

1999-12-21  Per Bothner  <per@bothner.com>

	* java/lang/natClass.cc (getDeclaredMethods): Correctly compute
	offset in new Method.

From-SVN: r31199

libjava/java/lang/reflect/Constructor.java

@@ -28,12 +28,12 @@ public final class Constructor extends AccessibleObject implements Member
       if (! (obj instanceof Constructor))
 	return false;
       Constructor c = (Constructor) obj;
-      return decl_class == c.decl_class && index == c.index;
+      return declaringClass == c.declaringClass && offset == c.offset;
     }
 
   public Class getDeclaringClass ()
     {
-      return decl_class;
+      return declaringClass;
     }
 
   public Class[] getExceptionTypes ()
@@ -41,40 +41,39 @@ public final class Constructor extends AccessibleObject implements Member
       return (Class[]) exception_types.clone();
     }
 
-  public int getModifiers ()
-    {
-      return modifiers;
-    }
+  public native int getModifiers ();
 
   public String getName ()
-    {
-      return decl_class.getName();
-    }
+  {
+    return declaringClass.getName();
+  }
 
   public Class[] getParameterTypes ()
     {
+      if (parameter_types == null)
+	getType ();
       return (Class[]) parameter_types.clone();
     }
 
   public int hashCode ()
     {
       // FIXME.
-      return getName().hashCode();
+      return getName().hashCode() + declaringClass.getName().hashCode();
     }
 
-  // FIXME: this must be native.  Should share implementation with
-  // Method.invoke.
-  public Object newInstance (Object[] args)
+  // Update cached values from method descriptor in class.
+  private native void getType ();
+
+  public native Object newInstance (Object[] args)
     throws InstantiationException, IllegalAccessException,
-           IllegalArgumentException, InvocationTargetException
-    {
-      return null;
-    }
+           IllegalArgumentException, InvocationTargetException;
 
   public String toString ()
     {
+      if (parameter_types == null)
+	getType ();
       StringBuffer b = new StringBuffer ();
-      b.append(Modifier.toString(modifiers));
+      b.append(Modifier.toString(getModifiers()));
       b.append(" ");
       b.append(getName());
       b.append("(");
@@ -88,19 +87,19 @@ public final class Constructor extends AccessibleObject implements Member
       return b.toString();
     }
 
-  // Can't create these.  FIXME.
+  // Can't create these.
   private Constructor ()
     {
     }
 
   // Declaring class.
-  private Class decl_class;
+  private Class declaringClass;
+
   // Exception types.
   private Class[] exception_types;
-  // Modifiers.
-  private int modifiers;
   // Parameter types.
   private Class[] parameter_types;
-  // Index of this method in declaring class' method table.
-  private int index;
+
+  // Offset in bytes from the start of declaringClass's methods array.
+  private int offset;
 }