rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: correctly handle For(const auto&)

This commit is contained in:
Roy Qu 2022-11-29 15:42:08 +08:00
parent e845c7474b
commit 407f11aa22
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RedPandaIDE/parser/cppparser.cpp
View File

@ -3545,7 +3545,9 @@ void CppParser::handleVar(const QString& typePrefix,bool isExtern,bool isStatic)
&& isIdentChar(mTokenizer[mIndex+1]->text.back())
&& addedVar
&& !(addedVar->properties & StatementProperty::spFunctionPointer)
&& addedVar->type == "auto") {
&& (addedVar->type == "auto"
|| addedVar->type == "const auto"
|| addedVar->type == "const auto &")) {
QStringList phraseExpression;
phraseExpression.append(mTokenizer[mIndex+1]->text);
int pos = 0;
@ -3557,7 +3559,7 @@ void CppParser::handleVar(const QString& typePrefix,bool isExtern,bool isStatic)
true);
if(aliasStatement && aliasStatement->effectiveTypeStatement
&& STLContainers.contains(aliasStatement->effectiveTypeStatement->fullName)) {
QString type=doFindFirstTemplateParamOf(mCurrentFile,aliasStatement->baseType,
QString type=doFindFirstTemplateParamOf(mCurrentFile,aliasStatement->templateParams,
getCurrentScope());
if (!type.isEmpty())
addedVar->type = type;
@ -3699,7 +3701,7 @@ void CppParser::handleVar(const QString& typePrefix,bool isExtern,bool isStatic)
}
}
} else
addedVar->type = aliasStatement->baseType;
addedVar->type = aliasStatement->baseType + aliasStatement->templateParams;
if (aliasStatement->pointerLevel>0)
addedVar->type += QString(aliasStatement->pointerLevel,'*');
}
@ -3752,7 +3754,7 @@ void CppParser::handleVar(const QString& typePrefix,bool isExtern,bool isStatic)
}
}
} else
addedVar->type = aliasStatement->baseType;
addedVar->type = aliasStatement->baseType + aliasStatement->templateParams;
if (aliasStatement->pointerLevel>0)
addedVar->type += QString(aliasStatement->pointerLevel,'*');
}
@ -4739,7 +4741,6 @@ PStatement CppParser::doParseEvalTypeInfo(
bracketLevel++;
} else if (token == "<") {
templateLevel++;
baseType += token;
templateParams += token;
} else if (token == "::") {
baseType += token;
@ -4756,7 +4757,6 @@ PStatement CppParser::doParseEvalTypeInfo(
} else if (token == ">") {
templateLevel--;
}
baseType += token;
templateParams += token;
}
highlighter.next();

2
RedPandaIDE/parser/parserutils.cpp
View File

@ -279,6 +279,8 @@ void initParser()
//STL iterator
STLIterators.insert("iterator");
STLIterators.insert("const_iterator");
STLIterators.insert("const_local_iterator");
STLIterators.insert("local_iterator");
STLIterators.insert("reverse_iterator");
STLIterators.insert("const_reverse_iterator");