summaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
authornicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2010-09-29 07:34:37 +0000
committernicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2010-09-29 07:34:37 +0000
commitb27e241ec02e3a44088bad238a140a1997344c9c (patch)
tree50e01956f9f732acde8196766d84e5b5013a2ea6 /gcc/objc
parent385dfba2b2ec738e0f4b01ffaa6290652ae4a14c (diff)
downloadgcc-b27e241ec02e3a44088bad238a140a1997344c9c.tar.gz
In gcc/:
2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com> * c-parser.c (c_lex_one_token): In Objective-C, when dealing with a CPP_NAME which is a reserved word, clearly separate cases for OBJC_IS_PQ_KEYWORD, OBJC_IS_AT_KEYWORD and OBJC_IS_CXX_KEYWORD. In gcc/c-family: 2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com> * c-common.h (OBJC_IS_CXX_KEYWORD): New macro. Updated comments. (objc_is_reserved_word): Removed. * c-common.c: Updated comments. * c-lex.c (c_lex_with_flags): Use OBJC_IS_CXX_KEYWORD instead of objc_is_reserved_word. * stub-objc.c (objc_is_reserved_word): Removed. In gcc/objc/: 2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com> * objc-act.c (objc_is_reserved_word): Removed. In gcc/testsuite/: 2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com> * objc.dg/keywords-1.m: New test. * objc.dg/keywords-2.m: New test. * objc.dg/keywords-3.m: New test. * obj-c++.dg/keywords-1.mm: New test. * obj-c++.dg/keywords-2.mm: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164715 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/ChangeLog4
-rw-r--r--gcc/objc/objc-act.c14
2 files changed, 4 insertions, 14 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 26be691cc37..94c7ffafba8 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ * objc-act.c (objc_is_reserved_word): Removed.
+
2010-09-28 Iain Sandoe <iains@gcc.gnu.org>
* objc-act.c (objc_add_method_declaration): Handle and ignore
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 02c60ab0bdd..87eb11b2cdd 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -829,20 +829,6 @@ objc_add_instance_variable (tree decl)
decl);
}
-/* Return 1 if IDENT is an ObjC/ObjC++ reserved keyword in the context of
- an '@'. */
-
-int
-objc_is_reserved_word (tree ident)
-{
- unsigned char code = C_RID_CODE (ident);
-
- return (OBJC_IS_AT_KEYWORD (code)
- || code == RID_CLASS || code == RID_PUBLIC
- || code == RID_PROTECTED || code == RID_PRIVATE
- || code == RID_TRY || code == RID_THROW || code == RID_CATCH);
-}
-
/* Return true if TYPE is 'id'. */
static bool