Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
Fix compilation errors in 'java.lang.reflect' classes
Browse files Browse the repository at this point in the history
This patch fixes the following compilation errors:

make[2]: Entering directory `/home/penberg/src/kaffe/libraries/javalib/vmspecific'
CLASSPATH=.:./.:$CLASSPATH ecj -d . -bootclasspath /usr/local/classpath/share/classpath/glibj.zip:.:.   java/lang/reflect/Constructor.java java/lang/reflect/Field.java java/lang/reflect/Method.java
----------
1. ERROR in java/lang/reflect/Constructor.java (at line 235)
	Modifier.toString(getModifiers(), sb).append(' ');
	         ^^^^^^^^
The method toString(int, CPStringBuilder) in the type Modifier is not applicable for the arguments (int, StringBuilder)
----------
2. ERROR in java/lang/reflect/Constructor.java (at line 273)
	Modifier.toString(getModifiers(), sb).append(' ');
	         ^^^^^^^^
The method toString(int, CPStringBuilder) in the type Modifier is not applicable for the arguments (int, StringBuilder)
----------
4. ERROR in java/lang/reflect/Field.java (at line 214)
	Modifier.toString(getModifiers(), sb).append(' ');
	         ^^^^^^^^
The method toString(int, CPStringBuilder) in the type Modifier is not applicable for the arguments (int, StringBuilder)
----------
5. ERROR in java/lang/reflect/Field.java (at line 224)
	Modifier.toString(getModifiers(), sb).append(' ');
	         ^^^^^^^^
The method toString(int, CPStringBuilder) in the type Modifier is not applicable for the arguments (int, StringBuilder)
----------
----------
6. ERROR in java/lang/reflect/Method.java (at line 286)
	Modifier.toString(getModifiers(), sb).append(' ');
	         ^^^^^^^^
The method toString(int, CPStringBuilder) in the type Modifier is not applicable for the arguments (int, StringBuilder)
----------
7. ERROR in java/lang/reflect/Method.java (at line 312)
	Modifier.toString(getModifiers(), sb).append(' ');
	         ^^^^^^^^
The method toString(int, CPStringBuilder) in the type Modifier is not applicable for the arguments (int, StringBuilder)
----------
7 problems (6 errors, 1 warning)make[2]: *** [classdist_vminterface.stamp] Error 255

[ patch originally from ezequielgarcia ]
Signed-off-by: Pekka Enberg <penberg@kernel.org>
  • Loading branch information
penberg committed Jul 2, 2011
1 parent 4e8462e commit cc3c8eb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
Expand Up @@ -39,6 +39,7 @@
package java.lang.reflect;

import gnu.java.lang.ClassHelper;
import gnu.java.lang.CPStringBuilder;

import gnu.java.lang.reflect.MethodSignatureParser;

Expand Down Expand Up @@ -231,7 +232,7 @@ public int hashCode()
public String toString()
{
// 128 is a reasonable buffer initial size for constructor
StringBuilder sb = new StringBuilder(128);
CPStringBuilder sb = new CPStringBuilder(128);
Modifier.toString(getModifiers(), sb).append(' ');
sb.append(getDeclaringClass().getName()).append('(');
Class[] c = getParameterTypes();
Expand All @@ -253,7 +254,7 @@ public String toString()
}

/* FIXME[GENERICS]: Add X extends GenericDeclaration and TypeVariable<X> */
static void addTypeParameters(StringBuilder sb, TypeVariable[] typeArgs)
static void addTypeParameters(CPStringBuilder sb, TypeVariable[] typeArgs)
{
if (typeArgs.length == 0)
return;
Expand All @@ -269,7 +270,7 @@ static void addTypeParameters(StringBuilder sb, TypeVariable[] typeArgs)

public String toGenericString()
{
StringBuilder sb = new StringBuilder(128);
CPStringBuilder sb = new CPStringBuilder(128);
Modifier.toString(getModifiers(), sb).append(' ');
addTypeParameters(sb, getTypeParameters());
sb.append(getDeclaringClass().getName()).append('(');
Expand Down
5 changes: 3 additions & 2 deletions libraries/javalib/vmspecific/java/lang/reflect/Field.java
Expand Up @@ -39,6 +39,7 @@
package java.lang.reflect;

import gnu.java.lang.ClassHelper;
import gnu.java.lang.CPStringBuilder;

import gnu.java.lang.reflect.FieldSignatureParser;

Expand Down Expand Up @@ -210,7 +211,7 @@ public int hashCode()
public String toString()
{
// 64 is a reasonable buffer initial size for field
StringBuilder sb = new StringBuilder(64);
CPStringBuilder sb = new CPStringBuilder(64);
Modifier.toString(getModifiers(), sb).append(' ');
sb.append(ClassHelper.getUserName(getType())).append(' ');
sb.append(getDeclaringClass().getName()).append('.');
Expand All @@ -220,7 +221,7 @@ public String toString()

public String toGenericString()
{
StringBuilder sb = new StringBuilder(64);
CPStringBuilder sb = new CPStringBuilder(64);
Modifier.toString(getModifiers(), sb).append(' ');
sb.append(getGenericType()).append(' ');
sb.append(getDeclaringClass().getName()).append('.');
Expand Down
5 changes: 3 additions & 2 deletions libraries/javalib/vmspecific/java/lang/reflect/Method.java
Expand Up @@ -39,6 +39,7 @@
package java.lang.reflect;

import gnu.java.lang.ClassHelper;
import gnu.java.lang.CPStringBuilder;

import gnu.java.lang.reflect.MethodSignatureParser;

Expand Down Expand Up @@ -282,7 +283,7 @@ public int hashCode()
public String toString()
{
// 128 is a reasonable buffer initial size for constructor
StringBuilder sb = new StringBuilder(128);
CPStringBuilder sb = new CPStringBuilder(128);
Modifier.toString(getModifiers(), sb).append(' ');
sb.append(ClassHelper.getUserName(getReturnType())).append(' ');
sb.append(getDeclaringClass().getName()).append('.');
Expand All @@ -308,7 +309,7 @@ public String toString()
public String toGenericString()
{
// 128 is a reasonable buffer initial size for constructor
StringBuilder sb = new StringBuilder(128);
CPStringBuilder sb = new CPStringBuilder(128);
Modifier.toString(getModifiers(), sb).append(' ');
Constructor.addTypeParameters(sb, getTypeParameters());
sb.append(getGenericReturnType()).append(' ');
Expand Down

0 comments on commit cc3c8eb

Please sign in to comment.