Commit cdd8ac09 authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

Renamed method.

parent f4de47ad
......@@ -158,7 +158,7 @@ QList<SimpleToken> SimpleLexer::operator()(const QString &text, int state)
lex.setScanAngleStringLiteralTokens(true);
if (_objCEnabled && tk.is(T_IDENTIFIER))
simpleTk.f._objcTypeQualifier = (classifyObjectiveCTypeQualifiers(firstChar + tk.offset, tk.f.length) != Token_identifier);
simpleTk.f._objcTypeQualifier = (classifyObjectiveCContextKeyword(firstChar + tk.offset, tk.f.length) != Token_identifier);
tokens.append(simpleTk);
}
......
......@@ -416,12 +416,3 @@ bool CheckSpecifier::visit(AttributeSpecifierAST * /*ast*/)
{
return false;
}
bool CheckSpecifier::visit(ObjCTypeNameAST * /*ast*/)
{
// TODO: implement this (EV)
// _fullySpecifiedType = FullySpecifiedType();
return true;
}
......@@ -80,8 +80,6 @@ protected:
virtual bool visit(TypeofSpecifierAST *ast);
virtual bool visit(AttributeSpecifierAST *ast);
virtual bool visit(ObjCTypeNameAST *ast);
private:
SpecifierListAST *_specifier;
FullySpecifiedType _fullySpecifiedType;
......
......@@ -234,7 +234,7 @@ static inline int classify9(const char *s) {
return Token_identifier;
}
int CPlusPlus::classifyObjectiveCTypeQualifiers(const char *s, int n) {
int CPlusPlus::classifyObjectiveCContextKeyword(const char *s, int n) {
switch (n) {
case 2: return classify2(s);
case 3: return classify3(s);
......
......@@ -52,7 +52,7 @@ enum {
Token_identifier
};
CPLUSPLUS_EXPORT int classifyObjectiveCTypeQualifiers(const char *s, int n);
CPLUSPLUS_EXPORT int classifyObjectiveCContextKeyword(const char *s, int n);
} // end of namespace CPlusPlus
......
......@@ -5153,7 +5153,7 @@ bool Parser::parseObjCPropertyAttribute(ObjCPropertyAttributeAST *&node)
node = new (_pool) ObjCPropertyAttributeAST;
const Identifier *id = tok().identifier;
const int k = classifyObjectiveCTypeQualifiers(id->chars(), id->size());
const int k = classifyObjectiveCContextKeyword(id->chars(), id->size());
switch (k) {
case Token_copy:
case Token_assign:
......@@ -5251,7 +5251,7 @@ bool Parser::parseObjCTypeQualifiers(unsigned &type_qualifier)
return false;
const Identifier *id = tok().identifier;
const int k = classifyObjectiveCTypeQualifiers(id->chars(), id->size());
const int k = classifyObjectiveCContextKeyword(id->chars(), id->size());
if (k == Token_identifier)
return false;
type_qualifier = consumeToken();
......@@ -5264,7 +5264,7 @@ bool Parser::peekAtObjCContextKeyword(int kind)
return false;
const Identifier *id = tok().identifier;
const int k = classifyObjectiveCTypeQualifiers(id->chars(), id->size());
const int k = classifyObjectiveCContextKeyword(id->chars(), id->size());
return k == kind;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment