diff options
Diffstat (limited to 'gcc/java/jcf-parse.c')
| -rw-r--r-- | gcc/java/jcf-parse.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index c53e871c..8757c5b 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1160,8 +1160,8 @@ handle_innerclass_attribute (int count, JCF *jcf, int attribute_length) /* If icii is 0, don't try to read the class. */ if (icii >= 0) { - tree class = get_class_constant (jcf, icii); - tree decl = TYPE_NAME (class); + tree klass = get_class_constant (jcf, icii); + tree decl = TYPE_NAME (klass); /* Skip reading further if ocii is null */ if (DECL_P (decl) && !CLASS_COMPLETE_P (decl) && ocii) { @@ -1253,7 +1253,7 @@ int read_class (tree name) { JCF this_jcf, *jcf; - tree icv, class = NULL_TREE; + tree icv, klass = NULL_TREE; tree save_current_class = current_class; tree save_output_class = output_class; location_t save_location = input_location; @@ -1261,8 +1261,8 @@ read_class (tree name) if ((icv = IDENTIFIER_CLASS_VALUE (name)) != NULL_TREE) { - class = TREE_TYPE (icv); - jcf = TYPE_JCF (class); + klass = TREE_TYPE (icv); + jcf = TYPE_JCF (klass); } else jcf = NULL; @@ -1284,21 +1284,21 @@ read_class (tree name) current_jcf = jcf; - if (class == NULL_TREE || ! CLASS_PARSED_P (class)) + if (klass == NULL_TREE || ! CLASS_PARSED_P (klass)) { - output_class = current_class = class; + output_class = current_class = klass; if (JCF_SEEN_IN_ZIP (current_jcf)) read_zip_member(current_jcf, current_jcf->zipd, current_jcf->zipd->zipf); jcf_parse (current_jcf); /* Parsing might change the class, in which case we have to put it back where we found it. */ - if (current_class != class && icv != NULL_TREE) + if (current_class != klass && icv != NULL_TREE) TREE_TYPE (icv) = current_class; - class = current_class; + klass = current_class; } - layout_class (class); - load_inner_classes (class); + layout_class (klass); + load_inner_classes (klass); output_class = save_output_class; current_class = save_current_class; @@ -2025,7 +2025,7 @@ parse_zip_file_entries (void) for (i = 0, zdir = (ZipDirectory *)localToFile->central_directory; i < localToFile->count; i++, zdir = ZIPDIR_NEXT (zdir)) { - tree class; + tree klass; switch (classify_zip_file (zdir)) { @@ -2036,14 +2036,14 @@ parse_zip_file_entries (void) { char *class_name = compute_class_name (zdir); int previous_alias_set = -1; - class = lookup_class (get_identifier (class_name)); + klass = lookup_class (get_identifier (class_name)); FREE (class_name); - current_jcf = TYPE_JCF (class); - output_class = current_class = class; + current_jcf = TYPE_JCF (klass); + output_class = current_class = klass; /* This is a dummy class, and now we're compiling it for real. */ - gcc_assert (! TYPE_DUMMY (class)); + gcc_assert (! TYPE_DUMMY (klass)); /* This is for a corner case where we have a superclass but no superclass fields. @@ -2058,17 +2058,17 @@ parse_zip_file_entries (void) FIXME: this really is a kludge. We should figure out a way to lay out the class properly before this happens. */ - if (TYPE_SIZE (class) && CLASSTYPE_SUPER (class) - && integer_zerop (TYPE_SIZE (class))) + if (TYPE_SIZE (klass) && CLASSTYPE_SUPER (klass) + && integer_zerop (TYPE_SIZE (klass))) { - TYPE_SIZE (class) = NULL_TREE; - previous_alias_set = TYPE_ALIAS_SET (class); - TYPE_ALIAS_SET (class) = -1; + TYPE_SIZE (klass) = NULL_TREE; + previous_alias_set = TYPE_ALIAS_SET (klass); + TYPE_ALIAS_SET (klass) = -1; } - if (! CLASS_LOADED_P (class)) + if (! CLASS_LOADED_P (klass)) { - if (! CLASS_PARSED_P (class)) + if (! CLASS_PARSED_P (klass)) { read_zip_member (current_jcf, zdir, localToFile); jcf_parse (current_jcf); @@ -2078,7 +2078,7 @@ parse_zip_file_entries (void) } if (previous_alias_set != -1) - TYPE_ALIAS_SET (class) = previous_alias_set; + TYPE_ALIAS_SET (klass) = previous_alias_set; if (TYPE_SIZE (current_class) != error_mark_node) { @@ -2146,7 +2146,7 @@ process_zip_dir (FILE *finput) i < localToFile->count; i++, zdir = ZIPDIR_NEXT (zdir)) { char *class_name, *file_name, *class_name_in_zip_dir; - tree class; + tree klass; JCF *jcf; class_name_in_zip_dir = ZIPDIR_FILENAME (zdir); @@ -2163,9 +2163,9 @@ process_zip_dir (FILE *finput) strncpy (file_name, class_name_in_zip_dir, zdir->filename_length); file_name [zdir->filename_length] = '\0'; - class = lookup_class (get_identifier (class_name)); + klass = lookup_class (get_identifier (class_name)); - if (CLASS_FROM_CURRENTLY_COMPILED_P (class)) + if (CLASS_FROM_CURRENTLY_COMPILED_P (klass)) { /* We've already compiled this class. */ duplicate_class_warning (file_name); @@ -2173,7 +2173,7 @@ process_zip_dir (FILE *finput) } /* This function is only called when processing a zip file seen on the command line. */ - CLASS_FROM_CURRENTLY_COMPILED_P (class) = 1; + CLASS_FROM_CURRENTLY_COMPILED_P (klass) = 1; jcf->read_state = finput; jcf->filbuf = jcf_filbuf_from_stdio; @@ -2181,7 +2181,7 @@ process_zip_dir (FILE *finput) jcf->filename = file_name; jcf->zipd = zdir; - TYPE_JCF (class) = jcf; + TYPE_JCF (klass) = jcf; } } |