objc-act.h (get_object_reference): Rename to get_protocol_reference.

2004-06-20  David Ayers  <d.ayers@inode.at>

	* objc/objc-act.h (get_object_reference): Rename to
	get_protocol_reference.
	(super_type): Rename to objc_super_type.
	(selector_type): Rename to objc_selector_type.
	(id_type): Rename to objc_id_type.
	(instance_type): Rename to objc_instance_type.
	(protocol_type): Rename to objc_protocol_type.
	(IS_ID): Update reference to id_type.
	* objc/objc-act.c (get_object_reference): Rename to
	get_protocol_reference; add documentation; update references to
	id_type.
	(lookup_method_in_protocol_list): Rename class_meth to
	is_class; add documentation.
	(finish_message_expr): Rename is_class to class_tree.
	(synth_module_prologue, objc_is_object_ptr, objc_build_exc_ptr,
	next_sjlj_build_try_catch_finally, objc_begin_catch_clause,
	build_next_objc_exception_stuff, get_arg_type_list,
	build_objc_method_call): Update references to id_type.
	(synth_module_prologue, build_objc_symtab_template,
	build_selector_reference_decl, build_selector,
	build_selector_translation_table, build_typed_selector_reference,
	get_arg_type_list, synth_self_and_ucmd_args, get_arg_type_list,
	synth_self_and_ucmd_args): Update references to selector_type.
	(build_private_template, build_ivar_reference):	Update references
	to instance_type.
	(synth_module_prologue, build_protocol_reference,
	build_protocol_expr, start_protocol): Update references to
	protocol_type.
	(synth_module_prologue, get_arg_type_list, build_objc_method_call):
	Update references to super_type.
	* c-parse.in: (typespec_nonreserved_nonattr): Update
	references to get_object_reference.
	* objc/objc-tree.def: Add C mode identifier sequence.

From-SVN: r83425

gcc/ChangeLog

+2004-06-20  David Ayers  <d.ayers@inode.at>
+
+	* objc/objc-act.h (get_object_reference): Rename to
+	get_protocol_reference.
+	(super_type): Rename to objc_super_type.
+	(selector_type): Rename to objc_selector_type.
+	(id_type): Rename to objc_id_type.
+	(instance_type): Rename to objc_instance_type.
+	(protocol_type): Rename to objc_protocol_type.
+	(IS_ID): Update reference to id_type.
+	* objc/objc-act.c (get_object_reference): Rename to
+	get_protocol_reference; add documentation; update references to
+	id_type.
+	(lookup_method_in_protocol_list): Rename class_meth to
+	is_class; add documentation.
+	(finish_message_expr): Rename is_class to class_tree.
+	(synth_module_prologue, objc_is_object_ptr, objc_build_exc_ptr,
+	next_sjlj_build_try_catch_finally, objc_begin_catch_clause,
+	build_next_objc_exception_stuff, get_arg_type_list,
+	build_objc_method_call): Update references to id_type.
+	(synth_module_prologue, build_objc_symtab_template,
+	build_selector_reference_decl, build_selector,
+	build_selector_translation_table, build_typed_selector_reference,
+	get_arg_type_list, synth_self_and_ucmd_args, get_arg_type_list,
+	synth_self_and_ucmd_args): Update references to selector_type.
+	(build_private_template, build_ivar_reference):	Update references
+	to instance_type.
+	(synth_module_prologue, build_protocol_reference,
+	build_protocol_expr, start_protocol): Update references to
+	protocol_type.
+	(synth_module_prologue, get_arg_type_list, build_objc_method_call):
+	Update references to super_type.
+	* c-parse.in: (typespec_nonreserved_nonattr): Update
+	references to get_object_reference.
+	* objc/objc-tree.def: Add C mode identifier sequence.
+
 2004-06-20  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
 
 	* loop-invariant.c: New file.

gcc/c-parse.in

@@ -1326,12 +1326,12 @@ typespec_nonreserved_nonattr:
 	| CLASSNAME protocolrefs
 		{ $$ = get_static_reference ($1, $2); }
 	| OBJECTNAME protocolrefs
-		{ $$ = get_object_reference ($2); }
+		{ $$ = get_protocol_reference ($2); }
 
 /* Make "<SomeProtocol>" equivalent to "id <SomeProtocol>"
    - nisse@lysator.liu.se */
         | non_empty_protocolrefs
-                { $$ = get_object_reference ($1); }
+                { $$ = get_protocol_reference ($1); }
 @@end_ifobjc
 	| typeof '(' expr ')'
 		{ skip_evaluation--;

gcc/objc/objc-act.h

@@ -57,7 +57,7 @@ void objc_clear_super_receiver (void);
 tree get_class_ivars_from_name (tree);
 tree get_class_reference (tree);
 tree get_static_reference (tree, tree);
-tree get_object_reference (tree);
+tree get_protocol_reference (tree);
 tree build_message_expr (tree);
 tree finish_message_expr (tree, tree, tree);
 tree build_selector_expr (tree);
@@ -308,17 +308,17 @@ extern GTY(()) tree objc_global_trees[OCTI_MAX];
 #define objc_get_meta_class_decl			\
 				objc_global_trees[OCTI_GET_MCLASS_DECL]
 
-#define super_type		objc_global_trees[OCTI_SUPER_TYPE]
-#define selector_type		objc_global_trees[OCTI_SEL_TYPE]
-#define id_type			objc_global_trees[OCTI_ID_TYPE]
+#define objc_super_type		objc_global_trees[OCTI_SUPER_TYPE]
+#define objc_selector_type	objc_global_trees[OCTI_SEL_TYPE]
+#define objc_id_type		objc_global_trees[OCTI_ID_TYPE]
 #define objc_class_type		objc_global_trees[OCTI_CLS_TYPE]
-#define instance_type		objc_global_trees[OCTI_NST_TYPE]
-#define protocol_type		objc_global_trees[OCTI_PROTO_TYPE]
+#define objc_instance_type	objc_global_trees[OCTI_NST_TYPE]
+#define objc_protocol_type	objc_global_trees[OCTI_PROTO_TYPE]
 
 /* Type checking macros.  */
 
 #define IS_ID(TYPE) \
-  (TYPE_MAIN_VARIANT (TYPE) == TYPE_MAIN_VARIANT (id_type))
+  (TYPE_MAIN_VARIANT (TYPE) == TYPE_MAIN_VARIANT (objc_id_type))
 #define IS_PROTOCOL_QUALIFIED_ID(TYPE) \
   (IS_ID (TYPE) && TYPE_PROTOCOL_LIST (TYPE))
 #define IS_SUPER(TYPE) \

gcc/objc/objc-tree.def

@@ -37,3 +37,9 @@ DEFTREECODE (CLASS_METHOD_DECL, "class_method_decl", 'd', 0)
 /* Objective-C expressions.  */
 DEFTREECODE (MESSAGE_SEND_EXPR, "message_send_expr", 'e', 3)
 DEFTREECODE (CLASS_REFERENCE_EXPR, "class_reference_expr", 'e', 1)
+
+/*
+Local variables:
+mode:c
+End:
+*/