From e609e9a70176d5cad7c823f60ab2a7f736d32e41 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Tue, 23 Feb 2010 17:43:40 +0100
Subject: Simplified ObjC selectors in the AST.

---
 src/shared/cplusplus/CheckName.cpp | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

(limited to 'src/shared/cplusplus/CheckName.cpp')

diff --git a/src/shared/cplusplus/CheckName.cpp b/src/shared/cplusplus/CheckName.cpp
index 98b5adea25..38675d5c09 100644
--- a/src/shared/cplusplus/CheckName.cpp
+++ b/src/shared/cplusplus/CheckName.cpp
@@ -100,17 +100,6 @@ const Name *CheckName::check(NestedNameSpecifierListAST *nested_name_specifier_l
     return switchName(previousName);
 }
 
-const Name *CheckName::check(ObjCSelectorAST *args, Scope *scope)
-{
-    const Name *previousName = switchName(0);
-    Scope *previousScope = switchScope(scope);
-
-    accept(args);
-
-    (void) switchScope(previousScope);
-    return switchName(previousName);
-}
-
 void CheckName::check(ObjCMessageArgumentDeclarationAST *arg, Scope *scope)
 {
     const Name *previousName = switchName(0);
@@ -375,21 +364,7 @@ bool CheckName::visit(TemplateIdAST *ast)
     return false;
 }
 
-bool CheckName::visit(ObjCSelectorWithoutArgumentsAST *ast)
-{
-    if (ast->name_token) {
-        std::vector<const Name *> names;
-        const Identifier *id = control()->findOrInsertIdentifier(spell(ast->name_token));
-        const NameId *nameId = control()->nameId(id);
-        names.push_back(nameId);
-        _name = control()->selectorNameId(&names[0], names.size(), false);
-        ast->selector_name = _name;
-    }
-
-    return false;
-}
-
-bool CheckName::visit(ObjCSelectorWithArgumentsAST *ast)
+bool CheckName::visit(ObjCSelectorAST *ast)
 {
     std::vector<const Name *> names;
     for (ObjCSelectorArgumentListAST *it = ast->selector_argument_list; it; it = it->next) {
@@ -405,7 +380,7 @@ bool CheckName::visit(ObjCSelectorWithArgumentsAST *ast)
 
     if (!names.empty()) {
         _name = control()->selectorNameId(&names[0], names.size(), true);
-        ast->selector_name = _name;
+        ast->name = _name;
     }
 
     return false;
@@ -431,5 +406,3 @@ bool CheckName::visit(ObjCMessageArgumentDeclarationAST *ast)
 
     return false;
 }
-
-
-- 
cgit v1.2.1