diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-11-24 18:09:27 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-11-24 18:10:19 (GMT) |
| commit | 890e3567470b0767c5ebe52207d1c75a96e888aa (patch) | |
| tree | f599244da6988621f5317f3751b5448ca1f5ec57 /src | |
| parent | dcf89b56c0fd1fb75fbdd2eddff33187ceac0b23 (diff) | |
| download | Doxygen-890e3567470b0767c5ebe52207d1c75a96e888aa.zip Doxygen-890e3567470b0767c5ebe52207d1c75a96e888aa.tar.gz Doxygen-890e3567470b0767c5ebe52207d1c75a96e888aa.tar.bz2 | |
Fixed differently by changing root cause for introducing the space
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflist.cpp | 5 | ||||
| -rw-r--r-- | src/scanner.l | 2 | ||||
| -rw-r--r-- | src/util.cpp | 11 |
3 files changed, 5 insertions, 13 deletions
diff --git a/src/reflist.cpp b/src/reflist.cpp index fe87bd5..6f2a763 100644 --- a/src/reflist.cpp +++ b/src/reflist.cpp @@ -162,10 +162,7 @@ void RefList::generatePage() if (item->scope->name() != "<globalScope>") { doc += "\\_setscope "; - if (item->scope->name().right(3)==" -p") - doc += item->scope->name().left(item->scope->name().length()-3) + "-p"; - else - doc += item->scope->name(); + doc += item->scope->name(); doc += " "; } } diff --git a/src/scanner.l b/src/scanner.l index a0b4e83..7559e0b 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -5457,7 +5457,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } BEGIN( FindMembers ) ; } -<CompoundName>{SCOPENAME}{BN}*/"<" { +<CompoundName>{SCOPENAME}/{BN}*"<" { sharpCount = 0; current->name = yytext ; if (current->spec & Entry::Protocol) diff --git a/src/util.cpp b/src/util.cpp index 330fc57..819903c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1424,12 +1424,8 @@ static ClassDef *getResolvedClassRec(const Definition *scope, di = Doxygen::symbolMap->find(name+"-p"); if (di==0) { - di = Doxygen::symbolMap->find(name+" -p"); - if (di==0) - { - //printf("no such symbol!\n"); - return 0; - } + //printf("no such symbol!\n"); + return 0; } //} } @@ -4560,8 +4556,7 @@ static bool getScopeDefs(const char *docScope,const char *scope, if (scopeOffset>0) fullName.prepend(docScopeName.left(scopeOffset)+"::"); if (((cd=getClass(fullName)) || // normal class - (cd=getClass(fullName+"-p")) || // ObjC protocol - (cd=getClass(fullName+" -p")) //|| // ObjC protocol + (cd=getClass(fullName+"-p")) //|| // ObjC protocol //(cd=getClass(fullName+"-g")) // C# generic ) && cd->isLinkable()) { |