- fix: If the integrated gcc compiler is add to path, auto find compilers will find in twice. (Windows)

This commit is contained in:
Roy Qu 2023-10-25 18:58:45 +08:00
parent 3a78819fb8
commit 94e955b07a
4 changed files with 18 additions and 6 deletions

View File

@ -19,6 +19,7 @@ Red Panda C++ Version 2.26
- fix: Macros that defined by the compiler are not correctly syntax-colored and tooltiped.
- fix: Code suggestion for identifiers after '*' (eg. 3 * item->price) can't correct.
- fix: C++ compiler atrribute '[[xxx]]' are not correctly handled.
- fix: If the integrated gcc compiler is add to path, auto find compilers will find in twice. (Windows)
Red Panda C++ Version 2.25

View File

@ -2331,7 +2331,16 @@ QStringList Editor::getExpressionAtPosition(
}
break;
case LastSymbolType::AmpersandSign: // before '&':
{
QChar ch=token.front();
if (isIdentChar(ch)
|| ch.isDigit()
|| ch == '.'
|| ch == ')' ) {
result.pop_front();
}
return result;
}
break;
case LastSymbolType::ParenthesisMatched: //before '()'
// if (token == ".") {

View File

@ -4397,8 +4397,8 @@ void CppParser::internalParse(const QString &fileName)
QStringList preprocessResult = mPreprocessor.result();
#ifdef QT_DEBUG
stringsToFile(mPreprocessor.result(),QString("r:\\preprocess-%1.txt").arg(extractFileName(fileName)));
mPreprocessor.dumpDefinesTo("r:\\defines.txt");
// stringsToFile(mPreprocessor.result(),QString("r:\\preprocess-%1.txt").arg(extractFileName(fileName)));
// mPreprocessor.dumpDefinesTo("r:\\defines.txt");
// mPreprocessor.dumpIncludesListTo("r:\\includes.txt");
#endif
//qDebug()<<"preprocess"<<timer.elapsed();
@ -4416,7 +4416,7 @@ void CppParser::internalParse(const QString &fileName)
if (mTokenizer.tokenCount() == 0)
return;
#ifdef QT_DEBUG
mTokenizer.dumpTokens(QString("r:\\tokens-%1.txt").arg(extractFileName(fileName)));
// mTokenizer.dumpTokens(QString("r:\\tokens-%1.txt").arg(extractFileName(fileName)));
#endif
#ifdef QT_DEBUG
mLastIndex = -1;
@ -4429,8 +4429,8 @@ void CppParser::internalParse(const QString &fileName)
}
// qDebug()<<"parse"<<timer.elapsed();
#ifdef QT_DEBUG
mStatementList.dumpAll(QString("r:\\all-stats-%1.txt").arg(extractFileName(fileName)));
mStatementList.dump(QString("r:\\stats-%1.txt").arg(extractFileName(fileName)));
// mStatementList.dumpAll(QString("r:\\all-stats-%1.txt").arg(extractFileName(fileName)));
// mStatementList.dump(QString("r:\\stats-%1.txt").arg(extractFileName(fileName)));
#endif
//reduce memory usage
internalClear();

View File

@ -3123,7 +3123,7 @@ void Settings::CompilerSets::findSets()
QStringList pathList = path.split(PATH_SEPARATOR);
QString folder;
for (int i=pathList.count()-1;i>=0;i--) {
folder = pathList[i];
folder = QFileInfo(pathList[i]).absoluteFilePath();
if (searched.contains(folder))
continue;
searched.insert(folder);
@ -3134,11 +3134,13 @@ void Settings::CompilerSets::findSets()
#ifdef Q_OS_WIN
folder = includeTrailingPathDelimiter(mSettings->dirs().appDir())+"MinGW32"+QDir::separator()+"bin";
folder = QFileInfo(folder).absoluteFilePath();
if (!searched.contains(folder)) {
addSets(folder);
searched.insert(folder);
}
folder = includeTrailingPathDelimiter(mSettings->dirs().appDir())+"MinGW64"+QDir::separator()+"bin";
folder = QFileInfo(folder).absoluteFilePath();
if (!searched.contains(folder)) {
addSets(folder);
searched.insert(folder);