This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

PATCH: Clean-up gtype-<lang>.h inclusion, lang hooks

From: Ziemowit Laski <zlaski at apple dot com>
To: gcc-patches at gcc dot gnu dot org
Date: Wed, 21 Jan 2004 17:09:57 -0800
Subject: PATCH: Clean-up gtype-<lang>.h inclusion, lang hooks

The following is a necessary prelude to ObjC++, but since it is strictly a clean-up, I'd like to get it placed in the FSF mainline. This patch accomplishes two things: (1) Ensures that every gtype-<lang>.h is included from the corresponding <lang>-lang.c file, and not from a file shared between more than one front-end. (2) Factors out the commonalities between c-lang.c and objc-lang.c, and moves them into c-objc-common.c and (the newly created) c-objc-common.h. The redundant LANG_HOOK_... declarations, which people failed to keep in sync, were really problematic.

No regressions were found. OK for mainline? (This could also go into 3.4, though I don't really see the urgency.)

--Zem


[gcc/ChangeLog]
2004-01-21  Ziemowit Laski  <zlaski@apple.com>

* Makefile.in (C_PRETTY_PRINT_H): Add c-pretty-print.h. (C_AND_OBJC_OBJS): Add c-pretty-print.o. (C_OBJC): Remove c-pretty-print.o. (c-lang.o): Depend on c-objc-common.h, but not $(C_PRETTY_PRINT_H). (c-objc-common.o): Depend on $(C_PRETTY_PRINT_H) and c-objc-common.h; remove duplicate $(C_TREE_H) dependency. * c-lang.c: Include c-objc-common.h instead of c-pretty-print.h. (LANG_HOOKS_FINISH, LANG_HOOKS_INIT_OPTIONS, LANG_HOOKS_INITIALIZE_DIAGNOSTICS, LANG_HOOKS_HANDLE_OPTION, LANG_HOOKS_MISSING_ARGUMENT, LANG_HOOKS_POST_OPTIONS, LANG_HOOKS_GET_ALIAS_SET, LANG_HOOKS_SAFE_FROM_P, LANG_HOOKS_EXPAND_EXPR, LANG_HOOKS_MARK_ADDRESSABLE, LANG_HOOKS_PARSE_FILE, LANG_HOOKS_TRUTHVALUE_CONVERSION, LANG_HOOKS_FINISH_INCOMPLETE_DECL, LANG_HOOKS_UNSAFE_FOR_REEVAL, LANG_HOOKS_STATICP, LANG_HOOKS_SET_DECL_ASSEMBLER_NAME, LANG_HOOKS_NO_BODY_BLOCKS, LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL, LANG_HOOKS_PRINT_IDENTIFIER, LANG_HOOKS_FUNCTION_ENTER_NESTED, LANG_HOOKS_FUNCTION_LEAVE_NESTED, LANG_HOOKS_DUP_LANG_SPECIFIC_DECL, LANG_HOOKS_DECL_UNINIT, LANG_HOOKS_RTL_EXPAND_STMT, LANG_HOOKS_COMMON_ATTRIBUTE_TABLE, LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE, LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN, LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS, LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P, LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING, LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS, LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN, LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION, LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIZE, LANG_HOOKS_SIGNED_TYPE, LANG_HOOKS_UNSIGNED_TYPE, LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE, LANG_HOOKS_INCOMPLETE_TYPE_ERROR, LANG_HOOKS_TYPE_PROMOTES_TO, LANG_HOOKS_REGISTER_BUILTIN_TYPE, LANG_HOOKS_WRITE_GLOBALS): Move to c-objc-common.h. (c_initialize_diagnostics): Move to c-objc-common.c. * c-objc-common.c: Include c-pretty-print.h and c-objc-common.h. (c_tree_printer): Use pp_base_string() macro instead of pp_string(). (c_initialize_diagnostics): Moved from c-lang.c. * c-objc-common.h: New file. * objc/Make-lang.in (objc-lang.o): Depend on c-objc-common.h and gtype-objc.h. (objc-act.o): Do not depend on gtype-objc.h. * objc/objc-act.c: Update copyright notice; do not include gtype-objc.h. * objc/objc-lang.c: Update copyright notice; include diagnostic.h, c-objc-common.h and gtype-objc.h. (LANG_HOOKS_FINISH, LANG_HOOKS_INIT_OPTIONS, LANG_HOOKS_INITIALIZE_DIAGNOSTICS, LANG_HOOKS_HANDLE_OPTION, LANG_HOOKS_MISSING_ARGUMENT, LANG_HOOKS_POST_OPTIONS, LANG_HOOKS_GET_ALIAS_SET, LANG_HOOKS_SAFE_FROM_P, LANG_HOOKS_EXPAND_EXPR, LANG_HOOKS_MARK_ADDRESSABLE, LANG_HOOKS_PARSE_FILE, LANG_HOOKS_TRUTHVALUE_CONVERSION, LANG_HOOKS_FINISH_INCOMPLETE_DECL, LANG_HOOKS_UNSAFE_FOR_REEVAL, LANG_HOOKS_STATICP, LANG_HOOKS_SET_DECL_ASSEMBLER_NAME, LANG_HOOKS_NO_BODY_BLOCKS, LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL, LANG_HOOKS_PRINT_IDENTIFIER, LANG_HOOKS_FUNCTION_ENTER_NESTED, LANG_HOOKS_FUNCTION_LEAVE_NESTED, LANG_HOOKS_DUP_LANG_SPECIFIC_DECL, LANG_HOOKS_DECL_UNINIT, LANG_HOOKS_RTL_EXPAND_STMT, LANG_HOOKS_COMMON_ATTRIBUTE_TABLE, LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE, LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN, LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS, LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P, LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING, LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS, LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN, LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION, LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIZE, LANG_HOOKS_SIGNED_TYPE, LANG_HOOKS_UNSIGNED_TYPE, LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE, LANG_HOOKS_INCOMPLETE_TYPE_ERROR, LANG_HOOKS_TYPE_PROMOTES_TO, LANG_HOOKS_REGISTER_BUILTIN_TYPE, LANG_HOOKS_WRITE_GLOBALS): Move to c-objc-common.h.

[gcc/cp/ChangeLog]
2004-01-21  Ziemowit Laski  <zlaski@apple.com>

        * Make-lang.in (cp-lang.o): Depend on gtype-cp.h and debug.h.
        (decl.o): Do not depend on gtype-cp.h.
        * cp-lang.c: Include debug.h and gtype-cp.h.
        * decl.c: Do not include gtype-cp.h.


Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1232
diff -c -3 -p -r1.1232 Makefile.in
*** gcc/Makefile.in     21 Jan 2004 02:53:20 -0000      1.1232
--- gcc/Makefile.in     21 Jan 2004 21:59:20 -0000
*************** PREDICT_H = predict.h predict.def
*** 679,685 ****
  CPPLIB_H = cpplib.h line-map.h
  PRETTY_PRINT_H = pretty-print.h input.h $(OBSTACK_H)
  DIAGNOSTIC_H = diagnostic.h diagnostic.def $(PRETTY_PRINT_H)
! C_PRETTY_PRINT_H = $(PRETTY_PRINT_H) $(C_COMMON_H) $(TREE_H)

# target overrides ifneq ($(tmake_file),) --- 679,685 ---- CPPLIB_H = cpplib.h line-map.h PRETTY_PRINT_H = pretty-print.h input.h $(OBSTACK_H) DIAGNOSTIC_H = diagnostic.h diagnostic.def $(PRETTY_PRINT_H) ! C_PRETTY_PRINT_H = c-pretty-print.h $(PRETTY_PRINT_H) $(C_COMMON_H) $(TREE_H)

# target overrides ifneq ($(tmake_file),) *************** CXX_TARGET_OBJS=@cxx_target_objs@ *** 838,847 **** C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \ c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \ c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \ ! c-objc-common.o c-dump.o c-pch.o $(C_TARGET_OBJS)

# Language-specific object files for C. ! C_OBJS = c-parse.o c-lang.o c-pretty-print.o stub-objc.o $(C_AND_OBJC_OBJS)

# Language-independent object files.

--- 838,847 ---- C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \ c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \ c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \ ! c-objc-common.o c-dump.o c-pch.o c-pretty-print.o $(C_TARGET_OBJS)

  # Language-specific object files for C.
! C_OBJS = c-parse.o c-lang.o stub-objc.o $(C_AND_OBJC_OBJS)

# Language-independent object files.

*************** c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM *** 1293,1300 **** c-typeck.o : c-typeck.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \ $(TARGET_H) flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H) c-lang.o : c-lang.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ ! $(C_TREE_H) $(C_PRETTY_PRINT_H) $(DIAGNOSTIC_H) \ ! $(GGC_H) langhooks.h $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-c.h stub-objc.o : stub-objc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \ $(GGC_H) $(C_COMMON_H) c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ --- 1293,1301 ---- c-typeck.o : c-typeck.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \ $(TARGET_H) flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H) c-lang.o : c-lang.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ ! $(C_TREE_H) $(DIAGNOSTIC_H) \ ! $(GGC_H) langhooks.h $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-c.h \ ! c-objc-common.h stub-objc.o : stub-objc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \ $(GGC_H) $(C_COMMON_H) c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ *************** c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H *** 1304,1312 **** c-ppoutput.o : c-ppoutput.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(C_COMMON_H) $(TREE_H) $(CPPLIB_H) cpphash.h $(TM_P_H) c-pragma.h c-objc-common.o : c-objc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ ! $(C_TREE_H) $(RTL_H) insn-config.h $(INTEGRATE_H) $(EXPR_H) $(C_TREE_H) \ flags.h toplev.h tree-inline.h $(DIAGNOSTIC_H) $(VARRAY_H) \ ! langhooks.h $(GGC_H) $(TARGET_H) cgraph.h c-aux-info.o : c-aux-info.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(C_TREE_H) flags.h toplev.h c-convert.o : c-convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ --- 1305,1313 ---- c-ppoutput.o : c-ppoutput.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(C_COMMON_H) $(TREE_H) $(CPPLIB_H) cpphash.h $(TM_P_H) c-pragma.h c-objc-common.o : c-objc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ ! $(RTL_H) insn-config.h $(INTEGRATE_H) $(EXPR_H) $(C_TREE_H) \ flags.h toplev.h tree-inline.h $(DIAGNOSTIC_H) $(VARRAY_H) \ ! langhooks.h $(GGC_H) $(TARGET_H) cgraph.h $(C_PRETTY_PRINT_H) c-objc-common.h c-aux-info.o : c-aux-info.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(C_TREE_H) flags.h toplev.h c-convert.o : c-convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ Index: gcc/c-lang.c =================================================================== RCS file: /cvs/gcc/gcc/gcc/c-lang.c,v retrieving revision 1.119 diff -c -3 -p -r1.119 c-lang.c *** gcc/c-lang.c 25 Sep 2003 01:25:46 -0000 1.119 --- gcc/c-lang.c 21 Jan 2004 21:59:20 -0000 *************** Software Foundation, 59 Temple Place - S *** 31,147 **** #include "langhooks.h" #include "langhooks-def.h" #include "diagnostic.h" ! #include "c-pretty-print.h" ! ! static void c_initialize_diagnostics (diagnostic_context *);

enum c_language_kind c_language = clk_c;

! /* ### When changing hooks, consider if ObjC needs changing too!! ### */

#undef LANG_HOOKS_NAME #define LANG_HOOKS_NAME "GNU C" #undef LANG_HOOKS_INIT #define LANG_HOOKS_INIT c_objc_common_init - #undef LANG_HOOKS_FINISH - #define LANG_HOOKS_FINISH c_common_finish - #undef LANG_HOOKS_INIT_OPTIONS - #define LANG_HOOKS_INIT_OPTIONS c_common_init_options - #undef LANG_HOOKS_INITIALIZE_DIAGNOSTICS - #define LANG_HOOKS_INITIALIZE_DIAGNOSTICS c_initialize_diagnostics - #undef LANG_HOOKS_HANDLE_OPTION - #define LANG_HOOKS_HANDLE_OPTION c_common_handle_option - #undef LANG_HOOKS_MISSING_ARGUMENT - #define LANG_HOOKS_MISSING_ARGUMENT c_common_missing_argument - #undef LANG_HOOKS_POST_OPTIONS - #define LANG_HOOKS_POST_OPTIONS c_common_post_options - #undef LANG_HOOKS_GET_ALIAS_SET - #define LANG_HOOKS_GET_ALIAS_SET c_common_get_alias_set - #undef LANG_HOOKS_SAFE_FROM_P - #define LANG_HOOKS_SAFE_FROM_P c_safe_from_p - #undef LANG_HOOKS_EXPAND_EXPR - #define LANG_HOOKS_EXPAND_EXPR c_expand_expr - #undef LANG_HOOKS_MARK_ADDRESSABLE - #define LANG_HOOKS_MARK_ADDRESSABLE c_mark_addressable - #undef LANG_HOOKS_PARSE_FILE - #define LANG_HOOKS_PARSE_FILE c_common_parse_file - #undef LANG_HOOKS_TRUTHVALUE_CONVERSION - #define LANG_HOOKS_TRUTHVALUE_CONVERSION c_common_truthvalue_conversion - #undef LANG_HOOKS_FINISH_INCOMPLETE_DECL - #define LANG_HOOKS_FINISH_INCOMPLETE_DECL c_finish_incomplete_decl - #undef LANG_HOOKS_UNSAFE_FOR_REEVAL - #define LANG_HOOKS_UNSAFE_FOR_REEVAL c_common_unsafe_for_reeval - #undef LANG_HOOKS_STATICP - #define LANG_HOOKS_STATICP c_staticp - #undef LANG_HOOKS_SET_DECL_ASSEMBLER_NAME - #define LANG_HOOKS_SET_DECL_ASSEMBLER_NAME c_static_assembler_name - #undef LANG_HOOKS_NO_BODY_BLOCKS - #define LANG_HOOKS_NO_BODY_BLOCKS true - #undef LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL - #define LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL c_warn_unused_global_decl - #undef LANG_HOOKS_PRINT_IDENTIFIER - #define LANG_HOOKS_PRINT_IDENTIFIER c_print_identifier - #undef LANG_HOOKS_FUNCTION_ENTER_NESTED - #define LANG_HOOKS_FUNCTION_ENTER_NESTED c_push_function_context - #undef LANG_HOOKS_FUNCTION_LEAVE_NESTED - #define LANG_HOOKS_FUNCTION_LEAVE_NESTED c_pop_function_context - #undef LANG_HOOKS_DUP_LANG_SPECIFIC_DECL - #define LANG_HOOKS_DUP_LANG_SPECIFIC_DECL c_dup_lang_specific_decl - #undef LANG_HOOKS_DECL_UNINIT - #define LANG_HOOKS_DECL_UNINIT c_decl_uninit - - #undef LANG_HOOKS_RTL_EXPAND_STMT - #define LANG_HOOKS_RTL_EXPAND_STMT expand_stmt - - /* Attribute hooks. */ - #undef LANG_HOOKS_COMMON_ATTRIBUTE_TABLE - #define LANG_HOOKS_COMMON_ATTRIBUTE_TABLE c_common_attribute_table - #undef LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE - #define LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE c_common_format_attribute_table - - #undef LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN - #define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \ - c_cannot_inline_tree_fn - #undef LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS - #define LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS \ - c_disregard_inline_limits - #undef LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P - #define LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P \ - anon_aggr_type_p - #undef LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING - #define LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING \ - c_convert_parm_for_inlining - #undef LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS - #define LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS c_estimate_num_insns - #undef LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN - #define LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN c_dump_tree - - #undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION - #define LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION c_expand_body - - #undef LANG_HOOKS_TYPE_FOR_MODE - #define LANG_HOOKS_TYPE_FOR_MODE c_common_type_for_mode - #undef LANG_HOOKS_TYPE_FOR_SIZE - #define LANG_HOOKS_TYPE_FOR_SIZE c_common_type_for_size - #undef LANG_HOOKS_SIGNED_TYPE - #define LANG_HOOKS_SIGNED_TYPE c_common_signed_type - #undef LANG_HOOKS_UNSIGNED_TYPE - #define LANG_HOOKS_UNSIGNED_TYPE c_common_unsigned_type - #undef LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE - #define LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE c_common_signed_or_unsigned_type - #undef LANG_HOOKS_INCOMPLETE_TYPE_ERROR - #define LANG_HOOKS_INCOMPLETE_TYPE_ERROR c_incomplete_type_error - #undef LANG_HOOKS_TYPE_PROMOTES_TO - #define LANG_HOOKS_TYPE_PROMOTES_TO c_type_promotes_to - #undef LANG_HOOKS_REGISTER_BUILTIN_TYPE - #define LANG_HOOKS_REGISTER_BUILTIN_TYPE c_register_builtin_type - - #undef LANG_HOOKS_WRITE_GLOBALS - #define LANG_HOOKS_WRITE_GLOBALS c_write_global_declarations - - /* ### When changing hooks, consider if ObjC needs changing too!! ### */

! /* Each front end provides its own.  */
  const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;

  /* Tree code classes.  */
--- 31,48 ----
  #include "langhooks.h"
  #include "langhooks-def.h"
  #include "diagnostic.h"
! #include "c-objc-common.h"

enum c_language_kind c_language = clk_c;

! /* Lang hooks common to C and ObjC are declared in c-objc-common.h. */

  #undef LANG_HOOKS_NAME
  #define LANG_HOOKS_NAME "GNU C"
  #undef LANG_HOOKS_INIT
  #define LANG_HOOKS_INIT c_objc_common_init

! /* Each front end provides its own lang hook initializer.  */
  const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;

/* Tree code classes. */ *************** void *** 183,201 **** finish_file (void) { c_objc_common_finish_file (); - } - - static void - c_initialize_diagnostics (diagnostic_context *context) - { - pretty_printer *base = context->printer; - c_pretty_printer *pp = xmalloc (sizeof (c_pretty_printer)); - memcpy (pp_base (pp), base, sizeof (pretty_printer)); - pp_c_pretty_printer_init (pp); - context->printer = (pretty_printer *) pp; - - /* It is safe to free this object because it was previously malloc()'d. */ - free (base); }

  #include "gtype-c.h"
--- 84,89 ----
Index: gcc/c-objc-common.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-objc-common.c,v
retrieving revision 1.37
diff -c -3 -p -r1.37 c-objc-common.c
*** gcc/c-objc-common.c 1 Jan 2004 13:58:56 -0000       1.37
--- gcc/c-objc-common.c 21 Jan 2004 21:59:20 -0000
*************** Software Foundation, 59 Temple Place - S
*** 38,43 ****
--- 38,45 ----
  #include "langhooks.h"
  #include "target.h"
  #include "cgraph.h"
+ #include "c-pretty-print.h"
+ #include "c-objc-common.h"

  static bool c_tree_printer (pretty_printer *, text_info *);
  static tree start_cdtor (int);
*************** c_tree_printer (pretty_printer *pp, text
*** 329,334 ****
        return false;
      }

!   pp_string (pp, n);
    return true;
  }
--- 331,350 ----
        return false;
      }

! pp_base_string (pp, n); return true; } + + void + c_initialize_diagnostics (diagnostic_context *context) + { + pretty_printer *base = context->printer; + c_pretty_printer *pp = xmalloc (sizeof (c_pretty_printer)); + memcpy (pp_base (pp), base, sizeof (pretty_printer)); + pp_c_pretty_printer_init (pp); + context->printer = (pretty_printer *) pp; + + /* It is safe to free this object because it was previously malloc()'d. */ + free (base); + } + Index: gcc/c-objc-common.h =================================================================== RCS file: gcc/c-objc-common.h diff -N gcc/c-objc-common.h *** /dev/null 1 Jan 1970 00:00:00 -0000 --- gcc/c-objc-common.h 21 Jan 2004 21:59:20 -0000 *************** *** 0 **** --- 1,127 ---- + /* Language hooks common to C and ObjC front ends. + Copyright (C) 2004 Free Software Foundation, Inc. + Contributed by Ziemowit Laski <zlaski@apple.com> + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2, or (at your option) any later + version. + + GCC is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING. If not, write to the Free + Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + + #ifndef GCC_C_OBJC_COMMON + #define GCC_C_OBJC_COMMON + + /* In c-objc-common.c. */ + extern void c_initialize_diagnostics (diagnostic_context *); + + /* Lang hooks that are shared between C and ObjC are defined here. Hooks + specific to C or ObjC go in c-lang.c and objc/objc-lang.c, respectively. */ + + #undef LANG_HOOKS_FINISH + #define LANG_HOOKS_FINISH c_common_finish + #undef LANG_HOOKS_INIT_OPTIONS + #define LANG_HOOKS_INIT_OPTIONS c_common_init_options + #undef LANG_HOOKS_INITIALIZE_DIAGNOSTICS + #define LANG_HOOKS_INITIALIZE_DIAGNOSTICS c_initialize_diagnostics + #undef LANG_HOOKS_HANDLE_OPTION + #define LANG_HOOKS_HANDLE_OPTION c_common_handle_option + #undef LANG_HOOKS_MISSING_ARGUMENT + #define LANG_HOOKS_MISSING_ARGUMENT c_common_missing_argument + #undef LANG_HOOKS_POST_OPTIONS + #define LANG_HOOKS_POST_OPTIONS c_common_post_options + #undef LANG_HOOKS_GET_ALIAS_SET + #define LANG_HOOKS_GET_ALIAS_SET c_common_get_alias_set + #undef LANG_HOOKS_SAFE_FROM_P + #define LANG_HOOKS_SAFE_FROM_P c_safe_from_p + #undef LANG_HOOKS_EXPAND_EXPR + #define LANG_HOOKS_EXPAND_EXPR c_expand_expr + #undef LANG_HOOKS_MARK_ADDRESSABLE + #define LANG_HOOKS_MARK_ADDRESSABLE c_mark_addressable + #undef LANG_HOOKS_PARSE_FILE + #define LANG_HOOKS_PARSE_FILE c_common_parse_file + #undef LANG_HOOKS_TRUTHVALUE_CONVERSION + #define LANG_HOOKS_TRUTHVALUE_CONVERSION c_common_truthvalue_conversion + #undef LANG_HOOKS_FINISH_INCOMPLETE_DECL + #define LANG_HOOKS_FINISH_INCOMPLETE_DECL c_finish_incomplete_decl + #undef LANG_HOOKS_UNSAFE_FOR_REEVAL + #define LANG_HOOKS_UNSAFE_FOR_REEVAL c_common_unsafe_for_reeval + #undef LANG_HOOKS_STATICP + #define LANG_HOOKS_STATICP c_staticp + #undef LANG_HOOKS_SET_DECL_ASSEMBLER_NAME + #define LANG_HOOKS_SET_DECL_ASSEMBLER_NAME c_static_assembler_name + #undef LANG_HOOKS_NO_BODY_BLOCKS + #define LANG_HOOKS_NO_BODY_BLOCKS true + #undef LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL + #define LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL c_warn_unused_global_decl + #undef LANG_HOOKS_PRINT_IDENTIFIER + #define LANG_HOOKS_PRINT_IDENTIFIER c_print_identifier + #undef LANG_HOOKS_FUNCTION_ENTER_NESTED + #define LANG_HOOKS_FUNCTION_ENTER_NESTED c_push_function_context + #undef LANG_HOOKS_FUNCTION_LEAVE_NESTED + #define LANG_HOOKS_FUNCTION_LEAVE_NESTED c_pop_function_context + #undef LANG_HOOKS_DUP_LANG_SPECIFIC_DECL + #define LANG_HOOKS_DUP_LANG_SPECIFIC_DECL c_dup_lang_specific_decl + #undef LANG_HOOKS_DECL_UNINIT + #define LANG_HOOKS_DECL_UNINIT c_decl_uninit + + #undef LANG_HOOKS_RTL_EXPAND_STMT + #define LANG_HOOKS_RTL_EXPAND_STMT expand_stmt + + /* Attribute hooks. */ + #undef LANG_HOOKS_COMMON_ATTRIBUTE_TABLE + #define LANG_HOOKS_COMMON_ATTRIBUTE_TABLE c_common_attribute_table + #undef LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE + #define LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE c_common_format_attribute_table + + #undef LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN + #define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \ + c_cannot_inline_tree_fn + #undef LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS + #define LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS \ + c_disregard_inline_limits + #undef LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P + #define LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P \ + anon_aggr_type_p + #undef LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING + #define LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING \ + c_convert_parm_for_inlining + #undef LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS + #define LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS c_estimate_num_insns + #undef LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN + #define LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN c_dump_tree + + #undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION + #define LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION c_expand_body + + #undef LANG_HOOKS_TYPE_FOR_MODE + #define LANG_HOOKS_TYPE_FOR_MODE c_common_type_for_mode + #undef LANG_HOOKS_TYPE_FOR_SIZE + #define LANG_HOOKS_TYPE_FOR_SIZE c_common_type_for_size + #undef LANG_HOOKS_SIGNED_TYPE + #define LANG_HOOKS_SIGNED_TYPE c_common_signed_type + #undef LANG_HOOKS_UNSIGNED_TYPE + #define LANG_HOOKS_UNSIGNED_TYPE c_common_unsigned_type + #undef LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE + #define LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE c_common_signed_or_unsigned_type + #undef LANG_HOOKS_INCOMPLETE_TYPE_ERROR + #define LANG_HOOKS_INCOMPLETE_TYPE_ERROR c_incomplete_type_error + #undef LANG_HOOKS_TYPE_PROMOTES_TO + #define LANG_HOOKS_TYPE_PROMOTES_TO c_type_promotes_to + #undef LANG_HOOKS_REGISTER_BUILTIN_TYPE + #define LANG_HOOKS_REGISTER_BUILTIN_TYPE c_register_builtin_type + + #undef LANG_HOOKS_WRITE_GLOBALS + #define LANG_HOOKS_WRITE_GLOBALS c_write_global_declarations + + #endif /* GCC_C_OBJC_COMMON */ Index: gcc/cp/Make-lang.in =================================================================== RCS file: /cvs/gcc/gcc/gcc/cp/Make-lang.in,v retrieving revision 1.177 diff -c -3 -p -r1.177 Make-lang.in *** gcc/cp/Make-lang.in 21 Jan 2004 20:52:24 -0000 1.177 --- gcc/cp/Make-lang.in 21 Jan 2004 21:59:21 -0000 *************** CXX_PRETTY_PRINT_H = cp/cxx-pretty-print *** 218,229 ****

cp/lex.o: cp/lex.c $(CXX_TREE_H) $(TM_H) flags.h cp/lex.h \ c-pragma.h toplev.h output.h input.h cp/operators.def $(TM_P_H) ! cp/cp-lang.o: cp/cp-lang.c $(CXX_TREE_H) $(TM_H) toplev.h langhooks.h \ ! $(LANGHOOKS_DEF_H) c-common.h $(CXX_PRETTY_PRINT_H) $(DIAGNOSTIC_H) cp/decl.o: cp/decl.c $(CXX_TREE_H) $(TM_H) flags.h cp/lex.h cp/decl.h stack.h \ output.h $(EXPR_H) except.h toplev.h $(HASHTAB_H) $(RTL_H) \ cp/operators.def $(TM_P_H) tree-inline.h diagnostic.h c-pragma.h \ ! debug.h gt-cp-decl.h gtype-cp.h timevar.h cp/decl2.o: cp/decl2.c $(CXX_TREE_H) $(TM_H) flags.h cp/lex.h cp/decl.h $(EXPR_H) \ output.h except.h toplev.h $(RTL_H) c-common.h gt-cp-decl2.h cgraph.h cp/typeck2.o: cp/typeck2.c $(CXX_TREE_H) $(TM_H) flags.h toplev.h output.h $(TM_P_H) \ --- 218,229 ----

cp/lex.o: cp/lex.c $(CXX_TREE_H) $(TM_H) flags.h cp/lex.h \ c-pragma.h toplev.h output.h input.h cp/operators.def $(TM_P_H) ! cp/cp-lang.o: cp/cp-lang.c $(CXX_TREE_H) $(TM_H) toplev.h debug.h langhooks.h \ ! $(LANGHOOKS_DEF_H) c-common.h gtype-cp.h $(CXX_PRETTY_PRINT_H) $(DIAGNOSTIC_H) cp/decl.o: cp/decl.c $(CXX_TREE_H) $(TM_H) flags.h cp/lex.h cp/decl.h stack.h \ output.h $(EXPR_H) except.h toplev.h $(HASHTAB_H) $(RTL_H) \ cp/operators.def $(TM_P_H) tree-inline.h diagnostic.h c-pragma.h \ ! debug.h gt-cp-decl.h timevar.h cp/decl2.o: cp/decl2.c $(CXX_TREE_H) $(TM_H) flags.h cp/lex.h cp/decl.h $(EXPR_H) \ output.h except.h toplev.h $(RTL_H) c-common.h gt-cp-decl2.h cgraph.h cp/typeck2.o: cp/typeck2.c $(CXX_TREE_H) $(TM_H) flags.h toplev.h output.h $(TM_P_H) \ Index: gcc/cp/cp-lang.c =================================================================== RCS file: /cvs/gcc/gcc/gcc/cp/cp-lang.c,v retrieving revision 1.71 diff -c -3 -p -r1.71 cp-lang.c *** gcc/cp/cp-lang.c 23 Dec 2003 16:53:47 -0000 1.71 --- gcc/cp/cp-lang.c 21 Jan 2004 21:59:21 -0000 *************** Boston, MA 02111-1307, USA. */ *** 30,35 **** --- 30,36 ---- #include "langhooks.h" #include "langhooks-def.h" #include "diagnostic.h" + #include "debug.h" #include "cxx-pretty-print.h"

enum c_language_kind c_language = clk_cxx; *************** cxx_initialize_diagnostics (diagnostic_c *** 412,414 **** --- 413,417 ---- /* It is safe to free this object because it was previously malloc()'d. */ free (base); } + + #include "gtype-cp.h" Index: gcc/cp/decl.c =================================================================== RCS file: /cvs/gcc/gcc/gcc/cp/decl.c,v retrieving revision 1.1175 diff -c -3 -p -r1.1175 decl.c *** gcc/cp/decl.c 17 Jan 2004 18:59:44 -0000 1.1175 --- gcc/cp/decl.c 21 Jan 2004 21:59:21 -0000 *************** cp_missing_noreturn_ok_p (tree decl) *** 11263,11266 **** }

  #include "gt-cp-decl.h"
- #include "gtype-cp.h"
--- 11263,11265 ----
Index: gcc/objc/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/objc/Make-lang.in,v
retrieving revision 1.69
diff -c -3 -p -r1.69 Make-lang.in
*** gcc/objc/Make-lang.in       21 Jan 2004 02:01:55 -0000      1.69
--- gcc/objc/Make-lang.in       21 Jan 2004 21:59:21 -0000
*************** cc1obj$(exeext): $(OBJC_OBJS) $(C_AND_OB
*** 60,66 ****

  objc/objc-lang.o : objc/objc-lang.c \
     $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) c-tree.h \
!    c-common.h toplev.h objc/objc-act.h langhooks.h $(LANGHOOKS_DEF_H)

  objc/objc-parse.o : objc/objc-parse.c \
     $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \
--- 60,67 ----

objc/objc-lang.o : objc/objc-lang.c \ $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) c-tree.h \ ! c-common.h toplev.h objc/objc-act.h langhooks.h $(LANGHOOKS_DEF_H) \ ! c-objc-common.h gtype-objc.h

objc/objc-parse.o : objc/objc-parse.c \ $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \ *************** objc/objc-act.o : objc/objc-act.c \ *** 70,76 **** $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) $(TM_P_H) \ $(EXPR_H) $(TARGET_H) $(C_TREE_H) diagnostic.h toplev.h flags.h \ objc/objc-act.h input.h function.h output.h debug.h langhooks.h \ ! $(LANGHOOKS_DEF_H) gt-objc-objc-act.h gtype-objc.h

po-generated: objc/objc-parse.c

--- 71,77 ---- $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) $(TM_P_H) \ $(EXPR_H) $(TARGET_H) $(C_TREE_H) diagnostic.h toplev.h flags.h \ objc/objc-act.h input.h function.h output.h debug.h langhooks.h \ ! $(LANGHOOKS_DEF_H) gt-objc-objc-act.h

po-generated: objc/objc-parse.c

Index: gcc/objc/objc-act.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/objc/objc-act.c,v
retrieving revision 1.203
diff -c -3 -p -r1.203 objc-act.c
*** gcc/objc/objc-act.c 18 Jan 2004 01:15:28 -0000      1.203
--- gcc/objc/objc-act.c 21 Jan 2004 21:59:22 -0000
***************
*** 1,6 ****
  /* Implement classes and message passing for Objective C.
     Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
!    2001, 2002, 2003 Free Software Foundation, Inc.
     Contributed by Steve Naroff.

  This file is part of GCC.
--- 1,6 ----
  /* Implement classes and message passing for Objective C.
     Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
!    2001, 2002, 2003, 2004 Free Software Foundation, Inc.
     Contributed by Steve Naroff.

  This file is part of GCC.
*************** lookup_objc_ivar (tree id)
*** 9090,9093 ****
  }

  #include "gt-objc-objc-act.h"
- #include "gtype-objc.h"
--- 9090,9092 ----
Index: gcc/objc/objc-lang.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/objc/objc-lang.c,v
retrieving revision 1.39
diff -c -3 -p -r1.39 objc-lang.c
*** gcc/objc/objc-lang.c        29 Aug 2003 23:21:13 -0000      1.39
--- gcc/objc/objc-lang.c        21 Jan 2004 21:59:22 -0000
***************
*** 1,5 ****
  /* Language-dependent hooks for Objective-C.
!    Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
     Contributed by Ziemowit Laski  <zlaski@apple.com>

  This file is part of GCC.
--- 1,5 ----
  /* Language-dependent hooks for Objective-C.
!    Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
     Contributed by Ziemowit Laski  <zlaski@apple.com>

  This file is part of GCC.
*************** Boston, MA 02111-1307, USA.  */
*** 30,143 ****
  #include "objc-act.h"
  #include "langhooks.h"
  #include "langhooks-def.h"

enum c_language_kind c_language = clk_objc;

#undef LANG_HOOKS_NAME #define LANG_HOOKS_NAME "GNU Objective-C" #undef LANG_HOOKS_INIT #define LANG_HOOKS_INIT objc_init - #undef LANG_HOOKS_FINISH - #define LANG_HOOKS_FINISH c_common_finish - #undef LANG_HOOKS_INIT_OPTIONS - #define LANG_HOOKS_INIT_OPTIONS c_common_init_options - #undef LANG_HOOKS_HANDLE_OPTION - #define LANG_HOOKS_HANDLE_OPTION c_common_handle_option - #undef LANG_HOOKS_HANDLE_FILENAME - #define LANG_HOOKS_HANDLE_FILENAME c_common_handle_filename - #undef LANG_HOOKS_MISSING_ARGUMENT - #define LANG_HOOKS_MISSING_ARGUMENT c_common_missing_argument - #undef LANG_HOOKS_POST_OPTIONS - #define LANG_HOOKS_POST_OPTIONS c_common_post_options - #undef LANG_HOOKS_GET_ALIAS_SET - #define LANG_HOOKS_GET_ALIAS_SET c_common_get_alias_set - #undef LANG_HOOKS_SAFE_FROM_P - #define LANG_HOOKS_SAFE_FROM_P c_safe_from_p - #undef LANG_HOOKS_PARSE_FILE - #define LANG_HOOKS_PARSE_FILE c_common_parse_file - #undef LANG_HOOKS_EXPAND_EXPR - #define LANG_HOOKS_EXPAND_EXPR c_expand_expr - #undef LANG_HOOKS_MARK_ADDRESSABLE - #define LANG_HOOKS_MARK_ADDRESSABLE c_mark_addressable - #undef LANG_HOOKS_TRUTHVALUE_CONVERSION - #define LANG_HOOKS_TRUTHVALUE_CONVERSION c_common_truthvalue_conversion - #undef LANG_HOOKS_FINISH_INCOMPLETE_DECL - #define LANG_HOOKS_FINISH_INCOMPLETE_DECL c_finish_incomplete_decl - #undef LANG_HOOKS_UNSAFE_FOR_REEVAL - #define LANG_HOOKS_UNSAFE_FOR_REEVAL c_common_unsafe_for_reeval - #undef LANG_HOOKS_STATICP - #define LANG_HOOKS_STATICP c_staticp - #undef LANG_HOOKS_SET_DECL_ASSEMBLER_NAME - #define LANG_HOOKS_SET_DECL_ASSEMBLER_NAME c_static_assembler_name - #undef LANG_HOOKS_NO_BODY_BLOCKS - #define LANG_HOOKS_NO_BODY_BLOCKS true - #undef LANG_HOOKS_DUP_LANG_SPECIFIC_DECL - #define LANG_HOOKS_DUP_LANG_SPECIFIC_DECL c_dup_lang_specific_decl - #undef LANG_HOOKS_PRINT_IDENTIFIER - #define LANG_HOOKS_PRINT_IDENTIFIER c_print_identifier - #undef LANG_HOOKS_DECL_PRINTABLE_NAME - #define LANG_HOOKS_DECL_PRINTABLE_NAME objc_printable_name - #undef LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL - #define LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL c_warn_unused_global_decl - #undef LANG_HOOKS_DECL_UNINIT - #define LANG_HOOKS_DECL_UNINIT c_decl_uninit - - #undef LANG_HOOKS_FUNCTION_ENTER_NESTED - #define LANG_HOOKS_FUNCTION_ENTER_NESTED c_push_function_context - #undef LANG_HOOKS_FUNCTION_LEAVE_NESTED - #define LANG_HOOKS_FUNCTION_LEAVE_NESTED c_pop_function_context - - #undef LANG_HOOKS_RTL_EXPAND_STMT - #define LANG_HOOKS_RTL_EXPAND_STMT expand_stmt - - /* Attribute hooks. */ - #undef LANG_HOOKS_COMMON_ATTRIBUTE_TABLE - #define LANG_HOOKS_COMMON_ATTRIBUTE_TABLE c_common_attribute_table - #undef LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE - #define LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE c_common_format_attribute_table - - /* Inlining hooks same as the C front end. */ - #undef LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN - #define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \ - c_cannot_inline_tree_fn - #undef LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS - #define LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS \ - c_disregard_inline_limits - #undef LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P - #define LANG_HOOKS_TREE_INLINING_ANON_AGGR_TYPE_P \ - anon_aggr_type_p - #undef LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING - #define LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING \ - c_convert_parm_for_inlining - #undef LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS - #define LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS c_estimate_num_insns - - #undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION - #define LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION c_expand_body - - #undef LANG_HOOKS_TYPE_FOR_MODE - #define LANG_HOOKS_TYPE_FOR_MODE c_common_type_for_mode - #undef LANG_HOOKS_TYPE_FOR_SIZE - #define LANG_HOOKS_TYPE_FOR_SIZE c_common_type_for_size - #undef LANG_HOOKS_SIGNED_TYPE - #define LANG_HOOKS_SIGNED_TYPE c_common_signed_type - #undef LANG_HOOKS_UNSIGNED_TYPE - #define LANG_HOOKS_UNSIGNED_TYPE c_common_unsigned_type - #undef LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE - #define LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE c_common_signed_or_unsigned_type - #undef LANG_HOOKS_INCOMPLETE_TYPE_ERROR - #define LANG_HOOKS_INCOMPLETE_TYPE_ERROR c_incomplete_type_error - #undef LANG_HOOKS_TYPE_PROMOTES_TO - #define LANG_HOOKS_TYPE_PROMOTES_TO c_type_promotes_to - - #undef LANG_HOOKS_WRITE_GLOBALS - #define LANG_HOOKS_WRITE_GLOBALS c_write_global_declarations

! /* Each front end provides its own hooks, for toplev.c.  */
  const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;

- /* Define the special tree codes that we use.  */
-
  /* Table indexed by tree code giving a string containing a character
     classifying the tree code.  */

--- 30,50 ----
  #include "objc-act.h"
  #include "langhooks.h"
  #include "langhooks-def.h"
+ #include "diagnostic.h"
+ #include "c-objc-common.h"

enum c_language_kind c_language = clk_objc;

+ /* Lang hooks common to C and ObjC are declared in c-objc-common.h. */ + #undef LANG_HOOKS_NAME #define LANG_HOOKS_NAME "GNU Objective-C" #undef LANG_HOOKS_INIT #define LANG_HOOKS_INIT objc_init

! /* Each front end provides its own lang hook initializer.  */
  const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;

  /* Table indexed by tree code giving a string containing a character
     classifying the tree code.  */

*************** const char * const tree_code_name[] = {
*** 179,181 ****
--- 86,90 ----
  #include "objc-tree.def"
  };
  #undef DEFTREECODE
+
+ #include "gtype-objc.h"

--------------------------------------------------------------
Ziemowit Laski                 1 Infinite Loop, MS 301-2K
Mac OS X Compiler Group        Cupertino, CA USA  95014-2083
Apple Computer, Inc.           +1.408.974.6229  Fax .5477

Follow-Ups:
- Re: PATCH: Clean-up gtype-<lang>.h inclusion, lang hooks
  - From: Geoff Keating

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]