summaryrefslogtreecommitdiffstats
path: root/src/docparser.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-11-18 21:50:39 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-11-18 21:50:39 (GMT)
commitdd7602fdd31d8f3e0f88be553da084a1e3fdec45 (patch)
treea6d2454b4e6d53003fa829bb7134fe373461ed97 /src/docparser.cpp
parentbe602ee76006d9b8b0f6e5e75114f2ce34f7773e (diff)
downloadDoxygen-dd7602fdd31d8f3e0f88be553da084a1e3fdec45.zip
Doxygen-dd7602fdd31d8f3e0f88be553da084a1e3fdec45.tar.gz
Doxygen-dd7602fdd31d8f3e0f88be553da084a1e3fdec45.tar.bz2
Release-1.7.2-20101118
Diffstat (limited to 'src/docparser.cpp')
-rw-r--r--src/docparser.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 1b51d0a..55c1f0f 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -540,6 +540,7 @@ static void detectNoDocumentedParams()
g_memberDef->hasDocumentedReturnType() ||
returnType.isEmpty() || // empty return type
returnType.find("void")!=-1 || // void return type
+ returnType.find("subroutine")!=-1 || // fortran subroutine
g_memberDef->isConstructor() || // a constructor
g_memberDef->isDestructor() // or destructor
)
@@ -1107,8 +1108,12 @@ static void handleLinkedWord(DocNode *parent,QList<DocNode> &children)
if (g_token->name.left(1)=="#" || g_token->name.left(2)=="::")
{
warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: explicit link request to '%s' could not be resolved",qPrint(name));
+ children.append(new DocWord(parent,g_token->name));
+ }
+ else
+ {
+ children.append(new DocWord(parent,name));
}
- children.append(new DocWord(parent,name));
}
}
@@ -1179,6 +1184,9 @@ reparsetoken:
case CMD_HASH:
children.append(new DocSymbol(parent,DocSymbol::Hash));
break;
+ case CMD_DCOLON:
+ children.append(new DocSymbol(parent,DocSymbol::DoubleColon));
+ break;
case CMD_PERCENT:
children.append(new DocSymbol(parent,DocSymbol::Percent));
break;
@@ -3018,6 +3026,7 @@ int DocIndexEntry::parse()
case CMD_AMP: m_entry+='&'; break;
case CMD_DOLLAR: m_entry+='$'; break;
case CMD_HASH: m_entry+='#'; break;
+ case CMD_DCOLON: m_entry+="::"; break;
case CMD_PERCENT: m_entry+='%'; break;
case CMD_QUOTE: m_entry+='"'; break;
default:
@@ -4772,6 +4781,9 @@ int DocPara::handleCommand(const QCString &cmdName)
case CMD_HASH:
m_children.append(new DocSymbol(this,DocSymbol::Hash));
break;
+ case CMD_DCOLON:
+ m_children.append(new DocSymbol(this,DocSymbol::DoubleColon));
+ break;
case CMD_PERCENT:
m_children.append(new DocSymbol(this,DocSymbol::Percent));
break;
@@ -6197,6 +6209,9 @@ void DocText::parse()
case CMD_HASH:
m_children.append(new DocSymbol(this,DocSymbol::Hash));
break;
+ case CMD_DCOLON:
+ m_children.append(new DocSymbol(this,DocSymbol::DoubleColon));
+ break;
case CMD_PERCENT:
m_children.append(new DocSymbol(this,DocSymbol::Percent));
break;