diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-04-29 19:25:24 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-04-29 19:25:24 (GMT) |
| commit | 6ca67aa0e617816789f2a662c86ad82426377b71 (patch) | |
| tree | 77a589554e5c9b6df1caefc3a72bb6213ecbf731 /src/scanner.l | |
| parent | e0e5f733ca5b41365ca76bbba1b7529cd1f24b66 (diff) | |
| download | Doxygen-6ca67aa0e617816789f2a662c86ad82426377b71.zip Doxygen-6ca67aa0e617816789f2a662c86ad82426377b71.tar.gz Doxygen-6ca67aa0e617816789f2a662c86ad82426377b71.tar.bz2 | |
Refactoring: replace Doxygen::namespaceAliasDict by Doxygen::namespaceAliasMap
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/scanner.l b/src/scanner.l index dff6f54..8ceb4ad 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1642,17 +1642,9 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } <NSAliasArg>({ID}"::")*{ID} { //printf("Inserting namespace alias %s::%s->%s\n",yyextra->current_root->name.data(),yyextra->aliasName.data(),yytext); - //if (yyextra->current_root->name.isEmpty()) - //{ // TODO: namespace aliases are now treated as global entities // while they should be aware of the scope they are in - Doxygen::namespaceAliasDict.insert(yyextra->aliasName,new QCString(yytext)); - //} - //else - //{ - // Doxygen::namespaceAliasDict.insert(yyextra->current_root->name+"::"+yyextra->aliasName, - // new QCString(yyextra->current_root->name+"::"+yytext)); - //} + Doxygen::namespaceAliasMap.insert({yyextra->aliasName.data(),std::string(yytext)}); } <NSAliasArg>";" { BEGIN( FindMembers ); @@ -1685,9 +1677,9 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) //printf("PHP: adding use as relation: %s->%s\n",yytext,yyextra->aliasName.data()); if (!yyextra->aliasName.isEmpty()) { - Doxygen::namespaceAliasDict.insert(yytext, - new QCString(removeRedundantWhiteSpace( - substitute(yyextra->aliasName,"\\","::")))); + Doxygen::namespaceAliasMap.insert({yytext, + std::string(removeRedundantWhiteSpace( + substitute(yyextra->aliasName,"\\","::")).data())}); } yyextra->aliasName.resize(0); } |