diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2003-08-08 12:54:22 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2003-08-08 12:54:22 (GMT) |
commit | 8626ab32d671ffcdc75dffce04dd05a671cfb42c (patch) | |
tree | 7c2d3f65b509d762729291b5341f0751138192fd /src/util.cpp | |
parent | 3c3a5b287bbaa5d073eac5e561f88a305c5cbe26 (diff) | |
download | Doxygen-8626ab32d671ffcdc75dffce04dd05a671cfb42c.zip Doxygen-8626ab32d671ffcdc75dffce04dd05a671cfb42c.tar.gz Doxygen-8626ab32d671ffcdc75dffce04dd05a671cfb42c.tar.bz2 |
Release-1.3.3-20030808
Diffstat (limited to 'src/util.cpp')
-rw-r--r-- | src/util.cpp | 64 |
1 files changed, 47 insertions, 17 deletions
diff --git a/src/util.cpp b/src/util.cpp index 832ff5f..bab9314 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -542,7 +542,9 @@ NamespaceDef *getResolvedNamespace(const char *name) } } -ClassDef *getResolvedClass( +static QDict<Definition> g_resolvedScopes; + +ClassDef *getResolvedClassRecursive( Definition *scope, const char *n, bool *pIsTypeDef, @@ -678,8 +680,13 @@ ClassDef *getResolvedClass( NamespaceDef *und; for (nli.toFirst();(und=nli.current());++nli) { - cd = getResolvedClass(und,name,pIsTypeDef,pTemplSpec); - if (cd) break; + if (g_resolvedScopes.find(und->name())==0) + { + g_resolvedScopes.insert(und->name(),und); + cd = getResolvedClassRecursive(und,name,pIsTypeDef,pTemplSpec); + g_resolvedScopes.remove(und->name()); + if (cd) break; + } } } } @@ -697,6 +704,18 @@ found: return cd; } + +ClassDef *getResolvedClass( + Definition *scope, + const char *n, + bool *pIsTypeDef, + QCString *pTemplSpec + ) +{ + g_resolvedScopes.clear(); + return getResolvedClassRecursive(scope,n,pIsTypeDef,pTemplSpec); +} + static bool findOperator(const QCString &s,int i) { int b = s.findRev("operator",i); @@ -1526,45 +1545,51 @@ static void trimNamespaceScope(QCString &t1,QCString &t2,const QCString &nsName) */ void stripIrrelevantConstVolatile(QCString &s) { + //printf("stripIrrelevantConstVolatile(%s)=",s.data()); int i; if (s=="const") { s.resize(0); return; } if (s=="volatile") { s.resize(0); return; } // strip occurrences of const + int constLen=6; i = s.find("const "); + if (i==-1 && s.right(5)=="const") { i=s.length()-5;constLen=5; } if (i!=-1) { // no & or * after the const - int i1=s.find('*',i+6); - int i2=s.find('&',i+6); + int i1=s.find('*',i+constLen); + int i2=s.find('&',i+constLen); if (i1==-1 && i2==-1) { - s=s.left(i)+s.right(s.length()-i-6); + s=s.left(i)+s.right(s.length()-i-constLen); } else if ((i1!=-1 && i<i1) || (i2!=-1 && i<i2)) // const before * or & { // move const to front - s=(QCString)"const "+s.left(i)+s.right(s.length()-i-6); + s=(QCString)"const "+s.left(i)+s.right(s.length()-i-constLen); } } // strip occurrences of volatile + int volatileLen=6; i = s.find("volatile "); + if (i==-1 && s.right(8)=="volatile") { i=s.length()-8;constLen=8; } if (i!=-1) { // no & or * after the volatile - int i1=s.find('*',i+9); - int i2=s.find('&',i+9); + int i1=s.find('*',i+volatileLen); + int i2=s.find('&',i+volatileLen); if (i1==-1 && i2==-1) { - s=s.left(i)+s.right(s.length()-i-9); + s=s.left(i)+s.right(s.length()-i-volatileLen); } else if ((i1!=-1 && i<i1) || (i2!=-1 && i<i2)) // volatile before * or & { // move volatile to front - s=(QCString)"volatile "+s.left(i)+s.right(s.length()-i-9); + s=(QCString)"volatile "+s.left(i)+s.right(s.length()-i-volatileLen); } } + //printf("%s\n",s.data()); } @@ -2608,7 +2633,7 @@ bool resolveRef(/* in */ const char *scName, return FALSE; } -QCString linkToText(const char *link) +QCString linkToText(const char *link,bool isFileName) { QCString result=link; if (!result.isEmpty()) @@ -2616,8 +2641,8 @@ QCString linkToText(const char *link) // replace # by :: result=substitute(result,"#","::"); // replace . by :: - result=substitute(result,".","::"); - // strip :: prefix if present + if (!isFileName) result=substitute(result,".","::"); + // strip leading :: prefix if present if (result.at(0)==':' && result.at(1)==':') { result=result.right(result.length()-2); @@ -2658,7 +2683,7 @@ bool generateRef(OutputDocInterface &od,const char *scName, MemberDef *md; // create default link text - QCString linkText = linkToText(rt); + QCString linkText = linkToText(rt,FALSE); if (resolveRef(scName,name,inSeeBlock,&compound,&md)) { @@ -2680,6 +2705,10 @@ bool generateRef(OutputDocInterface &od,const char *scName, { linkText=((GroupDef *)compound)->groupTitle(); } + if (compound && compound->definitionType()==Definition::TypeFile) + { + linkText=linkToText(rt,TRUE); + } od.writeObjectLink(compound->getReference(), compound->getOutputFileBase(), 0,linkText); @@ -2784,7 +2813,7 @@ bool generateLink(OutputDocInterface &od,const char *clName, //printf("generateLink(clName=%s,lr=%s,lr=%s)\n",clName,lr,lt); Definition *compound; //PageDef *pageDef=0; - QCString anchor,linkText=linkToText(lt); + QCString anchor,linkText=linkToText(lt,FALSE); //printf("generateLink linkText=%s\n",linkText.data()); if (resolveLink(clName,lr,inSeeBlock,&compound,anchor)) { @@ -2808,7 +2837,7 @@ bool generateLink(OutputDocInterface &od,const char *clName, } else if (compound->definitionType()==Definition::TypeFile) { - linkText=lt; // use text "as is" + linkText=linkToText(lt,TRUE); } od.writeObjectLink(compound->getReference(), compound->getOutputFileBase(),anchor,linkText); @@ -4031,6 +4060,7 @@ void filterLatexString(QTextStream &t,const char *str, theTranslator->idLanguage()=="chinese-traditional"; static bool isLatin2 = theTranslator->idLanguageCharset()=="iso-8859-2"; static bool isGreek = theTranslator->idLanguage()=="greek"; + //printf("filterLatexString(%s)\n",str); if (str) { const unsigned char *p=(const unsigned char *)str; |