* class_resolvefield: Renamed except to throwexception since some compilers

  have a builtin except macro (like DEC OSF cc).
* class_resolveclassmethod: Likewise.
* class_resolveinterfacemethod: Likewise.

diff --git a/src/vm/class.c b/src/vm/class.c
index b4282b7d0d48a90e5942b4bede3f9c1be300346a..9b8481488c03c30dffd962098a2bebb7827ec3af 100644 (file)
--- a/src/vm/class.c
+++ b/src/vm/class.c
@@ -30,7 +30,7 @@
             Andreas Krall
             Christian Thalinger
 
-   $Id: class.c 3999 2005-12-22 14:04:47Z twisti $
+   $Id: class.c 4023 2006-01-01 16:34:53Z twisti $
 
 */
 
@@ -892,7 +892,7 @@ static methodinfo *class_resolveinterfacemethod_intern(classinfo *c,
 *******************************************************************************/
 
 methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *desc,
-                                                                        classinfo *referer, bool except)
+                                                                        classinfo *referer, bool throwexception)
 {
        classinfo  *cls;
        methodinfo *m;
@@ -902,7 +902,7 @@ methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *desc,
        /* XXX check access from REFERER to C */
        
 /*     if (c->flags & ACC_INTERFACE) { */
-/*             if (except) */
+/*             if (throwexception) */
 /*                     *exceptionptr = */
 /*                             new_exception(string_java_lang_IncompatibleClassChangeError); */
 /*             return NULL; */
@@ -927,14 +927,14 @@ methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *desc,
                        goto found;
        }
        
-       if (except)
+       if (throwexception)
                *exceptionptr = exceptions_new_nosuchmethoderror(c, name, desc);
 
        return NULL;
 
  found:
        if ((m->flags & ACC_ABSTRACT) && !(c->flags & ACC_ABSTRACT)) {
-               if (except)
+               if (throwexception)
                        *exceptionptr = new_exception(string_java_lang_AbstractMethodError);
 
                return NULL;
@@ -957,7 +957,7 @@ methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *desc,
 *******************************************************************************/
 
 methodinfo *class_resolveinterfacemethod(classinfo *c, utf *name, utf *desc,
-                                                                                classinfo *referer, bool except)
+                                                                                classinfo *referer, bool throwexception)
 {
        methodinfo *mi;
 
@@ -965,7 +965,7 @@ methodinfo *class_resolveinterfacemethod(classinfo *c, utf *name, utf *desc,
        /* XXX check access from REFERER to C */
        
        if (!(c->flags & ACC_INTERFACE)) {
-               if (except)
+               if (throwexception)
                        *exceptionptr =
                                new_exception(string_java_lang_IncompatibleClassChangeError);
 
@@ -984,7 +984,7 @@ methodinfo *class_resolveinterfacemethod(classinfo *c, utf *name, utf *desc,
        if (mi)
                return mi;
 
-       if (except)
+       if (throwexception)
                *exceptionptr =
                        exceptions_new_nosuchmethoderror(c, name, desc);
 
@@ -1110,7 +1110,7 @@ static fieldinfo *class_resolvefield_int(classinfo *c, utf *name, utf *desc)
 *******************************************************************************/
 
 fieldinfo *class_resolvefield(classinfo *c, utf *name, utf *desc,
-                                                         classinfo *referer, bool except)
+                                                         classinfo *referer, bool throwexception)
 {
        fieldinfo *fi;
 
@@ -1120,7 +1120,7 @@ fieldinfo *class_resolvefield(classinfo *c, utf *name, utf *desc,
        fi = class_resolvefield_int(c, name, desc);
 
        if (!fi) {
-               if (except)
+               if (throwexception)
                        *exceptionptr =
                                new_exception_utfmessage(string_java_lang_NoSuchFieldError,
                                                                                 name);

diff --git a/src/vm/class.h b/src/vm/class.h
index 804c6c854760ff06352632ee2e50db3bee6f4322..660d6b98018438b04c85dcb0db9016d65c9c0289 100644 (file)
--- a/src/vm/class.h
+++ b/src/vm/class.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: class.h 3889 2005-12-05 22:09:59Z twisti $
+   $Id: class.h 4023 2006-01-01 16:34:53Z twisti $
 
 */
 
@@ -291,13 +291,13 @@ fieldinfo *class_findfield_by_name(classinfo *c, utf *name);
 s4 class_findfield_index_by_name(classinfo *c, utf *name);
 
 /* search class for a field */
-fieldinfo *class_resolvefield(classinfo *c, utf *name, utf *desc, classinfo *referer, bool except);
+fieldinfo *class_resolvefield(classinfo *c, utf *name, utf *desc, classinfo *referer, bool throwexception);
 
 /* search for a method with a specified name and descriptor */
 methodinfo *class_findmethod(classinfo *c, utf *name, utf *desc);
 methodinfo *class_resolvemethod(classinfo *c, utf *name, utf *dest);
-methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *dest, classinfo *referer, bool except);
-methodinfo *class_resolveinterfacemethod(classinfo *c, utf *name, utf *dest, classinfo *referer, bool except);
+methodinfo *class_resolveclassmethod(classinfo *c, utf *name, utf *dest, classinfo *referer, bool throwexception);
+methodinfo *class_resolveinterfacemethod(classinfo *c, utf *name, utf *dest, classinfo *referer, bool throwexception);
 
 /* search for a method with specified name and arguments (returntype ignored) */
 methodinfo *class_findmethod_approx(classinfo *c, utf *name, utf *desc);