summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/Parser.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-02-04 11:03:14 +0100
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-02-04 12:15:31 +0100
commit1b5168c19e8dd22b4c5192108415995ffa4dcd43 (patch)
tree9983c6fc746d66e2203a1ced4fe00b8b563a6133 /src/shared/cplusplus/Parser.cpp
parent0c05c042dbf2e95250176d2864ebb38a2b22cdce (diff)
downloadqt-creator-1b5168c19e8dd22b4c5192108415995ffa4dcd43.tar.gz
Modified parseObjCTypeQualifiers to do what the name indicates.
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
-rw-r--r--src/shared/cplusplus/Parser.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index a86f4c2395..61382f9f9d 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -5251,11 +5251,18 @@ bool Parser::parseObjCTypeQualifiers(unsigned &type_qualifier)
return false;
const Identifier *id = tok().identifier;
- const int k = classifyObjectiveCContextKeyword(id->chars(), id->size());
- if (k == Token_identifier)
+ switch (classifyObjectiveCContextKeyword(id->chars(), id->size())) {
+ case Token_bycopy:
+ case Token_byref:
+ case Token_in:
+ case Token_inout:
+ case Token_oneway:
+ case Token_out:
+ type_qualifier = consumeToken();
+ return true;
+ default:
return false;
- type_qualifier = consumeToken();
- return true;
+ }
}
bool Parser::peekAtObjCContextKeyword(int kind)