diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/message.cpp | 55 | ||||
| -rw-r--r-- | src/pre.l | 128 |
2 files changed, 75 insertions, 108 deletions
diff --git a/src/message.cpp b/src/message.cpp index 5f06984..6c7c8ac 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -25,12 +25,6 @@ static QCString outputFormat; static const char *warning_str = "warning: "; static const char *error_str = "error: "; -//static int warnFormatOrder; // 1 = $file,$line,$text -// // 2 = $text,$line,$file -// // 3 = $line,$text,$file -// // 4 = $file,$text,$line -// // 5 = $text,$file,$line -// // 6 = $line,$file,$text static FILE *warnFile = stderr; @@ -47,55 +41,6 @@ static std::mutex g_mutex; void initWarningFormat() { -// int filePos = Config_getString(WARN_FORMAT).find("$file"); -// int linePos = Config_getString(WARN_FORMAT).find("$line"); -// int textPos = Config_getString(WARN_FORMAT).find("$text"); -// -// // sort items on position (there are 6 cases) -// warnFormatOrder = 1; -// if (filePos>linePos && filePos>textPos) -// { -// if (linePos>textPos) // $text,$line,$file -// { -// warnFormatOrder = 2; -// } -// else // $line,$text,$file -// { -// warnFormatOrder = 3; -// } -// } -// else if (filePos<linePos && filePos<textPos) -// { -// if (linePos>textPos) // $file,$text,$line -// { -// warnFormatOrder = 4; -// } -// } -// else if (filePos<linePos && filePos>textPos) // $text,$file,$line -// { -// warnFormatOrder = 5; -// } -// else // $line,$file,$text -// { -// warnFormatOrder = 6; -// } -// outputFormat = -// substitute( -// substitute( -// substitute( -// Config_getString(WARN_FORMAT), -// "$file","%s" -// ), -// "$text","%s" -// ), -// "$line","%d" -// )+'\n'; - - // replace(QRegExp("\\$file"),"%s"). - // replace(QRegExp("\\$text"),"%s"). - // replace(QRegExp("\\$line"),"%d")+ - // '\n'; - outputFormat = Config_getString(WARN_FORMAT); if (!Config_getString(WARN_LOGFILE).isEmpty()) @@ -34,6 +34,7 @@ #include <utility> #include <mutex> #include <thread> +#include <regex> #include <stdio.h> #include <assert.h> @@ -41,7 +42,6 @@ #include <errno.h> #include <qcstring.h> -#include <qregexp.h> #include <qfileinfo.h> #include "containers.h" @@ -1959,31 +1959,48 @@ static QCString stringize(const QCString &s) */ static void processConcatOperators(QCString &expr) { - //printf("processConcatOperators: in='%s'\n",expr.data()); - QRegExp r("[ \\t\\n]*##[ \\t\\n]*"); - int l,n,i=0; if (expr.isEmpty()) return; - while ((n=r.match(expr,i,&l))!=-1) + //printf("processConcatOperators: in='%s'\n",expr.data()); + std::string e = expr.str(); + static std::regex r("[[:space:]]*##[[:space:]]*"); + std::sregex_iterator end; + + size_t i=0; + for (;;) { - //printf("Match: '%s'\n",expr.data()+i); - if (n+l+1<(int)expr.length() && expr.at(n+l)=='@' && expr.at(n+l+1)=='-') + std::sregex_iterator it(e.begin()+i,e.end(),r); + if (it!=end) { - // remove no-rescan marker after ID - l+=2; + const auto &match = *it; + size_t n = i+match.position(); + size_t l = match.length(); + //printf("Match: '%s'\n",expr.data()+i); + if (n+l+1<e.length() && e[n+l]=='@' && expr[n+l+1]=='-') + { + // remove no-rescan marker after ID + l+=2; + } + //printf("found '%s'\n",expr.mid(n,l).data()); + // remove the ## operator and the surrounding whitespace + e=e.substr(0,n)+e.substr(n+l); + int k=n-1; + while (k>=0 && isId(e[k])) k--; + if (k>0 && e[k]=='-' && e[k-1]=='@') + { + // remove no-rescan marker before ID + e=e.substr(0,k-1)+e.substr(k+1); + n-=2; + } + i=n; } - //printf("found '%s'\n",expr.mid(n,l).data()); - // remove the ## operator and the surrounding whitespace - expr=expr.left(n)+expr.right(expr.length()-n-l); - int k=n-1; - while (k>=0 && isId(expr.at(k))) k--; - if (k>0 && expr.at(k)=='-' && expr.at(k-1)=='@') + else { - // remove no-rescan marker before ID - expr=expr.left(k-1)+expr.right(expr.length()-k-1); - n-=2; + break; } - i=n; } + + expr = e; + //printf("processConcatOperators: out='%s'\n",expr.data()); } @@ -3172,30 +3189,29 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName) // add predefined macros const StringVector &predefList = Config_getList(PREDEFINED); - for (const auto &defStr : predefList) + for (const auto &ds : predefList) { - QCString ds = defStr.c_str(); - int i_equals=ds.find('='); - int i_obrace=ds.find('('); - int i_cbrace=ds.find(')'); - bool nonRecursive = i_equals>0 && ds.at(i_equals-1)==':'; + size_t i_equals=ds.find('='); + size_t i_obrace=ds.find('('); + size_t i_cbrace=ds.find(')'); + bool nonRecursive = i_equals!=std::string::npos && i_equals>0 && ds[i_equals-1]==':'; - if ((i_obrace==0) || (i_equals==0) || (i_equals==1 && ds.at(i_equals-1)==':')) + if ((i_obrace==0) || (i_equals==0) || (i_equals==1 && ds[i_equals-1]==':')) { continue; // no define name } if (i_obrace<i_equals && i_cbrace<i_equals && - i_obrace!=-1 && i_cbrace!=-1 && + i_obrace!=std::string::npos && i_cbrace!=std::string::npos && i_obrace<i_cbrace ) // predefined function macro definition { + std::regex reId("[[:alpha:]_][[:alnum:]_]*"); + std::sregex_iterator end; bool varArgs = false; int count = 0; - int i,pi,l; std::map<std::string,int> argMap; - QRegExp reId("[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*"); // regexp matching an id - if (ds.mid(i_obrace+1,i_cbrace-i_obrace-1)=="...") + if (ds.substr(i_obrace+1,i_cbrace-i_obrace-1)=="...") { varArgs = true; argMap.emplace("__VA_ARGS__",count); @@ -3203,14 +3219,18 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName) } else { - //printf("predefined function macro '%s'\n",qPrint(ds.mid(i_obrace+1,i_cbrace-i_obrace-1))); - i=i_obrace+1; + size_t i=i_obrace+1; + //printf("predefined function macro '%s'\n",ds.c_str()); + std::sregex_iterator it(ds.begin()+i,ds.end(),reId); // gather the formal arguments in a dictionary - while (i<i_cbrace && (pi=reId.match(ds,i,&l))) + while (i<i_cbrace && it!=end) { + const auto &match = *it; + size_t pi = match.position()+i; + size_t l = match.length(); if (l>0) // see bug375037 { - argMap.emplace(toStdString(ds.mid(pi,l)),count); + argMap.emplace(match.str(),count); count++; i=pi+l; } @@ -3218,18 +3238,24 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName) { i++; } + ++it; } } // strip definition part - QCString tmp=ds.right(ds.length()-i_equals-1); - QCString definition; - i=0; + std::string definition; + std::string in=ds.substr(i_equals+1); + std::sregex_iterator re_it(in.begin(),in.end(),reId); + size_t i=0; // substitute all occurrences of formal arguments by their // corresponding markers - while ((pi=reId.match(tmp,i,&l))!=-1) + for (; re_it!=end; ++re_it) { - if (pi>i) definition+=tmp.mid(i,pi-i); - auto it = argMap.find(tmp.mid(pi,l).data()); + const auto &match = *re_it; + size_t pi = match.position(); + size_t l = match.length(); + if (pi>i) definition+=in.substr(i,pi-i); + + auto it = argMap.find(match.str()); if (it!=argMap.end()) { int argIndex = it->second; @@ -3239,15 +3265,15 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName) } else { - definition+=tmp.mid(pi,l); + definition+=match.str(); } i=pi+l; } - if (i<(int)tmp.length()) definition+=tmp.mid(i,tmp.length()-i); + definition+=in.substr(i); // add define definition to the dictionary of defines for this file - QCString dname = ds.left(i_obrace); - if (!dname.isEmpty()) + std::string dname = ds.substr(0,i_obrace); + if (!dname.empty()) { Define def; def.name = dname; @@ -3263,16 +3289,12 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName) //printf("#define '%s' '%s' #nargs=%d\n", // def->name.data(),def->definition.data(),def->nargs); } - } - else if ((i_obrace==-1 || i_obrace>i_equals) && - (i_cbrace==-1 || i_cbrace>i_equals) && - !ds.isEmpty() && (int)ds.length()>i_equals - ) // predefined non-function macro definition + else if (!ds.empty()) // predefined non-function macro definition { - //printf("predefined normal macro '%s'\n",defStr); + //printf("predefined normal macro '%s'\n",ds.c_str()); Define def; - if (i_equals==-1) // simple define without argument + if (i_equals==std::string::npos) // simple define without argument { def.name = ds; def.definition = "1"; // substitute occurrences by 1 (true) @@ -3280,8 +3302,8 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName) else // simple define with argument { int ine=i_equals - (nonRecursive ? 1 : 0); - def.name = ds.left(ine); - def.definition = ds.right(ds.length()-i_equals-1); + def.name = ds.substr(0,ine); + def.definition = ds.substr(i_equals+1); } if (!def.name.isEmpty()) { |