Skip to content

R
riscv-gcc-1
Commit 49f48c71 by Kaveh R. Ghazi Committed by Kaveh Ghazi
Options

Warning fixes: 

        * Makefile.in (lang.o): Depend on $(RTL_H) $(EXPR_H).

        * expr.c (java_stack_pop, java_array_data_offset,
        build_java_throw_out_of_bounds_exception, case_identity,
        build_java_check_indexed_type): Add static prototypes.
        (linenumber_table, expand_invoke, expand_java_field_op,
        build_primtype_type_ref, expand_byte_code): Constify a char*.

        * java-tree.h (build_primtype_type_ref, linenumber_table):
        Constify a char*.
        (java_lang_expand_expr): Add prototype.

        * lang.c: Include rtl.h and expr.h.  Remove extern prototype for
        `java_lang_expand_expr'.

        * lex.c (java_lex_error): Constify a char*.
        (java_get_unicode, java_read_char, java_allocate_new_line,
        java_unget_unicode, java_sneak_unicode): Prototype.

        * parse-scan.y (current_class, package_name, method_declarator,
        report_class_declaration, yyerror): Constify a char*.

        * parse.h (java_report_errors): Prototype.
        (yyerror): Constify a char*.

        * parse.y (classitf_redefinition_error, check_modifiers,
        parse_jdk1_1_error, lookup_package_type,
        lookup_package_type_and_set_next, get_printable_method_name,
        purify_type_name): Constify a char*.
        (build_super_invocation, maybe_generate_finit,
        verify_constructor_super, parser_add_interface,
        add_superinterfaces, jdep_resolve_class, note_possible_classname,
        java_complete_expand_methods, java_expand_finals,
        cut_identifier_in_qualified, java_stabilize_reference,
        do_unary_numeric_promotion, operator_string, do_merge_string_cste,
        merge_string_cste): Prototype.
        (single_type_import_declaration, yyerror,
        variable_redefinition_error, build_array_from_name,
        build_unresolved_array_type, check_class_interface_creation,
        resolve_class, complete_class_report_errors,
        note_possible_classname, read_import_dir,
        find_in_imports_on_demand, resolve_package, fix_constructors,
        check_deprecation, lookup_method_invoke,
        maybe_build_primttype_type_ref, array_constructor_check_entry):
        Constify a char*.
        (java_complete_expand_methods, java_expand_finals): Make static.
        (convert_narrow): Remove static prototype.

From-SVN: r28498
parent cc3dea85
Showing with 814 additions and 798 deletions
gcc/java/ChangeLog
1999-08-04 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Makefile.in (lang.o): Depend on $(RTL_H) $(EXPR_H).
* expr.c (java_stack_pop, java_array_data_offset,
build_java_throw_out_of_bounds_exception, case_identity,
build_java_check_indexed_type): Add static prototypes.
(linenumber_table, expand_invoke, expand_java_field_op,
build_primtype_type_ref, expand_byte_code): Constify a char*.
* java-tree.h (build_primtype_type_ref, linenumber_table):
Constify a char*.
(java_lang_expand_expr): Add prototype.
* lang.c: Include rtl.h and expr.h. Remove extern prototype for
`java_lang_expand_expr'.
* lex.c (java_lex_error): Constify a char*.
(java_get_unicode, java_read_char, java_allocate_new_line,
java_unget_unicode, java_sneak_unicode): Prototype.
* parse-scan.y (current_class, package_name, method_declarator,
report_class_declaration, yyerror): Constify a char*.
* parse.h (java_report_errors): Prototype.
(yyerror): Constify a char*.
* parse.y (classitf_redefinition_error, check_modifiers,
parse_jdk1_1_error, lookup_package_type,
lookup_package_type_and_set_next, get_printable_method_name,
purify_type_name): Constify a char*.
(build_super_invocation, maybe_generate_finit,
verify_constructor_super, parser_add_interface,
add_superinterfaces, jdep_resolve_class, note_possible_classname,
java_complete_expand_methods, java_expand_finals,
cut_identifier_in_qualified, java_stabilize_reference,
do_unary_numeric_promotion, operator_string, do_merge_string_cste,
merge_string_cste): Prototype.
(single_type_import_declaration, yyerror,
variable_redefinition_error, build_array_from_name,
build_unresolved_array_type, check_class_interface_creation,
resolve_class, complete_class_report_errors,
note_possible_classname, read_import_dir,
find_in_imports_on_demand, resolve_package, fix_constructors,
check_deprecation, lookup_method_invoke,
maybe_build_primttype_type_ref, array_constructor_check_entry):
Constify a char*.
(java_complete_expand_methods, java_expand_finals): Make static.
(convert_narrow): Remove static prototype.
Tue Aug 3 20:21:20 1999 J"orn Rennecke <amylaar@cygnus.co.uk>
* Makefile.in (decl.o): Depends on $(srcdir)/../defaults.h.
......
gcc/java/Makefile.in
......@@ -310,7 +310,7 @@ jcf-write.o : jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(RTL_H) \
jv-scan.o : jv-scan.c $(CONFIG_H) $(srcdir)/../system.h
jvgenmain.o : jvgenmain.c $(CONFIG_H) $(srcdir)/../system.h
lang.o : lang.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../input.h \
$(srcdir)/../toplev.h $(srcdir)/../system.h
$(srcdir)/../toplev.h $(srcdir)/../system.h $(RTL_H) $(EXPR_H)
mangle.o : mangle.c $(CONFIG_H) jcf.h $(JAVA_TREE_H) $(srcdir)/../system.h \
$(srcdir)/../toplev.h
parse-scan.o : $(CONFIG_H) $(srcdir)/../system.h $(srcdir)/../toplev.h
......
gcc/java/expr.c
......@@ -74,6 +74,11 @@ static tree pop_arguments PROTO ((tree));
static void expand_invoke PROTO ((int, int, int));
static void expand_java_field_op PROTO ((int, int, int));
static void java_push_constant_from_pool PROTO ((struct JCF *, int));
static void java_stack_pop PROTO ((int));
static tree build_java_throw_out_of_bounds_exception PROTO ((tree));
static tree build_java_check_indexed_type PROTO ((tree, tree));
static tree java_array_data_offset PROTO ((tree));
static tree case_identity PROTO ((tree, tree));
static tree operand_type[59];
extern struct obstack permanent_obstack;
......@@ -125,7 +130,7 @@ tree tree_list_free_list = NULL_TREE;
int stack_pointer;
unsigned char *linenumber_table;
const unsigned char *linenumber_table;
int linenumber_count;
tree
......@@ -1630,7 +1635,7 @@ expand_invoke (opcode, method_ref_index, nargs)
tree method_name = COMPONENT_REF_NAME (&current_jcf->cpool, method_ref_index);
tree self_type = get_class_constant
(current_jcf, COMPONENT_REF_CLASS_INDEX(&current_jcf->cpool, method_ref_index));
char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
const char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
tree call, func, method, arg_list, method_type;
if (! CLASS_LOADED_P (self_type))
......@@ -1738,7 +1743,7 @@ expand_java_field_op (is_static, is_putting, field_ref_index)
get_class_constant (current_jcf,
COMPONENT_REF_CLASS_INDEX (&current_jcf->cpool,
field_ref_index));
char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
const char *self_name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (self_type)));
tree field_name = COMPONENT_REF_NAME (&current_jcf->cpool, field_ref_index);
tree field_signature = COMPONENT_REF_SIGNATURE (&current_jcf->cpool,
field_ref_index);
......@@ -1820,9 +1825,9 @@ expand_java_field_op (is_static, is_putting, field_ref_index)
tree
build_primtype_type_ref (self_name)
char *self_name;
const char *self_name;
{
char *class_name = self_name+10;
const char *class_name = self_name+10;
tree typ;
if (strncmp(class_name, "Byte", 4) == 0)
typ = byte_type_node;
......@@ -2043,7 +2048,7 @@ expand_byte_code (jcf, method)
int PC;
int i;
int saw_index;
unsigned char *linenumber_pointer;
const unsigned char *linenumber_pointer;
int dead_code_index = -1;
#undef RET /* Defined by config/i386/i386.h */
......
gcc/java/java-tree.h
......@@ -584,7 +584,7 @@ extern void write_classfile PROTO ((tree));
extern char *print_int_node PROTO ((tree));
extern void parse_error_context PVPROTO ((tree cl, const char *, ...))
ATTRIBUTE_PRINTF_2;
extern tree build_primtype_type_ref PROTO ((char *));
extern tree build_primtype_type_ref PROTO ((const char *));
extern tree java_get_real_method_name PROTO ((tree));
extern void finish_class PROTO ((tree));
extern void java_layout_seen_class_methods PROTO ((void));
......@@ -647,6 +647,13 @@ extern char* open_class PROTO ((char *, struct JCF *, int, const char *));
# endif /* JCF_USE_STDIO */
#endif
/* We use ARGS_SIZE_RTX to indicate that gcc/expr.h has been included
to declare `enum expand_modifier'. */
#if defined (TREE_CODE) && defined(RTX_CODE) && defined (HAVE_MACHINE_MODES) && defined (ARGS_SIZE_RTX)
struct rtx_def * java_lang_expand_expr PROTO ((tree, rtx, enum machine_mode,
enum expand_modifier));
#endif /* TREE_CODE && RTX_CODE && HAVE_MACHINE_MODES && ARGS_SIZE_RTX */
/* Access flags etc for a method (a FUNCTION_DECL): */
#define METHOD_PUBLIC(DECL) DECL_LANG_FLAG_1 (DECL)
......@@ -731,7 +738,7 @@ extern char *instruction_bits;
#define BCODE_VERIFIED 8
/* A pointer to the line number table of the current method. */
extern unsigned char *linenumber_table;
extern const unsigned char *linenumber_table;
/* The length (in items) of the line number table. */
extern int linenumber_count;
......
gcc/java/lang.c
......@@ -28,6 +28,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "tree.h"
#include "input.h"
#include "rtl.h"
#include "expr.h"
#include "java-tree.h"
#include "jcf.h"
#include "toplev.h"
......@@ -485,7 +487,6 @@ lang_print_error (file)
void
lang_init ()
{
extern struct rtx_def * java_lang_expand_expr ();
extern struct rtx_def * (*lang_expand_expr) ();
extern void (*print_error_function) PROTO((char *));
#if 0
......
gcc/java/lex.c
......@@ -44,7 +44,7 @@ extern struct obstack *expression_obstack;
static int java_lineterminator PROTO ((unicode_t));
static char *java_sprint_unicode PROTO ((struct java_line *, int));
static void java_unicode_2_utf8 PROTO ((unicode_t));
static void java_lex_error PROTO ((char *, int));
static void java_lex_error PROTO ((const char *, int));
#ifndef JC1_LITE
static int java_is_eol PROTO ((FILE *, int));
static tree build_wfl_node PROTO ((tree));
......@@ -54,13 +54,13 @@ static unicode_t java_parse_escape_sequence PROTO ((void));
static int java_letter_or_digit_p PROTO ((unicode_t));
static int java_parse_doc_section PROTO ((unicode_t));
static void java_parse_end_comment PROTO ((unicode_t));
static unicode_t java_get_unicode PROTO (());
static unicode_t java_get_unicode PROTO ((void));
static unicode_t java_read_unicode PROTO ((int, int *));
static void java_store_unicode PROTO ((struct java_line *, unicode_t, int));
static unicode_t java_read_char PROTO (());
static void java_allocate_new_line PROTO (());
static void java_unget_unicode PROTO (());
static unicode_t java_sneak_unicode PROTO (());
static unicode_t java_read_char PROTO ((void));
static void java_allocate_new_line PROTO ((void));
static void java_unget_unicode PROTO ((void));
static unicode_t java_sneak_unicode PROTO ((void));
void
java_init_lex ()
......@@ -1295,7 +1295,7 @@ build_wfl_node (node)
static void
java_lex_error (msg, forward)
char *msg ATTRIBUTE_UNUSED;
const char *msg ATTRIBUTE_UNUSED;
int forward ATTRIBUTE_UNUSED;
{
#ifndef JC1_LITE
......
gcc/java/parse-scan.c
......@@ -143,8 +143,8 @@ static int absorber;
#define USE_ABSORBER absorber = 0
/* Keep track of the current class name and package name. */
static char *current_class;
static char *package_name;
static const char *current_class;
static const char *package_name;
/* Keep track of whether things have be listed before. */
static int previous_output;
......@@ -158,8 +158,8 @@ static int bracket_count;
/* Record a method declaration */
struct method_declarator {
char *method_name;
char *args;
const char *method_name;
const char *args;
};
#define NEW_METHOD_DECLARATOR(D,N,A) \
{ \
......@@ -170,7 +170,7 @@ struct method_declarator {
}
/* Two actions for this grammar */
static void report_class_declaration PROTO ((char *));
static void report_class_declaration PROTO ((const char *));
static void report_main_declaration PROTO ((struct method_declarator *));
#include "lex.h"
......@@ -1375,7 +1375,7 @@ static const short yycheck[] = { 3,
#define YYPURE 1
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/x1/java/posix/share/bison.simple"
#line 3 "/usr/local/gnu/share/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
......@@ -1568,7 +1568,7 @@ __yy_memcpy (char *to, char *from, int count)
#endif
#endif
#line 196 "/x1/java/posix/share/bison.simple"
#line 196 "/usr/local/gnu/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
......@@ -2156,7 +2156,7 @@ case 337:
break;}
}
/* the action file gets copied in in place of this dollarsign */
#line 498 "/x1/java/posix/share/bison.simple"
#line 498 "/usr/local/gnu/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
......@@ -2374,7 +2374,7 @@ java_push_parser_context ()
static void
report_class_declaration (name)
char * name;
const char * name;
{
extern int flag_dump_class, flag_list_filename;
......@@ -2432,7 +2432,7 @@ void reset_report ()
void
yyerror (msg)
char *msg ATTRIBUTE_UNUSED;
const char *msg ATTRIBUTE_UNUSED;
{
}
......
gcc/java/parse-scan.y
......@@ -63,8 +63,8 @@ static int absorber;
#define USE_ABSORBER absorber = 0
/* Keep track of the current class name and package name. */
static char *current_class;
static char *package_name;
static const char *current_class;
static const char *package_name;
/* Keep track of whether things have be listed before. */
static int previous_output;
......@@ -78,8 +78,8 @@ static int bracket_count;
/* Record a method declaration */
struct method_declarator {
char *method_name;
char *args;
const char *method_name;
const char *args;
};
#define NEW_METHOD_DECLARATOR(D,N,A) \
{ \
......@@ -90,7 +90,7 @@ struct method_declarator {
}
/* Two actions for this grammar */
static void report_class_declaration PROTO ((char *));
static void report_class_declaration PROTO ((const char *));
static void report_main_declaration PROTO ((struct method_declarator *));
#include "lex.h"
......@@ -1123,7 +1123,7 @@ java_push_parser_context ()
static void
report_class_declaration (name)
char * name;
const char * name;
{
extern int flag_dump_class, flag_list_filename;
......@@ -1181,7 +1181,7 @@ void reset_report ()
void
yyerror (msg)
char *msg ATTRIBUTE_UNUSED;
const char *msg ATTRIBUTE_UNUSED;
{
}
......
gcc/java/parse.c
/* A Bison parser, made from ./parse.y
by GNU Bison version 1.27
by GNU Bison version 1.25
*/
#define YYBISON 1 /* Identify Bison output. */
......@@ -12,113 +12,113 @@
#define yychar java_char
#define yydebug java_debug
#define yynerrs java_nerrs
#define PLUS_TK 257
#define MINUS_TK 258
#define MULT_TK 259
#define DIV_TK 260
#define REM_TK 261
#define LS_TK 262
#define SRS_TK 263
#define ZRS_TK 264
#define AND_TK 265
#define XOR_TK 266
#define OR_TK 267
#define BOOL_AND_TK 268
#define BOOL_OR_TK 269
#define EQ_TK 270
#define NEQ_TK 271
#define GT_TK 272
#define GTE_TK 273
#define LT_TK 274
#define LTE_TK 275
#define PLUS_ASSIGN_TK 276
#define MINUS_ASSIGN_TK 277
#define MULT_ASSIGN_TK 278
#define DIV_ASSIGN_TK 279
#define REM_ASSIGN_TK 280
#define LS_ASSIGN_TK 281
#define SRS_ASSIGN_TK 282
#define ZRS_ASSIGN_TK 283
#define AND_ASSIGN_TK 284
#define XOR_ASSIGN_TK 285
#define OR_ASSIGN_TK 286
#define PUBLIC_TK 287
#define PRIVATE_TK 288
#define PROTECTED_TK 289
#define STATIC_TK 290
#define FINAL_TK 291
#define SYNCHRONIZED_TK 292
#define VOLATILE_TK 293
#define TRANSIENT_TK 294
#define NATIVE_TK 295
#define PAD_TK 296
#define ABSTRACT_TK 297
#define MODIFIER_TK 298
#define DECR_TK 299
#define INCR_TK 300
#define DEFAULT_TK 301
#define IF_TK 302
#define THROW_TK 303
#define BOOLEAN_TK 304
#define DO_TK 305
#define IMPLEMENTS_TK 306
#define THROWS_TK 307
#define BREAK_TK 308
#define IMPORT_TK 309
#define ELSE_TK 310
#define INSTANCEOF_TK 311
#define RETURN_TK 312
#define VOID_TK 313
#define CATCH_TK 314
#define INTERFACE_TK 315
#define CASE_TK 316
#define EXTENDS_TK 317
#define FINALLY_TK 318
#define SUPER_TK 319
#define WHILE_TK 320
#define CLASS_TK 321
#define SWITCH_TK 322
#define CONST_TK 323
#define TRY_TK 324
#define FOR_TK 325
#define NEW_TK 326
#define CONTINUE_TK 327
#define GOTO_TK 328
#define PACKAGE_TK 329
#define THIS_TK 330
#define BYTE_TK 331
#define SHORT_TK 332
#define INT_TK 333
#define LONG_TK 334
#define CHAR_TK 335
#define INTEGRAL_TK 336
#define FLOAT_TK 337
#define DOUBLE_TK 338
#define FP_TK 339
#define ID_TK 340
#define REL_QM_TK 341
#define REL_CL_TK 342
#define NOT_TK 343
#define NEG_TK 344
#define ASSIGN_ANY_TK 345
#define ASSIGN_TK 346
#define OP_TK 347
#define CP_TK 348
#define OCB_TK 349
#define CCB_TK 350
#define OSB_TK 351
#define CSB_TK 352
#define SC_TK 353
#define C_TK 354
#define DOT_TK 355
#define STRING_LIT_TK 356
#define CHAR_LIT_TK 357
#define INT_LIT_TK 358
#define FP_LIT_TK 359
#define TRUE_TK 360
#define FALSE_TK 361
#define BOOL_LIT_TK 362
#define NULL_TK 363
#define PLUS_TK 258
#define MINUS_TK 259
#define MULT_TK 260
#define DIV_TK 261
#define REM_TK 262
#define LS_TK 263
#define SRS_TK 264
#define ZRS_TK 265
#define AND_TK 266
#define XOR_TK 267
#define OR_TK 268
#define BOOL_AND_TK 269
#define BOOL_OR_TK 270
#define EQ_TK 271
#define NEQ_TK 272
#define GT_TK 273
#define GTE_TK 274
#define LT_TK 275
#define LTE_TK 276
#define PLUS_ASSIGN_TK 277
#define MINUS_ASSIGN_TK 278
#define MULT_ASSIGN_TK 279
#define DIV_ASSIGN_TK 280
#define REM_ASSIGN_TK 281
#define LS_ASSIGN_TK 282
#define SRS_ASSIGN_TK 283
#define ZRS_ASSIGN_TK 284
#define AND_ASSIGN_TK 285
#define XOR_ASSIGN_TK 286
#define OR_ASSIGN_TK 287
#define PUBLIC_TK 288
#define PRIVATE_TK 289
#define PROTECTED_TK 290
#define STATIC_TK 291
#define FINAL_TK 292
#define SYNCHRONIZED_TK 293
#define VOLATILE_TK 294
#define TRANSIENT_TK 295
#define NATIVE_TK 296
#define PAD_TK 297
#define ABSTRACT_TK 298
#define MODIFIER_TK 299
#define DECR_TK 300
#define INCR_TK 301
#define DEFAULT_TK 302
#define IF_TK 303
#define THROW_TK 304
#define BOOLEAN_TK 305
#define DO_TK 306
#define IMPLEMENTS_TK 307
#define THROWS_TK 308
#define BREAK_TK 309
#define IMPORT_TK 310
#define ELSE_TK 311
#define INSTANCEOF_TK 312
#define RETURN_TK 313
#define VOID_TK 314
#define CATCH_TK 315
#define INTERFACE_TK 316
#define CASE_TK 317
#define EXTENDS_TK 318
#define FINALLY_TK 319
#define SUPER_TK 320
#define WHILE_TK 321
#define CLASS_TK 322
#define SWITCH_TK 323
#define CONST_TK 324
#define TRY_TK 325
#define FOR_TK 326
#define NEW_TK 327
#define CONTINUE_TK 328
#define GOTO_TK 329
#define PACKAGE_TK 330
#define THIS_TK 331
#define BYTE_TK 332
#define SHORT_TK 333
#define INT_TK 334
#define LONG_TK 335
#define CHAR_TK 336
#define INTEGRAL_TK 337
#define FLOAT_TK 338
#define DOUBLE_TK 339
#define FP_TK 340
#define ID_TK 341
#define REL_QM_TK 342
#define REL_CL_TK 343
#define NOT_TK 344
#define NEG_TK 345
#define ASSIGN_ANY_TK 346
#define ASSIGN_TK 347
#define OP_TK 348
#define CP_TK 349
#define OCB_TK 350
#define CCB_TK 351
#define OSB_TK 352
#define CSB_TK 353
#define SC_TK 354
#define C_TK 355
#define DOT_TK 356
#define STRING_LIT_TK 357
#define CHAR_LIT_TK 358
#define INT_LIT_TK 359
#define FP_LIT_TK 360
#define TRUE_TK 361
#define FALSE_TK 362
#define BOOL_LIT_TK 363
#define NULL_TK 364
#line 48 "./parse.y"
......@@ -148,9 +148,9 @@
/* Local function prototypes */
static char *java_accstring_lookup PROTO ((int));
static void classitf_redefinition_error PROTO ((char *,tree, tree, tree));
static void classitf_redefinition_error PROTO ((const char *,tree, tree, tree));
static void variable_redefinition_error PROTO ((tree, tree, tree, int));
static void check_modifiers PROTO ((char *, int, int));
static void check_modifiers PROTO ((const char *, int, int));
static tree create_class PROTO ((int, tree, tree, tree));
static tree create_interface PROTO ((int, tree, tree));
static tree find_field PROTO ((tree, tree));
......@@ -169,7 +169,7 @@ static tree method_declarator PROTO ((tree, tree));
static void parse_warning_context PVPROTO ((tree cl, const char *msg, ...))
ATTRIBUTE_PRINTF_2;
static void issue_warning_error_from_context PROTO ((tree, const char *msg, va_list));
static tree parse_jdk1_1_error PROTO ((char *));
static tree parse_jdk1_1_error PROTO ((const char *));
static void complete_class_report_errors PROTO ((jdep *));
static int process_imports PROTO ((void));
static void read_import_dir PROTO ((tree));
......@@ -177,8 +177,8 @@ static int find_in_imports_on_demand PROTO ((tree));
static int find_in_imports PROTO ((tree));
static int check_pkg_class_access PROTO ((tree, tree));
static tree resolve_package PROTO ((tree, tree *));
static tree lookup_package_type PROTO ((char *, int));
static tree lookup_package_type_and_set_next PROTO ((char *, int, tree *));
static tree lookup_package_type PROTO ((const char *, int));
static tree lookup_package_type_and_set_next PROTO ((const char *, int, tree *));
static tree resolve_class PROTO ((tree, tree, tree));
static void declare_local_variables PROTO ((int, tree, tree));
static void source_start_java_method PROTO ((tree));
......@@ -291,16 +291,16 @@ static int check_thrown_exceptions_do PROTO ((tree));
static void purge_unchecked_exceptions PROTO ((tree));
static void check_throws_clauses PROTO ((tree, tree, tree));
static void finish_method_declaration PROTO ((tree));
static tree build_super_invocation PROTO (());
static tree build_super_invocation PROTO ((void));
static int verify_constructor_circularity PROTO ((tree, tree));
static char *constructor_circularity_msg PROTO ((tree, tree));
static tree build_this_super_qualified_invocation PROTO ((int, tree, tree,
int, int));
static char *get_printable_method_name PROTO ((tree));
static const char *get_printable_method_name PROTO ((tree));
static tree patch_conditional_expr PROTO ((tree, tree, tree));
static void maybe_generate_finit PROTO (());
static void maybe_generate_finit PROTO ((void));
static void fix_constructors PROTO ((tree));
static int verify_constructor_super PROTO (());
static int verify_constructor_super PROTO ((void));
static tree create_artificial_method PROTO ((tree, int, tree, tree, tree));
static void start_artificial_method_body PROTO ((tree));
static void end_artificial_method_body PROTO ((tree));
......@@ -316,11 +316,23 @@ static tree build_new_array_init PROTO ((int, tree));
static tree patch_new_array_init PROTO ((tree, tree));
static tree maybe_build_array_element_wfl PROTO ((tree));
static int array_constructor_check_entry PROTO ((tree, tree));
static char *purify_type_name PROTO ((char *));
static const char *purify_type_name PROTO ((const char *));
static tree fold_constant_for_init PROTO ((tree, tree));
static tree strip_out_static_field_access_decl PROTO ((tree));
static jdeplist *reverse_jdep_list PROTO ((struct parser_ctxt *));
static void static_ref_err PROTO ((tree, tree, tree));
static void parser_add_interface PROTO ((tree, tree, tree));
static void add_superinterfaces PROTO ((tree, tree));
static tree jdep_resolve_class PROTO ((jdep *));
static int note_possible_classname PROTO ((const char *, int));
static void java_complete_expand_methods PROTO ((void));
static void java_expand_finals PROTO ((void));
static tree cut_identifier_in_qualified PROTO ((tree));
static tree java_stabilize_reference PROTO ((tree));
static tree do_unary_numeric_promotion PROTO ((tree));
static char * operator_string PROTO ((tree));
static tree do_merge_string_cste PROTO ((tree, const char *, int, int));
static tree merge_string_cste PROTO ((tree, tree, int));
/* Number of error found so far. */
int java_error_count;
......@@ -378,7 +390,7 @@ static tree java_lang_cloneable = NULL_TREE;
static tree current_static_block = NULL_TREE;
#line 306 "./parse.y"
#line 318 "./parse.y"
typedef union {
tree node;
int sub_token;
......@@ -388,7 +400,7 @@ typedef union {
} operator;
int value;
} YYSTYPE;
#line 316 "./parse.y"
#line 328 "./parse.y"
#include "lex.c"
#ifndef YYDEBUG
......@@ -409,7 +421,7 @@ typedef union {
#define YYFLAG -32768
#define YYNTBASE 110
#define YYTRANSLATE(x) ((unsigned)(x) <= 363 ? yytranslate[x] : 266)
#define YYTRANSLATE(x) ((unsigned)(x) <= 364 ? yytranslate[x] : 266)
static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
......@@ -437,18 +449,18 @@ static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
107, 108, 109
2, 2, 2, 2, 2, 1, 2, 3, 4, 5,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
106, 107, 108, 109
};
#if YYDEBUG != 0
......@@ -686,57 +698,57 @@ static const short yyrhs[] = { 123,
#if YYDEBUG != 0
static const short yyrline[] = { 0,
460, 466, 468, 469, 470, 471, 472, 476, 478, 481,
483, 484, 487, 489, 492, 496, 500, 504, 510, 512,
514, 516, 521, 523, 526, 530, 535, 540, 542, 543,
544, 545, 546, 547, 548, 551, 556, 562, 564, 567,
570, 572, 576, 578, 581, 608, 610, 614, 627, 629,
633, 640, 645, 647, 657, 662, 677, 681, 684, 687,
690, 692, 694, 699, 703, 705, 707, 709, 713, 715,
717, 724, 730, 735, 739, 748, 758, 760, 763, 765,
766, 767, 771, 773, 775, 776, 778, 783, 786, 796,
799, 801, 805, 808, 815, 821, 829, 831, 833, 835,
837, 841, 843, 847, 854, 855, 859, 862, 864, 866,
868, 870, 872, 874, 876, 883, 886, 888, 897, 899,
903, 908, 913, 917, 922, 927, 929, 936, 938, 940,
944, 947, 949, 953, 955, 956, 961, 967, 974, 982,
989, 992, 995, 999, 1002, 1006, 1015, 1017, 1019, 1023,
1025, 1028, 1035, 1043, 1045, 1049, 1056, 1066, 1070, 1073,
1076, 1079, 1082, 1085, 1088, 1091, 1093, 1097, 1103, 1108,
1110, 1114, 1117, 1121, 1123, 1126, 1128, 1129, 1131, 1135,
1139, 1145, 1150, 1153, 1155, 1159, 1165, 1169, 1174, 1183,
1187, 1192, 1204, 1206, 1209, 1211, 1213, 1217, 1221, 1224,
1228, 1230, 1231, 1232, 1233, 1234, 1238, 1240, 1241, 1242,
1243, 1247, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256,
1257, 1258, 1261, 1266, 1277, 1280, 1284, 1291, 1301, 1307,
1313, 1319, 1321, 1327, 1329, 1335, 1337, 1339, 1341, 1343,
1347, 1349, 1350, 1351, 1352, 1353, 1354, 1357, 1363, 1365,
1367, 1371, 1376, 1381, 1387, 1397, 1403, 1405, 1407, 1414,
1417, 1419, 1421, 1425, 1427, 1430, 1434, 1436, 1439, 1446,
1452, 1454, 1456, 1460, 1468, 1471, 1473, 1475, 1479, 1484,
1493, 1498, 1501, 1508, 1510, 1512, 1516, 1519, 1528, 1535,
1537, 1541, 1554, 1556, 1562, 1568, 1572, 1574, 1578, 1581,
1583, 1587, 1590, 1592, 1594, 1598, 1601, 1603, 1605, 1609,
1612, 1614, 1616, 1620, 1626, 1628, 1632, 1639, 1641, 1643,
1645, 1649, 1657, 1660, 1662, 1667, 1671, 1673, 1680, 1688,
1705, 1707, 1709, 1713, 1716, 1721, 1723, 1726, 1728, 1730,
1732, 1733, 1734, 1735, 1739, 1741, 1743, 1748, 1750, 1752,
1754, 1756, 1760, 1763, 1768, 1770, 1775, 1776, 1777, 1778,
1779, 1781, 1783, 1785, 1787, 1789, 1793, 1795, 1798, 1804,
1809, 1813, 1816, 1818, 1820, 1824, 1826, 1828, 1830, 1834,
1837, 1841, 1847, 1849, 1857, 1884, 1886, 1890, 1895, 1902,
1906, 1909, 1911, 1922, 1933, 1938, 1947, 1949, 1953, 1956,
1958, 1963, 1968, 1973, 1980, 1982, 1983, 1984, 1987, 1992,
1997, 1999, 2000, 2002, 2004, 2005, 2007, 2011, 2014, 2018,
2021, 2025, 2027, 2029, 2031, 2032, 2034, 2038, 2047, 2049,
2051, 2064, 2066, 2072, 2074, 2076, 2080, 2082, 2087, 2092,
2097, 2099, 2101, 2105, 2107, 2112, 2117, 2119, 2123, 2125,
2130, 2135, 2140, 2142, 2144, 2148, 2150, 2155, 2160, 2165,
2170, 2172, 2174, 2176, 2178, 2180, 2184, 2186, 2191, 2196,
2198, 2202, 2204, 2209, 2213, 2215, 2220, 2224, 2226, 2231,
2235, 2237, 2242, 2246, 2248, 2253, 2257, 2259, 2264, 2270,
2272, 2276, 2278, 2281, 2284, 2292, 2294, 2295, 2298, 2300,
2303, 2307
472, 478, 480, 481, 482, 483, 484, 488, 490, 493,
495, 496, 499, 501, 504, 508, 512, 516, 522, 524,
526, 528, 533, 535, 538, 542, 547, 552, 554, 555,
556, 557, 558, 559, 560, 563, 568, 574, 576, 579,
582, 584, 588, 590, 593, 620, 622, 626, 639, 641,
645, 652, 657, 659, 669, 674, 689, 693, 696, 699,
702, 704, 706, 711, 715, 717, 719, 721, 725, 727,
729, 736, 742, 747, 751, 760, 770, 772, 775, 777,
778, 779, 783, 785, 787, 788, 790, 795, 798, 808,
811, 813, 817, 820, 827, 833, 841, 843, 845, 847,
849, 853, 855, 859, 866, 867, 871, 874, 876, 878,
880, 882, 884, 886, 888, 895, 898, 900, 909, 911,
915, 920, 925, 929, 934, 939, 941, 948, 950, 952,
956, 959, 961, 965, 967, 968, 973, 979, 986, 994,
1001, 1004, 1007, 1011, 1014, 1018, 1027, 1029, 1031, 1035,
1037, 1040, 1047, 1055, 1057, 1061, 1068, 1078, 1082, 1085,
1088, 1091, 1094, 1097, 1100, 1103, 1105, 1109, 1115, 1120,
1122, 1126, 1129, 1133, 1135, 1138, 1140, 1141, 1143, 1147,
1151, 1157, 1162, 1165, 1167, 1171, 1177, 1181, 1186, 1195,
1199, 1204, 1216, 1218, 1221, 1223, 1225, 1229, 1233, 1236,
1240, 1242, 1243, 1244, 1245, 1246, 1250, 1252, 1253, 1254,
1255, 1259, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268,
1269, 1270, 1273, 1278, 1289, 1292, 1296, 1303, 1313, 1319,
1325, 1331, 1333, 1339, 1341, 1347, 1349, 1351, 1353, 1355,
1359, 1361, 1362, 1363, 1364, 1365, 1366, 1369, 1375, 1377,
1379, 1383, 1388, 1393, 1399, 1409, 1415, 1417, 1419, 1426,
1429, 1431, 1433, 1437, 1439, 1442, 1446, 1448, 1451, 1458,
1464, 1466, 1468, 1472, 1480, 1483, 1485, 1487, 1491, 1496,
1505, 1510, 1513, 1520, 1522, 1524, 1528, 1531, 1540, 1547,
1549, 1553, 1566, 1568, 1574, 1580, 1584, 1586, 1590, 1593,
1595, 1599, 1602, 1604, 1606, 1610, 1613, 1615, 1617, 1621,
1624, 1626, 1628, 1632, 1638, 1640, 1644, 1651, 1653, 1655,
1657, 1661, 1669, 1672, 1674, 1679, 1683, 1685, 1692, 1700,
1717, 1719, 1721, 1725, 1728, 1733, 1735, 1738, 1740, 1742,
1744, 1745, 1746, 1747, 1751, 1753, 1755, 1760, 1762, 1764,
1766, 1768, 1772, 1775, 1780, 1782, 1787, 1788, 1789, 1790,
1791, 1793, 1795, 1797, 1799, 1801, 1805, 1807, 1810, 1816,
1821, 1825, 1828, 1830, 1832, 1836, 1838, 1840, 1842, 1846,
1849, 1853, 1859, 1861, 1869, 1896, 1898, 1902, 1907, 1914,
1918, 1921, 1923, 1934, 1945, 1950, 1959, 1961, 1965, 1968,
1970, 1975, 1980, 1985, 1992, 1994, 1995, 1996, 1999, 2004,
2009, 2011, 2012, 2014, 2016, 2017, 2019, 2023, 2026, 2030,
2033, 2037, 2039, 2041, 2043, 2044, 2046, 2050, 2059, 2061,
2063, 2076, 2078, 2084, 2086, 2088, 2092, 2094, 2099, 2104,
2109, 2111, 2113, 2117, 2119, 2124, 2129, 2131, 2135, 2137,
2142, 2147, 2152, 2154, 2156, 2160, 2162, 2167, 2172, 2177,
2182, 2184, 2186, 2188, 2190, 2192, 2196, 2198, 2203, 2208,
2210, 2214, 2216, 2221, 2225, 2227, 2232, 2236, 2238, 2243,
2247, 2249, 2254, 2258, 2260, 2265, 2269, 2271, 2276, 2282,
2284, 2288, 2290, 2293, 2296, 2304, 2306, 2307, 2310, 2312,
2315, 2319
};
#endif
......@@ -2214,8 +2226,7 @@ static const short yycheck[] = { 3,
#define YYPURE 1
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
/* This file comes from bison-1.27. */
#line 3 "/usr/local/gnu/share/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
......@@ -2232,66 +2243,46 @@ static const short yycheck[] = { 3,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
/* This is the parser code that is written into each bison parser
when the %semantic_parser declaration is not specified in the grammar.
It was written by Richard Stallman by simplifying the hairy parser
used when %semantic_parser is specified. */
#ifndef YYSTACK_USE_ALLOCA
#ifdef alloca
#define YYSTACK_USE_ALLOCA
#else /* alloca not defined */
#ifndef alloca
#ifdef __GNUC__
#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not GNU C. */
#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
#define YYSTACK_USE_ALLOCA
#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
#include <alloca.h>
#else /* not sparc */
/* We think this test detects Watcom and Microsoft C. */
/* This used to test MSDOS, but that is a bad idea
since that symbol is in the user namespace. */
#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
#if 0 /* No need for malloc.h, which pollutes the namespace;
instead, just don't use alloca. */
#if defined (MSDOS) && !defined (__TURBOC__)
#include <malloc.h>
#endif
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
/* I don't know what this was needed for, but it pollutes the namespace.
So I turned it off. rms, 2 May 1997. */
/* #include <malloc.h> */
#include <malloc.h>
#pragma alloca
#define YYSTACK_USE_ALLOCA
#else /* not MSDOS, or __TURBOC__, or _AIX */
#if 0
#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
and on HPUX 10. Eventually we can turn this on. */
#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not MSDOS, __TURBOC__, or _AIX */
#ifdef __hpux
#ifdef __cplusplus
extern "C" {
void *alloca (unsigned int);
};
#else /* not __cplusplus */
void *alloca ();
#endif /* not __cplusplus */
#endif /* __hpux */
#endif
#endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */
#endif /* not sparc */
#endif /* not GNU C */
#endif /* alloca not defined */
#endif /* YYSTACK_USE_ALLOCA not defined */
#endif /* not sparc. */
#endif /* not GNU C. */
#endif /* alloca not defined. */
#ifdef YYSTACK_USE_ALLOCA
#define YYSTACK_ALLOC alloca
#else
#define YYSTACK_ALLOC malloc
#endif
/* This is the parser code that is written into each bison parser
when the %semantic_parser declaration is not specified in the grammar.
It was written by Richard Stallman by simplifying the hairy parser
used when %semantic_parser is specified. */
/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
......@@ -2301,8 +2292,8 @@ static const short yycheck[] = { 3,
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
#define YYACCEPT goto yyacceptlab
#define YYABORT goto yyabortlab
#define YYACCEPT return(0)
#define YYABORT return(1)
#define YYERROR goto yyerrlab1
/* Like YYERROR except do call yyerror.
This remains here temporarily to ease the
......@@ -2383,12 +2374,12 @@ int yydebug; /* nonzero means print parse trace */
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 10000
#endif
/* Define __yy_memcpy. Note that the size argument
should be passed with type unsigned int, because that is what the non-GCC
definitions require. With GCC, __builtin_memcpy takes an arg
of type size_t, but it can handle unsigned int. */
/* Prevent warning if -Wstrict-prototypes. */
#ifdef __GNUC__
int yyparse (void);
#endif
#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
#else /* not GNU C or C++ */
......@@ -2400,7 +2391,7 @@ static void
__yy_memcpy (to, from, count)
char *to;
char *from;
unsigned int count;
int count;
{
register char *f = from;
register char *t = to;
......@@ -2415,10 +2406,10 @@ __yy_memcpy (to, from, count)
/* This is the most reliable way to avoid incompatibilities
in available built-in functions on various systems. */
static void
__yy_memcpy (char *to, char *from, unsigned int count)
__yy_memcpy (char *to, char *from, int count)
{
register char *t = to;
register char *f = from;
register char *t = to;
register int i = count;
while (i-- > 0)
......@@ -2428,7 +2419,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#endif
#endif
#line 216 "/usr/lib/bison.simple"
#line 196 "/usr/local/gnu/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
......@@ -2449,15 +2440,6 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#define YYPARSE_PARAM_DECL
#endif /* not YYPARSE_PARAM */
/* Prevent warning if -Wstrict-prototypes. */
#ifdef __GNUC__
#ifdef YYPARSE_PARAM
int yyparse (void *);
#else
int yyparse (void);
#endif
#endif
int
yyparse(YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
......@@ -2486,7 +2468,6 @@ yyparse(YYPARSE_PARAM_ARG)
#endif
int yystacksize = YYINITDEPTH;
int yyfree_stacks = 0;
#ifdef YYPURE
int yychar;
......@@ -2571,32 +2552,18 @@ yynewstate:
if (yystacksize >= YYMAXDEPTH)
{
yyerror("parser stack overflow");
if (yyfree_stacks)
{
free (yyss);
free (yyvs);
#ifdef YYLSP_NEEDED
free (yyls);
#endif
}
return 2;
}
yystacksize *= 2;
if (yystacksize > YYMAXDEPTH)
yystacksize = YYMAXDEPTH;
#ifndef YYSTACK_USE_ALLOCA
yyfree_stacks = 1;
#endif
yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
__yy_memcpy ((char *)yyss, (char *)yyss1,
size * (unsigned int) sizeof (*yyssp));
yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
__yy_memcpy ((char *)yyvs, (char *)yyvs1,
size * (unsigned int) sizeof (*yyvsp));
yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
__yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
__yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
#ifdef YYLSP_NEEDED
yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
__yy_memcpy ((char *)yyls, (char *)yyls1,
size * (unsigned int) sizeof (*yylsp));
yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
__yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
#endif
#endif /* no yyoverflow */
......@@ -2757,70 +2724,70 @@ yyreduce:
switch (yyn) {
case 1:
#line 462 "./parse.y"
#line 474 "./parse.y"
{;
break;}
case 18:
#line 506 "./parse.y"
#line 518 "./parse.y"
{
yyval.node = build_java_array_type (yyvsp[-2].node, -1);
CLASS_LOADED_P (yyval.node) = 1;
;
break;}
case 19:
#line 511 "./parse.y"
#line 523 "./parse.y"
{ yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
break;}
case 20:
#line 513 "./parse.y"
#line 525 "./parse.y"
{ yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
break;}
case 21:
#line 515 "./parse.y"
#line 527 "./parse.y"
{RULE ("']' expected"); RECOVER;;
break;}
case 22:
#line 517 "./parse.y"
#line 529 "./parse.y"
{RULE ("']' expected"); RECOVER;;
break;}
case 26:
#line 532 "./parse.y"
#line 544 "./parse.y"
{ yyval.node = make_qualified_name (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ;
break;}
case 28:
#line 541 "./parse.y"
#line 553 "./parse.y"
{yyval.node = NULL;;
break;}
case 36:
#line 553 "./parse.y"
#line 565 "./parse.y"
{
yyval.node = NULL;
;
break;}
case 37:
#line 557 "./parse.y"
#line 569 "./parse.y"
{
yyval.node = NULL;
;
break;}
case 40:
#line 569 "./parse.y"
#line 581 "./parse.y"
{ ctxp->package = EXPR_WFL_NODE (yyvsp[-1].node); ;
break;}
case 41:
#line 571 "./parse.y"
#line 583 "./parse.y"
{yyerror ("Missing name"); RECOVER;;
break;}
case 42:
#line 573 "./parse.y"
#line 585 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 45:
#line 583 "./parse.y"
#line 595 "./parse.y"
{
tree name = EXPR_WFL_NODE (yyvsp[-1].node), node, last_name;
int i = IDENTIFIER_LENGTH (name)-1;
char *last = &IDENTIFIER_POINTER (name)[i];
const char *last = &IDENTIFIER_POINTER (name)[i];
while (last != IDENTIFIER_POINTER (name))
{
if (last [0] == '.')
......@@ -2844,15 +2811,15 @@ case 45:
;
break;}
case 46:
#line 609 "./parse.y"
#line 621 "./parse.y"
{yyerror ("Missing name"); RECOVER;;
break;}
case 47:
#line 611 "./parse.y"
#line 623 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 48:
#line 616 "./parse.y"
#line 628 "./parse.y"
{
tree name = EXPR_WFL_NODE (yyvsp[-3].node);
/* Don't import java.lang.* twice. */
......@@ -2866,15 +2833,15 @@ case 48:
;
break;}
case 49:
#line 628 "./parse.y"
#line 640 "./parse.y"
{yyerror ("'*' expected"); RECOVER;;
break;}
case 50:
#line 630 "./parse.y"
#line 642 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 51:
#line 635 "./parse.y"
#line 647 "./parse.y"
{
maybe_generate_finit ();
maybe_generate_clinit ();
......@@ -2882,31 +2849,31 @@ case 51:
;
break;}
case 52:
#line 641 "./parse.y"
#line 653 "./parse.y"
{
maybe_generate_clinit ();
yyval.node = yyvsp[0].node;
;
break;}
case 53:
#line 646 "./parse.y"
#line 658 "./parse.y"
{ yyval.node = NULL; ;
break;}
case 54:
#line 648 "./parse.y"
#line 660 "./parse.y"
{
YYERROR_NOW;
yyerror ("Class or interface declaration expected");
;
break;}
case 55:
#line 659 "./parse.y"
#line 671 "./parse.y"
{
yyval.value = (1 << yyvsp[0].value);
;
break;}
case 56:
#line 663 "./parse.y"
#line 675 "./parse.y"
{
int acc = (1 << yyvsp[0].value);
if (yyval.value & acc)
......@@ -2920,95 +2887,95 @@ case 56:
;
break;}
case 57:
#line 679 "./parse.y"
#line 691 "./parse.y"
{ create_class (yyvsp[-4].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 58:
#line 681 "./parse.y"
#line 693 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 59:
#line 685 "./parse.y"
#line 697 "./parse.y"
{ create_class (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 60:
#line 687 "./parse.y"
#line 699 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 61:
#line 691 "./parse.y"
#line 703 "./parse.y"
{yyerror ("Missing class name"); RECOVER;;
break;}
case 62:
#line 693 "./parse.y"
#line 705 "./parse.y"
{yyerror ("Missing class name"); RECOVER;;
break;}
case 63:
#line 695 "./parse.y"
#line 707 "./parse.y"
{
if (!ctxp->class_err) yyerror ("'{' expected");
DRECOVER(class1);
;
break;}
case 64:
#line 700 "./parse.y"
#line 712 "./parse.y"
{if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER;;
break;}
case 65:
#line 704 "./parse.y"
#line 716 "./parse.y"
{ yyval.node = NULL; ;
break;}
case 66:
#line 706 "./parse.y"
#line 718 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 67:
#line 708 "./parse.y"
#line 720 "./parse.y"
{yyerror ("'{' expected"); ctxp->class_err=1;;
break;}
case 68:
#line 710 "./parse.y"
#line 722 "./parse.y"
{yyerror ("Missing super class name"); ctxp->class_err=1;;
break;}
case 69:
#line 714 "./parse.y"
#line 726 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 70:
#line 716 "./parse.y"
#line 728 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 71:
#line 718 "./parse.y"
#line 730 "./parse.y"
{
ctxp->class_err=1;
yyerror ("Missing interface name");
;
break;}
case 72:
#line 726 "./parse.y"
#line 738 "./parse.y"
{
ctxp->interface_number = 1;
yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE);
;
break;}
case 73:
#line 731 "./parse.y"
#line 743 "./parse.y"
{
ctxp->interface_number++;
yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE));
;
break;}
case 74:
#line 736 "./parse.y"
#line 748 "./parse.y"
{yyerror ("Missing interface name"); RECOVER;;
break;}
case 75:
#line 741 "./parse.y"
#line 753 "./parse.y"
{
/* Store the location of the `}' when doing xrefs */
if (flag_emit_xref)
......@@ -3018,7 +2985,7 @@ case 75:
;
break;}
case 76:
#line 749 "./parse.y"
#line 761 "./parse.y"
{
/* Store the location of the `}' when doing xrefs */
if (flag_emit_xref)
......@@ -3028,27 +2995,27 @@ case 76:
;
break;}
case 82:
#line 768 "./parse.y"
#line 780 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("instance initializer"); ;
break;}
case 84:
#line 774 "./parse.y"
#line 786 "./parse.y"
{ yyval.node = yyvsp[-1].node; ;
break;}
case 86:
#line 777 "./parse.y"
#line 789 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner classe declaration"); ;
break;}
case 87:
#line 779 "./parse.y"
#line 791 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner interface declaration"); ;
break;}
case 88:
#line 785 "./parse.y"
#line 797 "./parse.y"
{ register_fields (0, yyvsp[-2].node, yyvsp[-1].node); ;
break;}
case 89:
#line 787 "./parse.y"
#line 799 "./parse.y"
{
check_modifiers
("Illegal modifier `%s' for field declaration",
......@@ -3058,19 +3025,19 @@ case 89:
;
break;}
case 91:
#line 800 "./parse.y"
#line 812 "./parse.y"
{ yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 92:
#line 802 "./parse.y"
#line 814 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 93:
#line 807 "./parse.y"
#line 819 "./parse.y"
{ yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ;
break;}
case 94:
#line 809 "./parse.y"
#line 821 "./parse.y"
{
if (java_error_count)
yyvsp[0].node = NULL_TREE;
......@@ -3079,7 +3046,7 @@ case 94:
;
break;}
case 95:
#line 816 "./parse.y"
#line 828 "./parse.y"
{
yyerror ("Missing variable initializer");
yyval.node = build_tree_list (yyvsp[-2].node, NULL_TREE);
......@@ -3087,7 +3054,7 @@ case 95:
;
break;}
case 96:
#line 822 "./parse.y"
#line 834 "./parse.y"
{
yyerror ("';' expected");
yyval.node = build_tree_list (yyvsp[-3].node, NULL_TREE);
......@@ -3095,85 +3062,85 @@ case 96:
;
break;}
case 98:
#line 832 "./parse.y"
#line 844 "./parse.y"
{ yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
break;}
case 99:
#line 834 "./parse.y"
#line 846 "./parse.y"
{yyerror ("Invalid declaration"); DRECOVER(vdi);;
break;}
case 100:
#line 836 "./parse.y"
#line 848 "./parse.y"
{yyerror ("']' expected"); DRECOVER(vdi);;
break;}
case 101:
#line 838 "./parse.y"
#line 850 "./parse.y"
{yyerror ("Unbalanced ']'"); DRECOVER(vdi);;
break;}
case 104:
#line 849 "./parse.y"
#line 861 "./parse.y"
{
current_function_decl = yyvsp[0].node;
source_start_java_method (current_function_decl);
;
break;}
case 105:
#line 854 "./parse.y"
#line 866 "./parse.y"
{ finish_method_declaration (yyvsp[0].node); ;
break;}
case 106:
#line 856 "./parse.y"
#line 868 "./parse.y"
{YYNOT_TWICE yyerror ("'{' expected"); RECOVER;;
break;}
case 107:
#line 861 "./parse.y"
#line 873 "./parse.y"
{ yyval.node = method_header (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 108:
#line 863 "./parse.y"
#line 875 "./parse.y"
{ yyval.node = method_header (0, void_type_node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 109:
#line 865 "./parse.y"
#line 877 "./parse.y"
{ yyval.node = method_header (yyvsp[-3].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 110:
#line 867 "./parse.y"
#line 879 "./parse.y"
{ yyval.node = method_header (yyvsp[-3].value, void_type_node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 111:
#line 869 "./parse.y"
#line 881 "./parse.y"
{RECOVER;;
break;}
case 112:
#line 871 "./parse.y"
#line 883 "./parse.y"
{RECOVER;;
break;}
case 113:
#line 873 "./parse.y"
#line 885 "./parse.y"
{yyerror ("Identifier expected"); RECOVER;;
break;}
case 114:
#line 875 "./parse.y"
#line 887 "./parse.y"
{yyerror ("Identifier expected"); RECOVER;;
break;}
case 115:
#line 877 "./parse.y"
#line 889 "./parse.y"
{
yyerror ("Invalid method declaration, return type required");
RECOVER;
;
break;}
case 116:
#line 885 "./parse.y"
#line 897 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ;
break;}
case 117:
#line 887 "./parse.y"
#line 899 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 118:
#line 889 "./parse.y"
#line 901 "./parse.y"
{
EXPR_WFL_LINECOL (wfl_operator) = yyvsp[-1].operator.location;
TREE_PURPOSE (yyvsp[-2].node) =
......@@ -3184,150 +3151,150 @@ case 118:
;
break;}
case 119:
#line 898 "./parse.y"
#line 910 "./parse.y"
{yyerror ("')' expected"); DRECOVER(method_declarator);;
break;}
case 120:
#line 900 "./parse.y"
#line 912 "./parse.y"
{yyerror ("']' expected"); RECOVER;;
break;}
case 121:
#line 905 "./parse.y"
#line 917 "./parse.y"
{
ctxp->formal_parameter_number = 1;
;
break;}
case 122:
#line 909 "./parse.y"
#line 921 "./parse.y"
{
ctxp->formal_parameter_number += 1;
yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 123:
#line 914 "./parse.y"
#line 926 "./parse.y"
{yyerror ("Missing formal parameter term"); RECOVER;;
break;}
case 124:
#line 919 "./parse.y"
#line 931 "./parse.y"
{
yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node);
;
break;}
case 125:
#line 923 "./parse.y"
#line 935 "./parse.y"
{
parse_jdk1_1_error ("final parameters");
yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node);
;
break;}
case 126:
#line 928 "./parse.y"
#line 940 "./parse.y"
{yyerror ("Missing identifier"); RECOVER;;
break;}
case 127:
#line 930 "./parse.y"
#line 942 "./parse.y"
{
SOURCE_FRONTEND_DEBUG (("Modifiers: %d", yyvsp[-2].value));
yyerror ("Missing identifier"); RECOVER;
;
break;}
case 128:
#line 937 "./parse.y"
#line 949 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 129:
#line 939 "./parse.y"
#line 951 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 130:
#line 941 "./parse.y"
#line 953 "./parse.y"
{yyerror ("Missing class type term"); RECOVER;;
break;}
case 131:
#line 946 "./parse.y"
#line 958 "./parse.y"
{ yyval.node = build_tree_list (yyvsp[0].node, yyvsp[0].node); ;
break;}
case 132:
#line 948 "./parse.y"
#line 960 "./parse.y"
{ yyval.node = tree_cons (yyvsp[0].node, yyvsp[0].node, yyvsp[-2].node); ;
break;}
case 133:
#line 950 "./parse.y"
#line 962 "./parse.y"
{yyerror ("Missing class type term"); RECOVER;;
break;}
case 136:
#line 957 "./parse.y"
#line 969 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 137:
#line 963 "./parse.y"
#line 975 "./parse.y"
{
TREE_CHAIN (yyvsp[0].node) = ctxp->static_initialized;
ctxp->static_initialized = yyvsp[0].node;
;
break;}
case 138:
#line 968 "./parse.y"
#line 980 "./parse.y"
{
TREE_CHAIN (yyvsp[-1].node) = ctxp->static_initialized;
ctxp->static_initialized = yyvsp[-1].node;
;
break;}
case 139:
#line 976 "./parse.y"
#line 988 "./parse.y"
{
SOURCE_FRONTEND_DEBUG (("Modifiers: %d", yyvsp[0].value));
;
break;}
case 140:
#line 984 "./parse.y"
#line 996 "./parse.y"
{
current_function_decl = yyvsp[0].node;
source_start_java_method (current_function_decl);
;
break;}
case 141:
#line 989 "./parse.y"
#line 1001 "./parse.y"
{ finish_method_declaration (yyvsp[0].node); ;
break;}
case 142:
#line 994 "./parse.y"
#line 1006 "./parse.y"
{ yyval.node = method_header (0, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 143:
#line 996 "./parse.y"
#line 1008 "./parse.y"
{ yyval.node = method_header (yyvsp[-2].value, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 144:
#line 1001 "./parse.y"
#line 1013 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ;
break;}
case 145:
#line 1003 "./parse.y"
#line 1015 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 146:
#line 1011 "./parse.y"
#line 1023 "./parse.y"
{
BLOCK_EXPR_BODY (yyvsp[0].node) = empty_stmt_node;
yyval.node = yyvsp[0].node;
;
break;}
case 147:
#line 1016 "./parse.y"
#line 1028 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 148:
#line 1018 "./parse.y"
#line 1030 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 149:
#line 1020 "./parse.y"
#line 1032 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 152:
#line 1030 "./parse.y"
#line 1042 "./parse.y"
{
yyval.node = build_method_invocation (yyvsp[-3].node, NULL_TREE);
yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-3].node), yyval.node);
......@@ -3335,7 +3302,7 @@ case 152:
;
break;}
case 153:
#line 1036 "./parse.y"
#line 1048 "./parse.y"
{
yyval.node = build_method_invocation (yyvsp[-4].node, yyvsp[-2].node);
yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-4].node), yyval.node);
......@@ -3343,15 +3310,15 @@ case 153:
;
break;}
case 154:
#line 1044 "./parse.y"
#line 1056 "./parse.y"
{yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ;
break;}
case 155:
#line 1046 "./parse.y"
#line 1058 "./parse.y"
{yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ;
break;}
case 156:
#line 1051 "./parse.y"
#line 1063 "./parse.y"
{
tree wfl = build_wfl_node (this_identifier_node);
EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location;
......@@ -3359,7 +3326,7 @@ case 156:
;
break;}
case 157:
#line 1057 "./parse.y"
#line 1069 "./parse.y"
{
tree wfl = build_wfl_node (super_identifier_node);
EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location;
......@@ -3367,133 +3334,133 @@ case 157:
;
break;}
case 158:
#line 1068 "./parse.y"
#line 1080 "./parse.y"
{ create_interface (0, yyvsp[0].node, NULL_TREE); ;
break;}
case 159:
#line 1070 "./parse.y"
#line 1082 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 160:
#line 1074 "./parse.y"
#line 1086 "./parse.y"
{ create_interface (yyvsp[-2].value, yyvsp[0].node, NULL_TREE); ;
break;}
case 161:
#line 1076 "./parse.y"
#line 1088 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 162:
#line 1080 "./parse.y"
#line 1092 "./parse.y"
{ create_interface (0, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 163:
#line 1082 "./parse.y"
#line 1094 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 164:
#line 1086 "./parse.y"
#line 1098 "./parse.y"
{ create_interface (yyvsp[-3].value, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 165:
#line 1088 "./parse.y"
#line 1100 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 166:
#line 1092 "./parse.y"
#line 1104 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 167:
#line 1094 "./parse.y"
#line 1106 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 168:
#line 1099 "./parse.y"
#line 1111 "./parse.y"
{
ctxp->interface_number = 1;
yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE);
;
break;}
case 169:
#line 1104 "./parse.y"
#line 1116 "./parse.y"
{
ctxp->interface_number++;
yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE));
;
break;}
case 170:
#line 1109 "./parse.y"
#line 1121 "./parse.y"
{yyerror ("Invalid interface type"); RECOVER;;
break;}
case 171:
#line 1111 "./parse.y"
#line 1123 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 172:
#line 1116 "./parse.y"
#line 1128 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 173:
#line 1118 "./parse.y"
#line 1130 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 178:
#line 1130 "./parse.y"
#line 1142 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner class declaration"); ;
break;}
case 179:
#line 1132 "./parse.y"
#line 1144 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner interface declaration"); ;
break;}
case 181:
#line 1141 "./parse.y"
#line 1153 "./parse.y"
{
check_abstract_method_header (yyvsp[-1].node);
current_function_decl = NULL_TREE; /* FIXME ? */
;
break;}
case 182:
#line 1146 "./parse.y"
#line 1158 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 183:
#line 1152 "./parse.y"
#line 1164 "./parse.y"
{ yyval.node = build_new_array_init (yyvsp[-1].operator.location, NULL_TREE); ;
break;}
case 184:
#line 1154 "./parse.y"
#line 1166 "./parse.y"
{ yyval.node = build_new_array_init (yyvsp[-2].operator.location, yyvsp[-1].node); ;
break;}
case 185:
#line 1156 "./parse.y"
#line 1168 "./parse.y"
{ yyval.node = build_new_array_init (yyvsp[-3].operator.location, yyvsp[-2].node); ;
break;}
case 186:
#line 1161 "./parse.y"
#line 1173 "./parse.y"
{
yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node),
yyvsp[0].node, NULL_TREE);
;
break;}
case 187:
#line 1166 "./parse.y"
#line 1178 "./parse.y"
{
yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), yyvsp[0].node, yyvsp[-2].node);
;
break;}
case 188:
#line 1170 "./parse.y"
#line 1182 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 189:
#line 1176 "./parse.y"
#line 1188 "./parse.y"
{
/* Store the location of the `}' when doing xrefs */
if (current_function_decl && flag_emit_xref)
......@@ -3503,15 +3470,15 @@ case 189:
;
break;}
case 190:
#line 1184 "./parse.y"
#line 1196 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 191:
#line 1189 "./parse.y"
#line 1201 "./parse.y"
{ enter_block (); ;
break;}
case 192:
#line 1194 "./parse.y"
#line 1206 "./parse.y"
{
maybe_absorb_scoping_blocks ();
/* Store the location of the `}' when doing xrefs */
......@@ -3522,35 +3489,35 @@ case 192:
;
break;}
case 196:
#line 1212 "./parse.y"
#line 1224 "./parse.y"
{ java_method_add_stmt (current_function_decl, yyvsp[0].node); ;
break;}
case 197:
#line 1214 "./parse.y"
#line 1226 "./parse.y"
{ parse_jdk1_1_error ("inner class declaration"); ;
break;}
case 199:
#line 1223 "./parse.y"
#line 1235 "./parse.y"
{ declare_local_variables (0, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 200:
#line 1225 "./parse.y"
#line 1237 "./parse.y"
{ declare_local_variables (yyvsp[-2].value, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 206:
#line 1235 "./parse.y"
#line 1247 "./parse.y"
{ yyval.node = exit_block (); ;
break;}
case 211:
#line 1244 "./parse.y"
#line 1256 "./parse.y"
{ yyval.node = exit_block (); ;
break;}
case 223:
#line 1263 "./parse.y"
#line 1275 "./parse.y"
{ yyval.node = empty_stmt_node; ;
break;}
case 224:
#line 1268 "./parse.y"
#line 1280 "./parse.y"
{
yyval.node = build_labeled_block (EXPR_WFL_LINECOL (yyvsp[-1].node),
EXPR_WFL_NODE (yyvsp[-1].node));
......@@ -3560,19 +3527,19 @@ case 224:
;
break;}
case 225:
#line 1279 "./parse.y"
#line 1291 "./parse.y"
{ yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 226:
#line 1281 "./parse.y"
#line 1293 "./parse.y"
{yyerror ("':' expected"); RECOVER;;
break;}
case 227:
#line 1286 "./parse.y"
#line 1298 "./parse.y"
{ yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 228:
#line 1293 "./parse.y"
#line 1305 "./parse.y"
{
/* We have a statement. Generate a WFL around it so
we can debug it */
......@@ -3583,7 +3550,7 @@ case 228:
;
break;}
case 229:
#line 1302 "./parse.y"
#line 1314 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid expression statement");
......@@ -3591,7 +3558,7 @@ case 229:
;
break;}
case 230:
#line 1308 "./parse.y"
#line 1320 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid expression statement");
......@@ -3599,7 +3566,7 @@ case 230:
;
break;}
case 231:
#line 1314 "./parse.y"
#line 1326 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid expression statement");
......@@ -3607,11 +3574,11 @@ case 231:
;
break;}
case 232:
#line 1320 "./parse.y"
#line 1332 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 233:
#line 1322 "./parse.y"
#line 1334 "./parse.y"
{
yyerror ("Constructor invocation must be first "
"thing in a constructor");
......@@ -3619,11 +3586,11 @@ case 233:
;
break;}
case 234:
#line 1328 "./parse.y"
#line 1340 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 235:
#line 1330 "./parse.y"
#line 1342 "./parse.y"
{
yyerror ("Constructor invocation must be first "
"thing in a constructor");
......@@ -3631,60 +3598,60 @@ case 235:
;
break;}
case 236:
#line 1336 "./parse.y"
#line 1348 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 237:
#line 1338 "./parse.y"
#line 1350 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 238:
#line 1340 "./parse.y"
#line 1352 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 239:
#line 1342 "./parse.y"
#line 1354 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 240:
#line 1344 "./parse.y"
#line 1356 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 248:
#line 1359 "./parse.y"
#line 1371 "./parse.y"
{
yyval.node = build_if_else_statement (yyvsp[-3].operator.location, yyvsp[-2].node,
yyvsp[0].node, NULL_TREE);
;
break;}
case 249:
#line 1364 "./parse.y"
#line 1376 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 250:
#line 1366 "./parse.y"
#line 1378 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 251:
#line 1368 "./parse.y"
#line 1380 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 252:
#line 1373 "./parse.y"
#line 1385 "./parse.y"
{ yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 253:
#line 1378 "./parse.y"
#line 1390 "./parse.y"
{ yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 254:
#line 1383 "./parse.y"
#line 1395 "./parse.y"
{
enter_block ();
;
break;}
case 255:
#line 1387 "./parse.y"
#line 1399 "./parse.y"
{
/* Make into "proper list" of COMPOUND_EXPRs.
I.e. make the last statment also have its own
......@@ -3695,42 +3662,42 @@ case 255:
;
break;}
case 256:
#line 1399 "./parse.y"
#line 1411 "./parse.y"
{
yyval.node = build (SWITCH_EXPR, NULL_TREE, yyvsp[-1].node, NULL_TREE);
EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location;
;
break;}
case 257:
#line 1404 "./parse.y"
#line 1416 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 258:
#line 1406 "./parse.y"
#line 1418 "./parse.y"
{yyerror ("Missing term or ')'"); DRECOVER(switch_statement);;
break;}
case 259:
#line 1408 "./parse.y"
#line 1420 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 260:
#line 1416 "./parse.y"
#line 1428 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 261:
#line 1418 "./parse.y"
#line 1430 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 262:
#line 1420 "./parse.y"
#line 1432 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 263:
#line 1422 "./parse.y"
#line 1434 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 269:
#line 1441 "./parse.y"
#line 1453 "./parse.y"
{
tree lab = build1 (CASE_EXPR, NULL_TREE, yyvsp[-1].node);
EXPR_WFL_LINECOL (lab) = yyvsp[-2].operator.location;
......@@ -3738,7 +3705,7 @@ case 269:
;
break;}
case 270:
#line 1447 "./parse.y"
#line 1459 "./parse.y"
{
tree lab = build1 (DEFAULT_EXPR, NULL_TREE, NULL_TREE);
EXPR_WFL_LINECOL (lab) = yyvsp[-1].operator.location;
......@@ -3746,61 +3713,61 @@ case 270:
;
break;}
case 271:
#line 1453 "./parse.y"
#line 1465 "./parse.y"
{yyerror ("Missing or invalid constant expression"); RECOVER;;
break;}
case 272:
#line 1455 "./parse.y"
#line 1467 "./parse.y"
{yyerror ("':' expected"); RECOVER;;
break;}
case 273:
#line 1457 "./parse.y"
#line 1469 "./parse.y"
{yyerror ("':' expected"); RECOVER;;
break;}
case 274:
#line 1462 "./parse.y"
#line 1474 "./parse.y"
{
tree body = build_loop_body (yyvsp[-2].operator.location, yyvsp[-1].node, 0);
yyval.node = build_new_loop (body);
;
break;}
case 275:
#line 1470 "./parse.y"
#line 1482 "./parse.y"
{ yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
break;}
case 276:
#line 1472 "./parse.y"
#line 1484 "./parse.y"
{YYERROR_NOW; yyerror ("'(' expected"); RECOVER;;
break;}
case 277:
#line 1474 "./parse.y"
#line 1486 "./parse.y"
{yyerror ("Missing term and ')' expected"); RECOVER;;
break;}
case 278:
#line 1476 "./parse.y"
#line 1488 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 279:
#line 1481 "./parse.y"
#line 1493 "./parse.y"
{ yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
break;}
case 280:
#line 1486 "./parse.y"
#line 1498 "./parse.y"
{
tree body = build_loop_body (0, NULL_TREE, 1);
yyval.node = build_new_loop (body);
;
break;}
case 281:
#line 1495 "./parse.y"
#line 1507 "./parse.y"
{ yyval.node = finish_loop_body (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-5].node, 1); ;
break;}
case 282:
#line 1500 "./parse.y"
#line 1512 "./parse.y"
{ yyval.node = finish_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 283:
#line 1502 "./parse.y"
#line 1514 "./parse.y"
{
yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
/* We have not condition, so we get rid of the EXIT_EXPR */
......@@ -3809,23 +3776,23 @@ case 283:
;
break;}
case 284:
#line 1509 "./parse.y"
#line 1521 "./parse.y"
{yyerror ("Invalid control expression"); RECOVER;;
break;}
case 285:
#line 1511 "./parse.y"
#line 1523 "./parse.y"
{yyerror ("Invalid update expression"); RECOVER;;
break;}
case 286:
#line 1513 "./parse.y"
#line 1525 "./parse.y"
{yyerror ("Invalid update expression"); RECOVER;;
break;}
case 287:
#line 1518 "./parse.y"
#line 1530 "./parse.y"
{ yyval.node = finish_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);;
break;}
case 288:
#line 1520 "./parse.y"
#line 1532 "./parse.y"
{
yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
/* We have not condition, so we get rid of the EXIT_EXPR */
......@@ -3834,7 +3801,7 @@ case 288:
;
break;}
case 289:
#line 1530 "./parse.y"
#line 1542 "./parse.y"
{
/* This scope defined for local variable that may be
defined within the scope of the for loop */
......@@ -3842,15 +3809,15 @@ case 289:
;
break;}
case 290:
#line 1536 "./parse.y"
#line 1548 "./parse.y"
{yyerror ("'(' expected"); DRECOVER(for_1);;
break;}
case 291:
#line 1538 "./parse.y"
#line 1550 "./parse.y"
{yyerror ("Invalid init statement"); RECOVER;;
break;}
case 292:
#line 1543 "./parse.y"
#line 1555 "./parse.y"
{
/* We now declare the loop body. The loop is
declared as a for loop. */
......@@ -3863,11 +3830,11 @@ case 292:
;
break;}
case 293:
#line 1555 "./parse.y"
#line 1567 "./parse.y"
{ yyval.node = empty_stmt_node; ;
break;}
case 294:
#line 1557 "./parse.y"
#line 1569 "./parse.y"
{
/* Init statement recorded within the previously
defined block scope */
......@@ -3875,7 +3842,7 @@ case 294:
;
break;}
case 295:
#line 1563 "./parse.y"
#line 1575 "./parse.y"
{
/* Local variable are recorded within the previously
defined block scope */
......@@ -3883,94 +3850,94 @@ case 295:
;
break;}
case 296:
#line 1569 "./parse.y"
#line 1581 "./parse.y"
{yyerror ("';' expected"); DRECOVER(for_init_1);;
break;}
case 297:
#line 1573 "./parse.y"
#line 1585 "./parse.y"
{yyval.node = empty_stmt_node;;
break;}
case 298:
#line 1575 "./parse.y"
#line 1587 "./parse.y"
{ yyval.node = build_debugable_stmt (BUILD_LOCATION (), yyvsp[0].node); ;
break;}
case 299:
#line 1580 "./parse.y"
#line 1592 "./parse.y"
{ yyval.node = add_stmt_to_compound (NULL_TREE, NULL_TREE, yyvsp[0].node); ;
break;}
case 300:
#line 1582 "./parse.y"
#line 1594 "./parse.y"
{ yyval.node = add_stmt_to_compound (yyvsp[-2].node, NULL_TREE, yyvsp[0].node); ;
break;}
case 301:
#line 1584 "./parse.y"
#line 1596 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 302:
#line 1589 "./parse.y"
#line 1601 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-1].operator.location, 1, NULL_TREE); ;
break;}
case 303:
#line 1591 "./parse.y"
#line 1603 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-2].operator.location, 1, yyvsp[-1].node); ;
break;}
case 304:
#line 1593 "./parse.y"
#line 1605 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 305:
#line 1595 "./parse.y"
#line 1607 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 306:
#line 1600 "./parse.y"
#line 1612 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-1].operator.location, 0, NULL_TREE); ;
break;}
case 307:
#line 1602 "./parse.y"
#line 1614 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-2].operator.location, 0, yyvsp[-1].node); ;
break;}
case 308:
#line 1604 "./parse.y"
#line 1616 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 309:
#line 1606 "./parse.y"
#line 1618 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 310:
#line 1611 "./parse.y"
#line 1623 "./parse.y"
{ yyval.node = build_return (yyvsp[-1].operator.location, NULL_TREE); ;
break;}
case 311:
#line 1613 "./parse.y"
#line 1625 "./parse.y"
{ yyval.node = build_return (yyvsp[-2].operator.location, yyvsp[-1].node); ;
break;}
case 312:
#line 1615 "./parse.y"
#line 1627 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 313:
#line 1617 "./parse.y"
#line 1629 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 314:
#line 1622 "./parse.y"
#line 1634 "./parse.y"
{
yyval.node = build1 (THROW_EXPR, NULL_TREE, yyvsp[-1].node);
EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location;
;
break;}
case 315:
#line 1627 "./parse.y"
#line 1639 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 316:
#line 1629 "./parse.y"
#line 1641 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 317:
#line 1634 "./parse.y"
#line 1646 "./parse.y"
{
yyval.node = build (SYNCHRONIZED_EXPR, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
EXPR_WFL_LINECOL (yyval.node) =
......@@ -3978,56 +3945,56 @@ case 317:
;
break;}
case 318:
#line 1640 "./parse.y"
#line 1652 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 319:
#line 1642 "./parse.y"
#line 1654 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 320:
#line 1644 "./parse.y"
#line 1656 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 321:
#line 1646 "./parse.y"
#line 1658 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 322:
#line 1651 "./parse.y"
#line 1663 "./parse.y"
{
if ((1 << yyvsp[0].value) != ACC_SYNCHRONIZED)
fatal ("synchronized was '%d' - yyparse", (1 << yyvsp[0].value));
;
break;}
case 323:
#line 1659 "./parse.y"
#line 1671 "./parse.y"
{ yyval.node = build_try_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 324:
#line 1661 "./parse.y"
#line 1673 "./parse.y"
{ yyval.node = build_try_finally_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 325:
#line 1663 "./parse.y"
#line 1675 "./parse.y"
{ yyval.node = build_try_finally_statement
(yyvsp[-3].operator.location, build_try_statement (yyvsp[-3].operator.location,
yyvsp[-2].node, yyvsp[-1].node), yyvsp[0].node);
;
break;}
case 326:
#line 1668 "./parse.y"
#line 1680 "./parse.y"
{yyerror ("'{' expected"); DRECOVER (try_statement);;
break;}
case 328:
#line 1674 "./parse.y"
#line 1686 "./parse.y"
{
TREE_CHAIN (yyvsp[0].node) = yyvsp[-1].node;
yyval.node = yyvsp[0].node;
;
break;}
case 329:
#line 1682 "./parse.y"
#line 1694 "./parse.y"
{
java_method_add_stmt (current_function_decl, yyvsp[0].node);
exit_block ();
......@@ -4035,7 +4002,7 @@ case 329:
;
break;}
case 330:
#line 1690 "./parse.y"
#line 1702 "./parse.y"
{
/* We add a block to define a scope for
formal_parameter (CCBP). The formal parameter is
......@@ -4053,176 +4020,176 @@ case 330:
;
break;}
case 331:
#line 1706 "./parse.y"
#line 1718 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 332:
#line 1708 "./parse.y"
#line 1720 "./parse.y"
{yyerror ("Missing term or ')' expected"); DRECOVER (2);;
break;}
case 333:
#line 1710 "./parse.y"
#line 1722 "./parse.y"
{yyerror ("')' expected"); DRECOVER (1);;
break;}
case 334:
#line 1715 "./parse.y"
#line 1727 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 335:
#line 1717 "./parse.y"
#line 1729 "./parse.y"
{yyerror ("'{' expected"); RECOVER; ;
break;}
case 339:
#line 1729 "./parse.y"
#line 1741 "./parse.y"
{ yyval.node = build_this (yyvsp[0].operator.location); ;
break;}
case 340:
#line 1731 "./parse.y"
#line 1743 "./parse.y"
{yyval.node = yyvsp[-1].node;;
break;}
case 345:
#line 1740 "./parse.y"
#line 1752 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("named class literals"); ;
break;}
case 346:
#line 1742 "./parse.y"
#line 1754 "./parse.y"
{ yyval.node = build_class_ref (yyvsp[-2].node); ;
break;}
case 347:
#line 1744 "./parse.y"
#line 1756 "./parse.y"
{ yyval.node = build_class_ref (void_type_node); ;
break;}
case 348:
#line 1749 "./parse.y"
#line 1761 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("class literals"); ;
break;}
case 349:
#line 1751 "./parse.y"
#line 1763 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 350:
#line 1753 "./parse.y"
#line 1765 "./parse.y"
{yyerror ("'class' or 'this' expected" ); RECOVER;;
break;}
case 351:
#line 1755 "./parse.y"
#line 1767 "./parse.y"
{yyerror ("'class' expected" ); RECOVER;;
break;}
case 352:
#line 1757 "./parse.y"
#line 1769 "./parse.y"
{yyerror ("'class' expected" ); RECOVER;;
break;}
case 353:
#line 1762 "./parse.y"
#line 1774 "./parse.y"
{ yyval.node = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 354:
#line 1764 "./parse.y"
#line 1776 "./parse.y"
{ yyval.node = build_new_invocation (yyvsp[-2].node, NULL_TREE); ;
break;}
case 355:
#line 1769 "./parse.y"
#line 1781 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner class instance creation"); ;
break;}
case 356:
#line 1771 "./parse.y"
#line 1783 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner class instance creation"); ;
break;}
case 361:
#line 1780 "./parse.y"
#line 1792 "./parse.y"
{yyerror ("'(' expected"); DRECOVER(new_1);;
break;}
case 362:
#line 1782 "./parse.y"
#line 1794 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 363:
#line 1784 "./parse.y"
#line 1796 "./parse.y"
{yyerror ("')' or term expected"); RECOVER;;
break;}
case 364:
#line 1786 "./parse.y"
#line 1798 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 365:
#line 1788 "./parse.y"
#line 1800 "./parse.y"
{YYERROR_NOW; yyerror ("Identifier expected"); RECOVER;;
break;}
case 366:
#line 1790 "./parse.y"
#line 1802 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 369:
#line 1800 "./parse.y"
#line 1812 "./parse.y"
{
yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, NULL_TREE);
ctxp->formal_parameter_number = 1;
;
break;}
case 370:
#line 1805 "./parse.y"
#line 1817 "./parse.y"
{
ctxp->formal_parameter_number += 1;
yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyvsp[-2].node);
;
break;}
case 371:
#line 1810 "./parse.y"
#line 1822 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 372:
#line 1815 "./parse.y"
#line 1827 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ;
break;}
case 373:
#line 1817 "./parse.y"
#line 1829 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ;
break;}
case 374:
#line 1819 "./parse.y"
#line 1831 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, CURRENT_OSB (ctxp));;
break;}
case 375:
#line 1821 "./parse.y"
#line 1833 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, CURRENT_OSB (ctxp));;
break;}
case 376:
#line 1825 "./parse.y"
#line 1837 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("anonymous array"); ;
break;}
case 377:
#line 1827 "./parse.y"
#line 1839 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("anonymous array"); ;
break;}
case 378:
#line 1829 "./parse.y"
#line 1841 "./parse.y"
{yyerror ("'[' expected"); DRECOVER ("]");;
break;}
case 379:
#line 1831 "./parse.y"
#line 1843 "./parse.y"
{yyerror ("']' expected"); RECOVER;;
break;}
case 380:
#line 1836 "./parse.y"
#line 1848 "./parse.y"
{ yyval.node = build_tree_list (NULL_TREE, yyvsp[0].node); ;
break;}
case 381:
#line 1838 "./parse.y"
#line 1850 "./parse.y"
{ yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyval.node); ;
break;}
case 382:
#line 1843 "./parse.y"
#line 1855 "./parse.y"
{
EXPR_WFL_LINECOL (yyvsp[-1].node) = yyvsp[-2].operator.location;
yyval.node = yyvsp[-1].node;
;
break;}
case 383:
#line 1848 "./parse.y"
#line 1860 "./parse.y"
{yyerror ("']' expected"); RECOVER;;
break;}
case 384:
#line 1850 "./parse.y"
#line 1862 "./parse.y"
{
yyerror ("Missing term");
yyerror ("']' expected");
......@@ -4230,7 +4197,7 @@ case 384:
;
break;}
case 385:
#line 1859 "./parse.y"
#line 1871 "./parse.y"
{
int allocate = 0;
/* If not initialized, allocate memory for the osb
......@@ -4258,19 +4225,19 @@ case 385:
;
break;}
case 386:
#line 1885 "./parse.y"
#line 1897 "./parse.y"
{ CURRENT_OSB (ctxp)++; ;
break;}
case 387:
#line 1887 "./parse.y"
#line 1899 "./parse.y"
{ yyerror ("']' expected"); RECOVER;;
break;}
case 388:
#line 1892 "./parse.y"
#line 1904 "./parse.y"
{ yyval.node = make_qualified_primary (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ;
break;}
case 389:
#line 1896 "./parse.y"
#line 1908 "./parse.y"
{
tree super_wfl =
build_wfl_node (super_identifier_node);
......@@ -4279,19 +4246,19 @@ case 389:
;
break;}
case 390:
#line 1903 "./parse.y"
#line 1915 "./parse.y"
{yyerror ("Field expected"); DRECOVER (super_field_acces);;
break;}
case 391:
#line 1908 "./parse.y"
#line 1920 "./parse.y"
{ yyval.node = build_method_invocation (yyvsp[-2].node, NULL_TREE); ;
break;}
case 392:
#line 1910 "./parse.y"
#line 1922 "./parse.y"
{ yyval.node = build_method_invocation (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 393:
#line 1912 "./parse.y"
#line 1924 "./parse.y"
{
if (TREE_CODE (yyvsp[-4].node) == THIS_EXPR)
yyval.node = build_this_super_qualified_invocation
......@@ -4304,7 +4271,7 @@ case 393:
;
break;}
case 394:
#line 1923 "./parse.y"
#line 1935 "./parse.y"
{
if (TREE_CODE (yyvsp[-5].node) == THIS_EXPR)
yyval.node = build_this_super_qualified_invocation
......@@ -4317,121 +4284,121 @@ case 394:
;
break;}
case 395:
#line 1934 "./parse.y"
#line 1946 "./parse.y"
{
yyval.node = build_this_super_qualified_invocation
(0, yyvsp[-2].node, NULL_TREE, yyvsp[-4].operator.location, yyvsp[-3].operator.location);
;
break;}
case 396:
#line 1939 "./parse.y"
#line 1951 "./parse.y"
{
yyval.node = build_this_super_qualified_invocation
(0, yyvsp[-3].node, yyvsp[-1].node, yyvsp[-5].operator.location, yyvsp[-4].operator.location);
;
break;}
case 397:
#line 1948 "./parse.y"
#line 1960 "./parse.y"
{ yyerror ("'(' expected"); DRECOVER (method_invocation); ;
break;}
case 398:
#line 1950 "./parse.y"
#line 1962 "./parse.y"
{ yyerror ("'(' expected"); DRECOVER (method_invocation); ;
break;}
case 399:
#line 1955 "./parse.y"
#line 1967 "./parse.y"
{ yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 400:
#line 1957 "./parse.y"
#line 1969 "./parse.y"
{ yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 401:
#line 1959 "./parse.y"
#line 1971 "./parse.y"
{
yyerror ("Missing term and ']' expected");
DRECOVER(array_access);
;
break;}
case 402:
#line 1964 "./parse.y"
#line 1976 "./parse.y"
{
yyerror ("']' expected");
DRECOVER(array_access);
;
break;}
case 403:
#line 1969 "./parse.y"
#line 1981 "./parse.y"
{
yyerror ("Missing term and ']' expected");
DRECOVER(array_access);
;
break;}
case 404:
#line 1974 "./parse.y"
#line 1986 "./parse.y"
{
yyerror ("']' expected");
DRECOVER(array_access);
;
break;}
case 409:
#line 1989 "./parse.y"
#line 2001 "./parse.y"
{ yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ;
break;}
case 410:
#line 1994 "./parse.y"
#line 2006 "./parse.y"
{ yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ;
break;}
case 413:
#line 2001 "./parse.y"
#line 2013 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 414:
#line 2003 "./parse.y"
#line 2015 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 416:
#line 2006 "./parse.y"
#line 2018 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 417:
#line 2008 "./parse.y"
#line 2020 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 418:
#line 2013 "./parse.y"
#line 2025 "./parse.y"
{yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ;
break;}
case 419:
#line 2015 "./parse.y"
#line 2027 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 420:
#line 2020 "./parse.y"
#line 2032 "./parse.y"
{yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ;
break;}
case 421:
#line 2022 "./parse.y"
#line 2034 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 423:
#line 2028 "./parse.y"
#line 2040 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 424:
#line 2030 "./parse.y"
#line 2042 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 426:
#line 2033 "./parse.y"
#line 2045 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 427:
#line 2035 "./parse.y"
#line 2047 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 428:
#line 2040 "./parse.y"
#line 2052 "./parse.y"
{
tree type = yyvsp[-3].node;
while (CURRENT_OSB (ctxp)--)
......@@ -4441,17 +4408,17 @@ case 428:
;
break;}
case 429:
#line 2048 "./parse.y"
#line 2060 "./parse.y"
{ yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 430:
#line 2050 "./parse.y"
#line 2062 "./parse.y"
{ yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 431:
#line 2052 "./parse.y"
#line 2064 "./parse.y"
{
char *ptr;
const char *ptr;
while (CURRENT_OSB (ctxp)--)
obstack_1grow (&temporary_obstack, '[');
ctxp->osb_depth--;
......@@ -4464,11 +4431,11 @@ case 431:
;
break;}
case 432:
#line 2065 "./parse.y"
#line 2077 "./parse.y"
{yyerror ("']' expected, invalid type expression");;
break;}
case 433:
#line 2067 "./parse.y"
#line 2079 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid type expression"); RECOVER;
......@@ -4476,243 +4443,243 @@ case 433:
;
break;}
case 434:
#line 2073 "./parse.y"
#line 2085 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 435:
#line 2075 "./parse.y"
#line 2087 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 436:
#line 2077 "./parse.y"
#line 2089 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 438:
#line 2083 "./parse.y"
#line 2095 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token),
yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 439:
#line 2088 "./parse.y"
#line 2100 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 440:
#line 2093 "./parse.y"
#line 2105 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 441:
#line 2098 "./parse.y"
#line 2110 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 442:
#line 2100 "./parse.y"
#line 2112 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 443:
#line 2102 "./parse.y"
#line 2114 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 445:
#line 2108 "./parse.y"
#line 2120 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 446:
#line 2113 "./parse.y"
#line 2125 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 447:
#line 2118 "./parse.y"
#line 2130 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 448:
#line 2120 "./parse.y"
#line 2132 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 450:
#line 2126 "./parse.y"
#line 2138 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 451:
#line 2131 "./parse.y"
#line 2143 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 452:
#line 2136 "./parse.y"
#line 2148 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 453:
#line 2141 "./parse.y"
#line 2153 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 454:
#line 2143 "./parse.y"
#line 2155 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 455:
#line 2145 "./parse.y"
#line 2157 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 457:
#line 2151 "./parse.y"
#line 2163 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 458:
#line 2156 "./parse.y"
#line 2168 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 459:
#line 2161 "./parse.y"
#line 2173 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 460:
#line 2166 "./parse.y"
#line 2178 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 461:
#line 2171 "./parse.y"
#line 2183 "./parse.y"
{ yyval.node = build_binop (INSTANCEOF_EXPR, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 462:
#line 2173 "./parse.y"
#line 2185 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 463:
#line 2175 "./parse.y"
#line 2187 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 464:
#line 2177 "./parse.y"
#line 2189 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 465:
#line 2179 "./parse.y"
#line 2191 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 466:
#line 2181 "./parse.y"
#line 2193 "./parse.y"
{yyerror ("Invalid reference type"); RECOVER;;
break;}
case 468:
#line 2187 "./parse.y"
#line 2199 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 469:
#line 2192 "./parse.y"
#line 2204 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 470:
#line 2197 "./parse.y"
#line 2209 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 471:
#line 2199 "./parse.y"
#line 2211 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 473:
#line 2205 "./parse.y"
#line 2217 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 474:
#line 2210 "./parse.y"
#line 2222 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 476:
#line 2216 "./parse.y"
#line 2228 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 477:
#line 2221 "./parse.y"
#line 2233 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 479:
#line 2227 "./parse.y"
#line 2239 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 480:
#line 2232 "./parse.y"
#line 2244 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 482:
#line 2238 "./parse.y"
#line 2250 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 483:
#line 2243 "./parse.y"
#line 2255 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 485:
#line 2249 "./parse.y"
#line 2261 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 486:
#line 2254 "./parse.y"
#line 2266 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 488:
#line 2260 "./parse.y"
#line 2272 "./parse.y"
{
yyval.node = build (CONDITIONAL_EXPR, NULL_TREE, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);
EXPR_WFL_LINECOL (yyval.node) = yyvsp[-3].operator.location;
;
break;}
case 489:
#line 2265 "./parse.y"
#line 2277 "./parse.y"
{
YYERROR_NOW;
yyerror ("Missing term");
......@@ -4720,19 +4687,19 @@ case 489:
;
break;}
case 490:
#line 2271 "./parse.y"
#line 2283 "./parse.y"
{yyerror ("Missing term"); DRECOVER (2);;
break;}
case 491:
#line 2273 "./parse.y"
#line 2285 "./parse.y"
{yyerror ("Missing term"); DRECOVER (3);;
break;}
case 494:
#line 2283 "./parse.y"
#line 2295 "./parse.y"
{ yyval.node = build_assignment (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 495:
#line 2285 "./parse.y"
#line 2297 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Missing term");
......@@ -4741,7 +4708,7 @@ case 495:
break;}
}
/* the action file gets copied in in place of this dollarsign */
#line 542 "/usr/lib/bison.simple"
#line 498 "/usr/local/gnu/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
......@@ -4936,32 +4903,8 @@ yyerrhandle:
yystate = yyn;
goto yynewstate;
yyacceptlab:
/* YYACCEPT comes here. */
if (yyfree_stacks)
{
free (yyss);
free (yyvs);
#ifdef YYLSP_NEEDED
free (yyls);
#endif
}
return 0;
yyabortlab:
/* YYABORT comes here. */
if (yyfree_stacks)
{
free (yyss);
free (yyvs);
#ifdef YYLSP_NEEDED
free (yyls);
#endif
}
return 1;
}
#line 2311 "./parse.y"
#line 2323 "./parse.y"
......@@ -5069,7 +5012,7 @@ java_pop_parser_context (generate)
static tree
parse_jdk1_1_error (msg)
char *msg;
const char *msg;
{
sorry (": `%s' JDK1.1(TM) feature", msg);
java_error_count++;
......@@ -5080,11 +5023,11 @@ static int do_warning = 0;
void
yyerror (msg)
char *msg;
const char *msg;
{
static java_lc elc;
static int prev_lineno;
static char *prev_msg;
static const char *prev_msg;
int save_lineno;
char *remainder, *code_from_source;
......@@ -5334,7 +5277,7 @@ java_accstring_lookup (flags)
static void
classitf_redefinition_error (context, id, decl, cl)
char *context;
const char *context;
tree id, decl, cl;
{
parse_error_context (cl, "%s `%s' already defined in %s:%d",
......@@ -5348,7 +5291,7 @@ variable_redefinition_error (context, name, type, line)
tree context, name, type;
int line;
{
char *type_name;
const char *type_name;
/* Figure a proper name for type. We might haven't resolved it */
if (TREE_CODE (type) == POINTER_TYPE && !TREE_TYPE (type))
......@@ -5368,7 +5311,7 @@ build_array_from_name (type, type_wfl, name, ret_name)
tree type, type_wfl, name, *ret_name;
{
int more_dims = 0;
char *string;
const char *string;
/* Eventually get more dims */
string = IDENTIFIER_POINTER (name);
......@@ -5419,7 +5362,7 @@ static tree
build_unresolved_array_type (type_or_wfl)
tree type_or_wfl;
{
char *ptr;
const char *ptr;
/* TYPE_OR_WFL might be an array on a resolved type. In this case,
just create a array type */
......@@ -5446,7 +5389,7 @@ build_unresolved_array_type (type_or_wfl)
static void
check_modifiers (message, value, mask)
char *message;
const char *message;
int value;
int mask;
{
......@@ -5507,7 +5450,7 @@ check_class_interface_creation (is_interface, flags, raw_name, qualified_name, d
/* If public, file name should match class/interface name */
if (flags & ACC_PUBLIC)
{
char *f;
const char *f;
/* Contains OS dependent assumption on path separator. FIXME */
for (f = &input_filename [strlen (input_filename)];
......@@ -6803,8 +6746,8 @@ static tree
resolve_class (class_type, decl, cl)
tree class_type, decl, cl;
{
char *name = IDENTIFIER_POINTER (TYPE_NAME (class_type));
char *base = name;
const char *name = IDENTIFIER_POINTER (TYPE_NAME (class_type));
const char *base = name;
tree resolved_type = TREE_TYPE (class_type);
tree resolved_type_decl;
......@@ -7020,9 +6963,9 @@ resolve_no_layout (name, cl)
/* Called when reporting errors. Skip leader '[' in a complex array
type description that failed to be resolved. */
static char *
static const char *
purify_type_name (name)
char *name;
const char *name;
{
while (*name && *name == '[')
name++;
......@@ -7035,7 +6978,7 @@ static void
complete_class_report_errors (dep)
jdep *dep;
{
char *name;
const char *name;
if (!JDEP_WFL (dep))
return;
......@@ -7108,11 +7051,11 @@ java_check_final ()
DECL is a constructor, use the class name instead of the form
<init> */
static char *
static const char *
get_printable_method_name (decl)
tree decl;
{
char *to_return;
const char *to_return;
tree name = NULL_TREE;
if (DECL_CONSTRUCTOR_P (decl))
......@@ -7689,7 +7632,7 @@ find_in_imports (class_type)
static int
note_possible_classname (name, len)
char *name;
const char *name;
int len;
{
tree node;
......@@ -7714,7 +7657,7 @@ read_import_dir (wfl)
tree wfl;
{
tree package_id = EXPR_WFL_NODE (wfl);
char *package_name = IDENTIFIER_POINTER (package_id);
const char *package_name = IDENTIFIER_POINTER (package_id);
int package_length = IDENTIFIER_LENGTH (package_id);
DIR *dirp = NULL;
JCF *saved_jcf = current_jcf;
......@@ -7734,7 +7677,7 @@ read_import_dir (wfl)
for (entry = jcf_path_start (); entry != NULL; entry = jcf_path_next (entry))
{
char *entry_name = jcf_path_name (entry);
const char *entry_name = jcf_path_name (entry);
int entry_length = strlen (entry_name);
if (jcf_path_is_zipfile (entry))
{
......@@ -7758,7 +7701,7 @@ read_import_dir (wfl)
for (k = 0; k < zipf->count; k++, zipd = ZIPDIR_NEXT (zipd))
{
char *current_entry = ZIPDIR_FILENAME (zipd);
const char *current_entry = ZIPDIR_FILENAME (zipd);
int current_entry_len = zipd->filename_length;
if (current_entry_len >= BUFFER_LENGTH (filename)
......@@ -7790,7 +7733,7 @@ read_import_dir (wfl)
for (;;)
{
int len;
char *d_name;
const char *d_name;
struct dirent *direntp = readdir (dirp);
if (!direntp)
break;
......@@ -7846,7 +7789,7 @@ find_in_imports_on_demand (class_type)
for (import = ctxp->import_demand_list; import; import = TREE_CHAIN (import))
{
char *id_name;
const char *id_name;
obstack_grow (&temporary_obstack,
IDENTIFIER_POINTER (EXPR_WFL_NODE (TREE_PURPOSE (import))),
IDENTIFIER_LENGTH (EXPR_WFL_NODE (TREE_PURPOSE (import))));
......@@ -7904,7 +7847,7 @@ resolve_package (pkg, next)
{
tree current;
tree type_name = NULL_TREE;
char *name = IDENTIFIER_POINTER (EXPR_WFL_NODE (pkg));
const char *name = IDENTIFIER_POINTER (EXPR_WFL_NODE (pkg));
/* The trick is to determine when the package name stops and were
the name of something contained in the package starts. Then we
......@@ -7963,11 +7906,11 @@ resolve_package (pkg, next)
static tree
lookup_package_type_and_set_next (name, len, next)
char *name;
const char *name;
int len;
tree *next;
{
char *ptr;
const char *ptr;
tree type_name = lookup_package_type (name, len);
if (!type_name)
......@@ -7984,11 +7927,11 @@ lookup_package_type_and_set_next (name, len, next)
static tree
lookup_package_type (name, from)
char *name;
const char *name;
int from;
{
char subname [128];
char *sub = &name[from+1];
const char *sub = &name[from+1];
while (*sub != '.' && *sub)
sub++;
strncpy (subname, name, sub-name);
......@@ -8454,7 +8397,7 @@ java_layout_classes ()
/* Expand all methods in all registered classes. */
void
static void
java_complete_expand_methods ()
{
tree current;
......@@ -8652,7 +8595,7 @@ fix_constructors (mdecl)
if (verify_constructor_super ())
{
tree sclass_decl = TYPE_NAME (CLASSTYPE_SUPER (current_class));
char *n = IDENTIFIER_POINTER (DECL_NAME (sclass_decl));
const char *n = IDENTIFIER_POINTER (DECL_NAME (sclass_decl));
parse_error_context (lookup_cl (TYPE_NAME (current_class)),
"No constructor matching `%s()' found in "
"class `%s'", n, n);
......@@ -8733,7 +8676,7 @@ verify_constructor_super ()
/* Expand finals. */
void
static void
java_expand_finals ()
{
}
......@@ -9474,7 +9417,7 @@ static void
check_deprecation (wfl, decl)
tree wfl, decl;
{
char *file = DECL_SOURCE_FILE (decl);
const char *file = DECL_SOURCE_FILE (decl);
/* Complain if the field is deprecated and the file it was defined
in isn't compiled at the same time the file which contains its
use is */
......@@ -10006,7 +9949,7 @@ lookup_method_invoke (lc, cl, class, name, arg_list)
{
tree atl = end_params_node; /* Arg Type List */
tree method, signature, list, node;
char *candidates; /* Used for error report */
const char *candidates; /* Used for error report */
/* Fix the arguments */
for (node = arg_list; node; node = TREE_CHAIN (node))
......@@ -11482,7 +11425,7 @@ maybe_build_primttype_type_ref (rhs, wfl)
&& DECL_NAME (n) == TYPE_identifier_node
&& rhs_type == class_ptr_type)
{
char *self_name = IDENTIFIER_POINTER (EXPR_WFL_NODE (wfl));
const char *self_name = IDENTIFIER_POINTER (EXPR_WFL_NODE (wfl));
if (!strncmp (self_name, "java.lang.", 10))
to_return = build_primtype_type_ref (self_name);
}
......@@ -12376,11 +12319,11 @@ patch_binop (node, wfl_op1, wfl_op2)
static tree
do_merge_string_cste (cste, string, string_len, after)
tree cste;
char *string;
const char *string;
int string_len, after;
{
int len = TREE_STRING_LENGTH (cste) + string_len;
char *old = TREE_STRING_POINTER (cste);
const char *old = TREE_STRING_POINTER (cste);
TREE_STRING_LENGTH (cste) = len;
TREE_STRING_POINTER (cste) = obstack_alloc (expression_obstack, len+1);
if (after)
......@@ -12412,11 +12355,11 @@ merge_string_cste (op1, op2, after)
/* Reasonable integer constant can be treated right away */
if (TREE_CODE (op2) == INTEGER_CST && !TREE_CONSTANT_OVERFLOW (op2))
{
static char *boolean_true = "true";
static char *boolean_false = "false";
static char *null_pointer = "null";
static const char *boolean_true = "true";
static const char *boolean_false = "false";
static const char *null_pointer = "null";
char ch[3];
char *string;
const char *string;
if (op2 == boolean_true_node)
string = boolean_true;
......@@ -12863,7 +12806,6 @@ patch_cast (node, wfl_operator)
/* Check on cast that are proven correct at compile time */
if (JNUMERIC_TYPE_P (cast_type) && JNUMERIC_TYPE_P (op_type))
{
static tree convert_narrow ();
/* Same type */
if (cast_type == op_type)
return node;
......@@ -13256,7 +13198,7 @@ array_constructor_check_entry (type, entry)
/* Check and report errors */
if (!new_value)
{
char *msg = (!valid_cast_to_p (type_value, type) ?
const char *msg = (!valid_cast_to_p (type_value, type) ?
"Can't" : "Explicit cast needed to");
if (!array_type_string)
array_type_string = strdup (lang_printable_name (type, 1));
......
gcc/java/parse.h
......@@ -659,7 +659,7 @@ void java_check_final PROTO ((void));
void java_layout_classes PROTO ((void));
tree java_method_add_stmt PROTO ((tree, tree));
void java_expand_switch PROTO ((tree));
int java_report_errors PROTO (());
int java_report_errors PROTO ((void));
extern tree do_resolve_class PROTO ((tree, tree, tree));
#endif
char *java_get_line_col PROTO ((char *, int, int));
......@@ -674,6 +674,6 @@ extern void java_parser_context_restore_global PROTO ((void));
int yyparse PROTO ((void));
extern int java_parse PROTO ((void));
int yylex ();
void yyerror PROTO ((char *));
void yyerror PROTO ((const char *));
extern void java_expand_classes PROTO ((void));
#endif
gcc/java/parse.y
......@@ -72,9 +72,9 @@ definitions and other extensions. */
/* Local function prototypes */
static char *java_accstring_lookup PROTO ((int));
static void classitf_redefinition_error PROTO ((char *,tree, tree, tree));
static void classitf_redefinition_error PROTO ((const char *,tree, tree, tree));
static void variable_redefinition_error PROTO ((tree, tree, tree, int));
static void check_modifiers PROTO ((char *, int, int));
static void check_modifiers PROTO ((const char *, int, int));
static tree create_class PROTO ((int, tree, tree, tree));
static tree create_interface PROTO ((int, tree, tree));
static tree find_field PROTO ((tree, tree));
......@@ -93,7 +93,7 @@ static tree method_declarator PROTO ((tree, tree));
static void parse_warning_context PVPROTO ((tree cl, const char *msg, ...))
ATTRIBUTE_PRINTF_2;
static void issue_warning_error_from_context PROTO ((tree, const char *msg, va_list));
static tree parse_jdk1_1_error PROTO ((char *));
static tree parse_jdk1_1_error PROTO ((const char *));
static void complete_class_report_errors PROTO ((jdep *));
static int process_imports PROTO ((void));
static void read_import_dir PROTO ((tree));
......@@ -101,8 +101,8 @@ static int find_in_imports_on_demand PROTO ((tree));
static int find_in_imports PROTO ((tree));
static int check_pkg_class_access PROTO ((tree, tree));
static tree resolve_package PROTO ((tree, tree *));
static tree lookup_package_type PROTO ((char *, int));
static tree lookup_package_type_and_set_next PROTO ((char *, int, tree *));
static tree lookup_package_type PROTO ((const char *, int));
static tree lookup_package_type_and_set_next PROTO ((const char *, int, tree *));
static tree resolve_class PROTO ((tree, tree, tree));
static void declare_local_variables PROTO ((int, tree, tree));
static void source_start_java_method PROTO ((tree));
......@@ -215,16 +215,16 @@ static int check_thrown_exceptions_do PROTO ((tree));
static void purge_unchecked_exceptions PROTO ((tree));
static void check_throws_clauses PROTO ((tree, tree, tree));
static void finish_method_declaration PROTO ((tree));
static tree build_super_invocation PROTO (());
static tree build_super_invocation PROTO ((void));
static int verify_constructor_circularity PROTO ((tree, tree));
static char *constructor_circularity_msg PROTO ((tree, tree));
static tree build_this_super_qualified_invocation PROTO ((int, tree, tree,
int, int));
static char *get_printable_method_name PROTO ((tree));
static const char *get_printable_method_name PROTO ((tree));
static tree patch_conditional_expr PROTO ((tree, tree, tree));
static void maybe_generate_finit PROTO (());
static void maybe_generate_finit PROTO ((void));
static void fix_constructors PROTO ((tree));
static int verify_constructor_super PROTO (());
static int verify_constructor_super PROTO ((void));
static tree create_artificial_method PROTO ((tree, int, tree, tree, tree));
static void start_artificial_method_body PROTO ((tree));
static void end_artificial_method_body PROTO ((tree));
......@@ -240,11 +240,23 @@ static tree build_new_array_init PROTO ((int, tree));
static tree patch_new_array_init PROTO ((tree, tree));
static tree maybe_build_array_element_wfl PROTO ((tree));
static int array_constructor_check_entry PROTO ((tree, tree));
static char *purify_type_name PROTO ((char *));
static const char *purify_type_name PROTO ((const char *));
static tree fold_constant_for_init PROTO ((tree, tree));
static tree strip_out_static_field_access_decl PROTO ((tree));
static jdeplist *reverse_jdep_list PROTO ((struct parser_ctxt *));
static void static_ref_err PROTO ((tree, tree, tree));
static void parser_add_interface PROTO ((tree, tree, tree));
static void add_superinterfaces PROTO ((tree, tree));
static tree jdep_resolve_class PROTO ((jdep *));
static int note_possible_classname PROTO ((const char *, int));
static void java_complete_expand_methods PROTO ((void));
static void java_expand_finals PROTO ((void));
static tree cut_identifier_in_qualified PROTO ((tree));
static tree java_stabilize_reference PROTO ((tree));
static tree do_unary_numeric_promotion PROTO ((tree));
static char * operator_string PROTO ((tree));
static tree do_merge_string_cste PROTO ((tree, const char *, int, int));
static tree merge_string_cste PROTO ((tree, tree, int));
/* Number of error found so far. */
int java_error_count;
......@@ -583,7 +595,7 @@ single_type_import_declaration:
{
tree name = EXPR_WFL_NODE ($2), node, last_name;
int i = IDENTIFIER_LENGTH (name)-1;
char *last = &IDENTIFIER_POINTER (name)[i];
const char *last = &IDENTIFIER_POINTER (name)[i];
while (last != IDENTIFIER_POINTER (name))
{
if (last [0] == '.')
......@@ -2050,7 +2062,7 @@ cast_expression: /* Error handling here is potentially weak */
{ $$ = build_cast ($1.location, $2, $4); }
| OP_TK name dims CP_TK unary_expression_not_plus_minus
{
char *ptr;
const char *ptr;
while (CURRENT_OSB (ctxp)--)
obstack_1grow (&temporary_obstack, '[');
ctxp->osb_depth--;
......@@ -2415,7 +2427,7 @@ java_pop_parser_context (generate)
static tree
parse_jdk1_1_error (msg)
char *msg;
const char *msg;
{
sorry (": `%s' JDK1.1(TM) feature", msg);
java_error_count++;
......@@ -2426,11 +2438,11 @@ static int do_warning = 0;
void
yyerror (msg)
char *msg;
const char *msg;
{
static java_lc elc;
static int prev_lineno;
static char *prev_msg;
static const char *prev_msg;
int save_lineno;
char *remainder, *code_from_source;
......@@ -2680,7 +2692,7 @@ java_accstring_lookup (flags)
static void
classitf_redefinition_error (context, id, decl, cl)
char *context;
const char *context;
tree id, decl, cl;
{
parse_error_context (cl, "%s `%s' already defined in %s:%d",
......@@ -2694,7 +2706,7 @@ variable_redefinition_error (context, name, type, line)
tree context, name, type;
int line;
{
char *type_name;
const char *type_name;
/* Figure a proper name for type. We might haven't resolved it */
if (TREE_CODE (type) == POINTER_TYPE && !TREE_TYPE (type))
......@@ -2714,7 +2726,7 @@ build_array_from_name (type, type_wfl, name, ret_name)
tree type, type_wfl, name, *ret_name;
{
int more_dims = 0;
char *string;
const char *string;
/* Eventually get more dims */
string = IDENTIFIER_POINTER (name);
......@@ -2765,7 +2777,7 @@ static tree
build_unresolved_array_type (type_or_wfl)
tree type_or_wfl;
{
char *ptr;
const char *ptr;
/* TYPE_OR_WFL might be an array on a resolved type. In this case,
just create a array type */
......@@ -2792,7 +2804,7 @@ build_unresolved_array_type (type_or_wfl)
static void
check_modifiers (message, value, mask)
char *message;
const char *message;
int value;
int mask;
{
......@@ -2853,7 +2865,7 @@ check_class_interface_creation (is_interface, flags, raw_name, qualified_name, d
/* If public, file name should match class/interface name */
if (flags & ACC_PUBLIC)
{
char *f;
const char *f;
/* Contains OS dependent assumption on path separator. FIXME */
for (f = &input_filename [strlen (input_filename)];
......@@ -4149,8 +4161,8 @@ static tree
resolve_class (class_type, decl, cl)
tree class_type, decl, cl;
{
char *name = IDENTIFIER_POINTER (TYPE_NAME (class_type));
char *base = name;
const char *name = IDENTIFIER_POINTER (TYPE_NAME (class_type));
const char *base = name;
tree resolved_type = TREE_TYPE (class_type);
tree resolved_type_decl;
......@@ -4366,9 +4378,9 @@ resolve_no_layout (name, cl)
/* Called when reporting errors. Skip leader '[' in a complex array
type description that failed to be resolved. */
static char *
static const char *
purify_type_name (name)
char *name;
const char *name;
{
while (*name && *name == '[')
name++;
......@@ -4381,7 +4393,7 @@ static void
complete_class_report_errors (dep)
jdep *dep;
{
char *name;
const char *name;
if (!JDEP_WFL (dep))
return;
......@@ -4454,11 +4466,11 @@ java_check_final ()
DECL is a constructor, use the class name instead of the form
<init> */
static char *
static const char *
get_printable_method_name (decl)
tree decl;
{
char *to_return;
const char *to_return;
tree name = NULL_TREE;
if (DECL_CONSTRUCTOR_P (decl))
......@@ -5035,7 +5047,7 @@ find_in_imports (class_type)
static int
note_possible_classname (name, len)
char *name;
const char *name;
int len;
{
tree node;
......@@ -5060,7 +5072,7 @@ read_import_dir (wfl)
tree wfl;
{
tree package_id = EXPR_WFL_NODE (wfl);
char *package_name = IDENTIFIER_POINTER (package_id);
const char *package_name = IDENTIFIER_POINTER (package_id);
int package_length = IDENTIFIER_LENGTH (package_id);
DIR *dirp = NULL;
JCF *saved_jcf = current_jcf;
......@@ -5080,7 +5092,7 @@ read_import_dir (wfl)
for (entry = jcf_path_start (); entry != NULL; entry = jcf_path_next (entry))
{
char *entry_name = jcf_path_name (entry);
const char *entry_name = jcf_path_name (entry);
int entry_length = strlen (entry_name);
if (jcf_path_is_zipfile (entry))
{
......@@ -5104,7 +5116,7 @@ read_import_dir (wfl)
for (k = 0; k < zipf->count; k++, zipd = ZIPDIR_NEXT (zipd))
{
char *current_entry = ZIPDIR_FILENAME (zipd);
const char *current_entry = ZIPDIR_FILENAME (zipd);
int current_entry_len = zipd->filename_length;
if (current_entry_len >= BUFFER_LENGTH (filename)
......@@ -5136,7 +5148,7 @@ read_import_dir (wfl)
for (;;)
{
int len;
char *d_name;
const char *d_name;
struct dirent *direntp = readdir (dirp);
if (!direntp)
break;
......@@ -5192,7 +5204,7 @@ find_in_imports_on_demand (class_type)
for (import = ctxp->import_demand_list; import; import = TREE_CHAIN (import))
{
char *id_name;
const char *id_name;
obstack_grow (&temporary_obstack,
IDENTIFIER_POINTER (EXPR_WFL_NODE (TREE_PURPOSE (import))),
IDENTIFIER_LENGTH (EXPR_WFL_NODE (TREE_PURPOSE (import))));
......@@ -5250,7 +5262,7 @@ resolve_package (pkg, next)
{
tree current;
tree type_name = NULL_TREE;
char *name = IDENTIFIER_POINTER (EXPR_WFL_NODE (pkg));
const char *name = IDENTIFIER_POINTER (EXPR_WFL_NODE (pkg));
/* The trick is to determine when the package name stops and were
the name of something contained in the package starts. Then we
......@@ -5309,11 +5321,11 @@ resolve_package (pkg, next)
static tree
lookup_package_type_and_set_next (name, len, next)
char *name;
const char *name;
int len;
tree *next;
{
char *ptr;
const char *ptr;
tree type_name = lookup_package_type (name, len);
if (!type_name)
......@@ -5330,11 +5342,11 @@ lookup_package_type_and_set_next (name, len, next)
static tree
lookup_package_type (name, from)
char *name;
const char *name;
int from;
{
char subname [128];
char *sub = &name[from+1];
const char *sub = &name[from+1];
while (*sub != '.' && *sub)
sub++;
strncpy (subname, name, sub-name);
......@@ -5800,7 +5812,7 @@ java_layout_classes ()
/* Expand all methods in all registered classes. */
void
static void
java_complete_expand_methods ()
{
tree current;
......@@ -5998,7 +6010,7 @@ fix_constructors (mdecl)
if (verify_constructor_super ())
{
tree sclass_decl = TYPE_NAME (CLASSTYPE_SUPER (current_class));
char *n = IDENTIFIER_POINTER (DECL_NAME (sclass_decl));
const char *n = IDENTIFIER_POINTER (DECL_NAME (sclass_decl));
parse_error_context (lookup_cl (TYPE_NAME (current_class)),
"No constructor matching `%s()' found in "
"class `%s'", n, n);
......@@ -6079,7 +6091,7 @@ verify_constructor_super ()
/* Expand finals. */
void
static void
java_expand_finals ()
{
}
......@@ -6820,7 +6832,7 @@ static void
check_deprecation (wfl, decl)
tree wfl, decl;
{
char *file = DECL_SOURCE_FILE (decl);
const char *file = DECL_SOURCE_FILE (decl);
/* Complain if the field is deprecated and the file it was defined
in isn't compiled at the same time the file which contains its
use is */
......@@ -7352,7 +7364,7 @@ lookup_method_invoke (lc, cl, class, name, arg_list)
{
tree atl = end_params_node; /* Arg Type List */
tree method, signature, list, node;
char *candidates; /* Used for error report */
const char *candidates; /* Used for error report */
/* Fix the arguments */
for (node = arg_list; node; node = TREE_CHAIN (node))
......@@ -8828,7 +8840,7 @@ maybe_build_primttype_type_ref (rhs, wfl)
&& DECL_NAME (n) == TYPE_identifier_node
&& rhs_type == class_ptr_type)
{
char *self_name = IDENTIFIER_POINTER (EXPR_WFL_NODE (wfl));
const char *self_name = IDENTIFIER_POINTER (EXPR_WFL_NODE (wfl));
if (!strncmp (self_name, "java.lang.", 10))
to_return = build_primtype_type_ref (self_name);
}
......@@ -9722,11 +9734,11 @@ patch_binop (node, wfl_op1, wfl_op2)
static tree
do_merge_string_cste (cste, string, string_len, after)
tree cste;
char *string;
const char *string;
int string_len, after;
{
int len = TREE_STRING_LENGTH (cste) + string_len;
char *old = TREE_STRING_POINTER (cste);
const char *old = TREE_STRING_POINTER (cste);
TREE_STRING_LENGTH (cste) = len;
TREE_STRING_POINTER (cste) = obstack_alloc (expression_obstack, len+1);
if (after)
......@@ -9758,11 +9770,11 @@ merge_string_cste (op1, op2, after)
/* Reasonable integer constant can be treated right away */
if (TREE_CODE (op2) == INTEGER_CST && !TREE_CONSTANT_OVERFLOW (op2))
{
static char *boolean_true = "true";
static char *boolean_false = "false";
static char *null_pointer = "null";
static const char *boolean_true = "true";
static const char *boolean_false = "false";
static const char *null_pointer = "null";
char ch[3];
char *string;
const char *string;
if (op2 == boolean_true_node)
string = boolean_true;
......@@ -10209,7 +10221,6 @@ patch_cast (node, wfl_operator)
/* Check on cast that are proven correct at compile time */
if (JNUMERIC_TYPE_P (cast_type) && JNUMERIC_TYPE_P (op_type))
{
static tree convert_narrow ();
/* Same type */
if (cast_type == op_type)
return node;
......@@ -10602,7 +10613,7 @@ array_constructor_check_entry (type, entry)
/* Check and report errors */
if (!new_value)
{
char *msg = (!valid_cast_to_p (type_value, type) ?
const char *msg = (!valid_cast_to_p (type_value, type) ?
"Can't" : "Explicit cast needed to");
if (!array_type_string)
array_type_string = strdup (lang_printable_name (type, 1));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment