diff options
author | Ian Lance Taylor <iant@google.com> | 2008-06-21 21:17:40 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2008-06-21 21:17:40 +0000 |
commit | c0ed0531e5b067d780d4a6444027c5b4a399c027 (patch) | |
tree | 2e9690d6203b5ccd3ed8f56a19182d4c4d026c98 /gcc/java | |
parent | 14e5606b70a73e4e826ff7ccbeff67ab465e1fbc (diff) | |
download | gcc-c0ed0531e5b067d780d4a6444027c5b4a399c027.zip gcc-c0ed0531e5b067d780d4a6444027c5b4a399c027.tar.gz gcc-c0ed0531e5b067d780d4a6444027c5b4a399c027.tar.bz2 |
tree.h (enum tree_code): Include all-tree.def, not tree.def.
* tree.h (enum tree_code): Include all-tree.def, not tree.def.
Define END_OF_BASE_TREE_CODES around inclusion.
* tree.c (tree_code_type): New global array.
(tree_code_length, tree_code_name): Likewise.
* Makefile.in (TREE_H): Add all-tree.def, c-common.def, and
$(lang_tree_files).
(all-tree.def, s-alltree): New targets.
(gencheck.h, s-gencheck): Remove.
(tree.o): Depend upon all-tree.def.
(build/gencheck.o): Remove gencheck.h dependency.
(mostlyclean): Don't remove gencheck.h.
* c-common.h (enum c_tree_code): Remove.
* c-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* gencheck.c (tree_codes): Include all-tree.def, rather than
tree.def, c-common.def, and gencheck.h. Undefined DEFTREECODE
after it is used.
* tree-browser.c (tb_tree_codes): Include all-tree.def, rather
than tree.def.
* cp/cp-tree.h (enum cplus_tree_code): Remove.
(operator_name_info): Size to MAX_TREE_CODES.
(assignment_operator_name_info): Likewise.
* cp/cp-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* cp/lex.c (operator_name_info): Size to MAX_TREE_CODES.
(assignment_operator_name_info): Likewise.
* cp/decl.c (grok_op_properties): Change LAST_CPLUS_TREE_CODE to
MAX_TREE_CODES.
* cp/mangle.c (write_expression): Likewise.
* cp/Make-lang.in (CXX_TREE_H): Remove cp/cp-tree.def.
* fortran/f95-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* java/java-tree.h (enum java_tree_code): Remove.
* java/lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* java/Make-lang.in (JAVA_TREE_H): Remove java/java-tree.def.
* objc/objc-act.h (enum objc_tree_code): Remove.
* objc/objc-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* objcp/objcp-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* ada/ada-tree.h (enum gnat_tree_code): Remove.
* ada/Make-lang.in (ADA_TREE_H): Remove ada/ada-tre.def.
* ada/misc.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
From-SVN: r137006
Diffstat (limited to 'gcc/java')
-rw-r--r-- | gcc/java/Make-lang.in | 2 | ||||
-rw-r--r-- | gcc/java/java-tree.h | 9 | ||||
-rw-r--r-- | gcc/java/lang.c | 37 |
3 files changed, 1 insertions, 47 deletions
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index e96ca14..d1201cd 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -242,7 +242,7 @@ java.stagefeedback: stageprofile-start # # .o:.h dependencies. -JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h java/java-tree.def +JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \ java/jcf-dump.c java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def \ diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 65a7589..a046a0f 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -30,15 +30,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "hashtab.h" -/* Java language-specific tree codes. */ -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) SYM, -enum java_tree_code { - __DUMMY = LAST_AND_UNUSED_TREE_CODE, -#include "java-tree.def" - LAST_JAVA_TREE_CODE -}; -#undef DEFTREECODE - struct JCF; /* Usage of TREE_LANG_FLAG_?: diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 71f2478..c259da4 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -69,43 +69,6 @@ static enum classify_record java_classify_record (tree type); # define TARGET_OBJECT_SUFFIX ".o" #endif -/* Table indexed by tree code giving a string containing a character - classifying the tree code. Possibilities are - t, d, s, c, r, <, 1 and 2. See java/java-tree.def for details. */ - -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, - -const enum tree_code_class tree_code_type[] = { -#include "tree.def" - tcc_exceptional, -#include "java-tree.def" -}; -#undef DEFTREECODE - -/* Table indexed by tree code giving number of expression - operands beyond the fixed part of the node structure. - Not used for types or decls. */ - -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, - -const unsigned char tree_code_length[] = { -#include "tree.def" - 0, -#include "java-tree.def" -}; -#undef DEFTREECODE - -/* Names of tree components. - Used for printing out the tree and error messages. */ -#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME, - -const char *const tree_code_name[] = { -#include "tree.def" - "@@dummy", -#include "java-tree.def" -}; -#undef DEFTREECODE - /* Table of machine-independent attributes. */ const struct attribute_spec java_attribute_table[] = { |