+2004-09-01 Ziemowit Laski <zlaski@apple.com>
+
+ * c-common.h (lookup_interface): Remove prototype.
+ (is_class_name): Rename to objc_is_class_name.
+ (lookup_objc_ivar): Rename to objc_lookup_ivar.
+ (get_current_scope): Rename to objc_get_current_scope.
+ * c-decl.c (get_current_scope): Rename to objc_get_current_scope.
+ * c-parse.in (parmlist_or_identifiers_1): Get rid of unused variable.
+ (yylexname): Call objc_is_class_name() instead of is_class_name().
+ * c-typeck.c (build_external_ref): Call objc_lookup_ivar()
+ instead of lookup_objc_ivar().
+ * stub-objc.c (lookup_interface): Remove stub.
+ (is_class_name): Rename to objc_is_class_name.
+ (lookup_objc_ivar): Rename to objc_lookup_ivar.
+
2004-08-31 Mark Mitchell <mark@codesourcery.com>
* config.gcc (arm*-*-symbianelf*): Do not include t-bpabi.
/* The following ObjC/ObjC++ functions are called by the C and/or C++
front-ends; they all must have corresponding stubs in stub-objc.c. */
-extern tree lookup_interface (tree);
-extern tree is_class_name (tree);
+extern tree objc_is_class_name (tree);
extern tree objc_is_object_ptr (tree);
extern void objc_check_decl (tree);
extern int objc_is_reserved_word (tree);
extern int objc_comptypes (tree, tree, int);
extern tree objc_message_selector (void);
-extern tree lookup_objc_ivar (tree);
+extern tree objc_lookup_ivar (tree);
extern void objc_clear_super_receiver (void);
extern int objc_is_public (tree, tree);
/* The following are provided by the C and C++ front-ends, and called by
ObjC/ObjC++. */
-extern void *get_current_scope (void);
+extern void *objc_get_current_scope (void);
extern void objc_mark_locals_volatile (void *);
/* In c-ppoutput.c */
/* The Objective-C front-end often needs to determine the current scope. */
void *
-get_current_scope (void)
+objc_get_current_scope (void)
{
return current_scope;
}
parmlist_or_identifiers_1:
parmlist_1
| identifiers ')'
- { tree t;
- $$ = tree_cons (NULL_TREE, NULL_TREE, $1);
+ { $$ = tree_cons (NULL_TREE, NULL_TREE, $1);
/* Make sure we have a parmlist after attributes. */
if ($<ttype>-1 != 0)
@@ifobjc
else
{
- tree objc_interface_decl = is_class_name (yylval.ttype);
+ tree objc_interface_decl = objc_is_class_name (yylval.ttype);
/* ObjC class names are in the same namespace as variables and
typedefs, and hence are shadowed by local declarations. */
if (objc_interface_decl
{
tree ref;
tree decl = lookup_name (id);
- tree objc_ivar = lookup_objc_ivar (id);
+ tree objc_ivar = objc_lookup_ivar (id);
if (decl && decl != error_mark_node)
{
+2004-09-01 Ziemowit Laski <zlaski@apple.com>
+
+ * objc-act.c (lookup_interface): Make function 'static' and add a
+ local prototype.
+ (objc_check_decl, get_class_reference, objc_declare_alias,
+ objc_declare_class, objc_is_object_ptr): Call objc_is_class_name()
+ instead of is_class_name().
+ (get_super_receiver, objc_clear_super_receiver): Call
+ objc_get_current_scope() instead of get_current_scope().
+ (is_class_name): Rename to objc_is_class_name.
+ (lookup_objc_ivar): Rename to objc_lookup_ivar.
+
2004-08-28 Ziemowit Laski <zlaski@apple.com>
* objc-act.c (objc_is_reserved_word): New function.
static void generate_strings (void);
static tree get_proto_encoding (tree);
static void build_selector_translation_table (void);
-
+static tree lookup_interface (tree);
static tree objc_add_static_instance (tree, tree);
static void build_objc_exception_stuff (void);
if (TREE_CODE (type) != RECORD_TYPE)
return;
- if (TYPE_NAME (type) && (type = is_class_name (TYPE_NAME (type))))
+ if (TYPE_NAME (type) && (type = objc_is_class_name (TYPE_NAME (type))))
error ("statically allocated instance of Objective-C class `%s'",
IDENTIFIER_POINTER (type));
}
#endif
orig_ident = ident;
- if (!(ident = is_class_name (ident)))
+ if (!(ident = objc_is_class_name (ident)))
{
error ("`%s' is not an Objective-C class name or alias",
IDENTIFIER_POINTER (orig_ident));
}
#endif /* OBJCPLUS */
- if (!(underlying_class = is_class_name (class_ident)))
+ if (!(underlying_class = objc_is_class_name (class_ident)))
warning ("cannot find class `%s'", IDENTIFIER_POINTER (class_ident));
- else if (is_class_name (alias_ident))
+ else if (objc_is_class_name (alias_ident))
warning ("class `%s' already exists", IDENTIFIER_POINTER (alias_ident));
else
alias_chain = tree_cons (underlying_class, alias_ident, alias_chain);
{
tree ident = TREE_VALUE (list);
- if (! is_class_name (ident))
+ if (! objc_is_class_name (ident))
{
tree record = lookup_name (ident);
}
tree
-is_class_name (tree ident)
+objc_is_class_name (tree ident)
{
tree chain;
&& (IS_ID (type)
|| TREE_TYPE (type) == TREE_TYPE (objc_class_type)))
return type;
- return is_class_name (OBJC_TYPE_NAME (TREE_TYPE (type)));
+ return objc_is_class_name (OBJC_TYPE_NAME (TREE_TYPE (type)));
}
-tree
+static tree
lookup_interface (tree ident)
{
tree chain;
CLASS_SUPER_NAME (class) = super_name;
CLASS_CLS_METHODS (class) = NULL_TREE;
- if (! is_class_name (class_name)
+ if (! objc_is_class_name (class_name)
&& (decl = lookup_name (class_name)))
{
error ("`%s' redeclared as different kind of symbol",
TREE_USED (UOBJC_SUPER_decl) = 1;
DECL_ARTIFICIAL (UOBJC_SUPER_decl) = 1;
- UOBJC_SUPER_scope = get_current_scope ();
+ UOBJC_SUPER_scope = objc_get_current_scope ();
}
/* Set receiver to self. */
objc_clear_super_receiver (void)
{
if (objc_method_context
- && UOBJC_SUPER_scope == get_current_scope ()) {
+ && UOBJC_SUPER_scope == objc_get_current_scope ()) {
UOBJC_SUPER_decl = 0;
UOBJC_SUPER_scope = 0;
}
/* Look up ID as an instance variable. */
tree
-lookup_objc_ivar (tree id)
+objc_lookup_ivar (tree id)
{
tree decl;
#include "c-common.h"
tree
-lookup_interface (tree ARG_UNUSED (arg))
-{
- return 0;
-}
-
-tree
-is_class_name (tree ARG_UNUSED (arg))
+objc_is_class_name (tree ARG_UNUSED (arg))
{
return 0;
}
}
tree
-lookup_objc_ivar (tree ARG_UNUSED (arg))
+objc_lookup_ivar (tree ARG_UNUSED (arg))
{
return 0;
}
projects / gcc.git / commitdiff