summaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
authorzlaski <zlaski@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-15 00:10:27 +0000
committerzlaski <zlaski@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-15 00:10:27 +0000
commitf9a5b1a0ede1f9efce6985e65bd4ccb72833ced4 (patch)
tree800ea81c078a96a03debae44a7905203b417cccf /gcc/objc
parent12f61740b27ac76bf6acc80076b7b5c97cf19adb (diff)
downloadgcc-f9a5b1a0ede1f9efce6985e65bd4ccb72833ced4.tar.gz
2003-10-14 Ziemowit Laski <zlaski@apple.com>
* c-parse.in (methoddef, methodproto): Call objc_add_method() instead of add_method(). * objc/objc-act.c (objc_check_decl): Do not check for constant_string_type. (add_method): Rename to objc_add_method(). (really_start_method): Call objc_add_method() instead of add_method(). * objc/objc-act.h (add_method): Rename to objc_add_method(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72506 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/objc-act.c11
-rw-r--r--gcc/objc/objc-act.h2
2 files changed, 6 insertions, 7 deletions
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index b9050354af5..ad2b69a9f56 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -947,10 +947,9 @@ objc_check_decl (tree decl)
if (TREE_CODE (type) != RECORD_TYPE)
return;
- if (TYPE_NAME (type) && (type = is_class_name (TYPE_NAME (type)))
- && type != constant_string_type)
+ if (TYPE_NAME (type) && (type = is_class_name (TYPE_NAME (type))))
error ("statically allocated instance of Objective-C class `%s'",
- IDENTIFIER_POINTER (type));
+ IDENTIFIER_POINTER (type));
}
/* Implement static typing. At this point, we know we have an interface. */
@@ -6300,7 +6299,7 @@ add_method_to_hash_list (hash *hash_list, tree method)
}
tree
-add_method (tree class, tree method, int is_class)
+objc_add_method (tree class, tree method, int is_class)
{
tree mth;
@@ -7815,8 +7814,8 @@ really_start_method (tree method, tree parmlist)
CLASS_SUPER_NAME (objc_implementation_context));
if (interface)
- add_method (interface, copy_node (method),
- TREE_CODE (method) == CLASS_METHOD_DECL);
+ objc_add_method (interface, copy_node (method),
+ TREE_CODE (method) == CLASS_METHOD_DECL);
}
}
}
diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h
index 0dade33c091..abbf6562731 100644
--- a/gcc/objc/objc-act.h
+++ b/gcc/objc/objc-act.h
@@ -54,7 +54,7 @@ tree is_ivar (tree, tree);
int is_private (tree);
int is_public (tree, tree);
tree add_instance_variable (tree, int, tree, tree, tree);
-tree add_method (tree, tree, int);
+tree objc_add_method (tree, tree, int);
tree get_super_receiver (void);
void objc_clear_super_receiver (void);
tree get_class_ivars_from_name (tree);