summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/classdef.cpp16
-rw-r--r--src/classdef.h2
-rw-r--r--src/code.l29
-rw-r--r--src/compound.xsd108
-rw-r--r--src/compound_xsd.h108
-rw-r--r--src/definition.cpp46
-rw-r--r--src/definition.h19
-rw-r--r--src/docparser.cpp12
-rw-r--r--src/docparser.h31
-rw-r--r--src/doctokenizer.h4
-rw-r--r--src/doctokenizer.l32
-rw-r--r--src/doxygen.cpp127
-rw-r--r--src/filedef.cpp12
-rw-r--r--src/filedef.h6
-rw-r--r--src/htmldocvisitor.cpp34
-rw-r--r--src/latexdocvisitor.cpp20
-rw-r--r--src/memberdef.cpp2
-rw-r--r--src/memberdef.h2
-rw-r--r--src/namespacedef.cpp14
-rw-r--r--src/namespacedef.h6
-rw-r--r--src/perlmodgen.cpp2
-rw-r--r--src/scanner.l10
-rw-r--r--src/util.cpp211
-rw-r--r--src/util.h7
-rw-r--r--src/xmldocvisitor.cpp20
25 files changed, 561 insertions, 319 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 0ba7b6e..67fe145 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -129,8 +129,10 @@ ClassDef::~ClassDef()
QCString ClassDef::displayName() const
{
+ static bool hideScopeNames = Config_getBool("HIDE_SCOPE_NAMES");
+ static bool optimizeOutputForJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA");
QCString n;
- if (Config_getBool("HIDE_SCOPE_NAMES"))
+ if (hideScopeNames)
{
n=m_className;
}
@@ -138,7 +140,7 @@ QCString ClassDef::displayName() const
{
n=qualifiedNameWithTemplateParameters();
}
- if (Config_getBool("OPTIMIZE_OUTPUT_JAVA"))
+ if (optimizeOutputForJava)
{
n=substitute(n,"::",".");
}
@@ -1932,10 +1934,15 @@ bool ClassDef::hasDocumentation() const
// returns TRUE iff class definition `bcd' represents an (in)direct base
// class of class definition `cd'.
-bool ClassDef::isBaseClass(ClassDef *bcd, bool followInstances)
+bool ClassDef::isBaseClass(ClassDef *bcd, bool followInstances,int level)
{
bool found=FALSE;
//printf("isBaseClass(cd=%s) looking for %s\n",cd->name().data(),bcd->name().data());
+ if (level>256)
+ {
+ err("Possible recursive class relation while inside %s and looking for %s\n",name().data(),bcd->name().data());
+ return FALSE;
+ }
BaseClassListIterator bcli(*baseClasses());
for ( ; bcli.current() && !found ; ++bcli)
{
@@ -1945,7 +1952,7 @@ bool ClassDef::isBaseClass(ClassDef *bcd, bool followInstances)
if (ccd==bcd)
found=TRUE;
else
- found=ccd->isBaseClass(bcd,followInstances);
+ found=ccd->isBaseClass(bcd,followInstances,level+1);
}
return found;
}
@@ -2843,4 +2850,3 @@ MemberDef *ClassDef::getMemberByName(const QCString &name)
return xmd;
}
-
diff --git a/src/classdef.h b/src/classdef.h
index d745f83..b82e603 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -149,7 +149,7 @@ class ClassDef : public Definition
* class. This function will recusively traverse all branches of the
* inheritance tree.
*/
- bool isBaseClass(ClassDef *bcd,bool followInstances);
+ bool isBaseClass(ClassDef *bcd,bool followInstances,int level=0);
/*! Returns a sorted dictionary with all template instances found for
* this template class. Returns 0 if not a template or no instances.
diff --git a/src/code.l b/src/code.l
index 5bf9935..366d007 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1466,6 +1466,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
%x ObjCCall
%x ObjCMName
%x ObjCSkipStr
+%x OldStyleArgs
%%
@@ -1783,7 +1784,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
if (getResolvedClass(g_currentDefinition,g_sourceFileDef,g_curClassName)==0)
{
ClassDef *ncd=new ClassDef("<code>",1,
- g_curClassName,ClassDef::Class,0,0,TRUE);
+ g_curClassName,ClassDef::Class,0,0,FALSE);
g_codeClassSDict.append(g_curClassName,ncd);
// insert base classes.
char *s=g_curClassBases.first();
@@ -2280,7 +2281,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
g_code->codify(yytext);
endFontClass();
}
-<MemberCall2,FuncCall>{TYPEKW}/([^a-z_A-Z0-9]) {
+<MemberCall2,FuncCall,OldStyleArgs>{TYPEKW}/([^a-z_A-Z0-9]) {
addParmType();
g_parmName=yytext;
startFontClass("keywordtype");
@@ -2352,7 +2353,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
BEGIN( SkipInits );
}
}
-<CallEnd>({BN}"const"|"volatile")*{BN}*"{" {
+<CallEnd,OldStyleArgs>({BN}"const"|"volatile")*{BN}*"{" {
if (g_insideBody)
{
g_theVarContext.pushScope();
@@ -2401,6 +2402,28 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
g_type.resize(0); g_name.resize(0);
BEGIN( Body );
}
+<CallEnd>{ID} {
+ if (g_insideBody || !g_parmType.isEmpty())
+ {
+ REJECT;
+ }
+ // could be K&R style definition
+ addParmType();
+ g_parmName=yytext;
+ generateClassOrGlobalLink(*g_code,yytext,!g_insideBody);
+ BEGIN(OldStyleArgs);
+ }
+<OldStyleArgs>{ID} {
+ addParmType();
+ g_parmName=yytext;
+ generateClassOrGlobalLink(*g_code,yytext,!g_insideBody);
+ }
+<OldStyleArgs>[,;] {
+ g_code->codify(yytext);
+ g_theVarContext.addVariable(g_parmType,g_parmName);
+ if (*yytext==';') g_parmType.resize(0);
+ g_parmName.resize(0);
+ }
<CallEnd>. {
unput(*yytext);
if (!g_insideBody)
diff --git a/src/compound.xsd b/src/compound.xsd
index ac77e4b..6edff66 100644
--- a/src/compound.xsd
+++ b/src/compound.xsd
@@ -36,7 +36,7 @@
<xsd:element name="location" type="locationType" minOccurs="0" />
<xsd:element name="listofallmembers" type="listofallmembersType" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
<xsd:attribute name="kind" type="DoxCompoundKind" />
<xsd:attribute name="prot" type="DoxProtectionKind" />
</xsd:complexType>
@@ -52,35 +52,55 @@
<xsd:element name="scope" />
<xsd:element name="name" />
</xsd:sequence>
- <xsd:attribute name="refid" />
+ <xsd:attribute name="refid" type="xsd:string" />
<xsd:attribute name="prot" type="DoxProtectionKind" />
<xsd:attribute name="virt" type="DoxVirtualKind" />
<xsd:attribute name="ambiguityscope" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="compoundRefType" mixed="true">
- <xsd:attribute name="refid" />
- <xsd:attribute name="prot" type="DoxProtectionKind" />
- <xsd:attribute name="virt" type="DoxVirtualKind" />
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="refid" type="xsd:string" />
+ <xsd:attribute name="prot" type="DoxProtectionKind" />
+ <xsd:attribute name="virt" type="DoxVirtualKind" />
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="reimplementType" mixed="true">
- <xsd:attribute name="refid" />
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="refid" type="xsd:string" />
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="incType" mixed="true">
- <xsd:attribute name="refid" />
- <xsd:attribute name="local" type="DoxBool" />
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="refid" type="xsd:string" />
+ <xsd:attribute name="local" type="DoxBool" />
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="refType" mixed="true">
- <xsd:attribute name="refid" />
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="refid" type="xsd:string" />
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="refTextType" mixed="true">
- <xsd:attribute name="refid" />
- <xsd:attribute name="kindref" />
- <xsd:attribute name="external" />
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="refid" type="xsd:string" />
+ <xsd:attribute name="kindref" type="DoxRefKind" />
+ <xsd:attribute name="external" type="xsd:string" />
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="sectiondefType">
@@ -112,7 +132,7 @@
<xsd:element name="referencedby" type="referenceType" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
<xsd:attribute name="kind" type="DoxMemberKind" />
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
<xsd:attribute name="prot" type="DoxProtectionKind" />
<xsd:attribute name="static" type="DoxBool" />
<xsd:attribute name="const" type="DoxBool" />
@@ -140,7 +160,7 @@
<xsd:element name="detaileddescription" type="descriptionType" minOccurs="0" />
<xsd:element name="initializer" type="linkedTextType" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
<xsd:attribute name="prot" type="DoxProtectionKind" />
</xsd:complexType>
@@ -179,20 +199,20 @@
<xsd:element name="link" type="linkType" minOccurs="0" />
<xsd:element name="childnode" type="childnodeType" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="childnodeType">
<xsd:sequence>
<xsd:element name="edgelabel" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="refid" />
+ <xsd:attribute name="refid" type="xsd:string" />
<xsd:attribute name="relation" type="DoxGraphRelation" />
</xsd:complexType>
<xsd:complexType name="linkType">
- <xsd:attribute name="refid" />
- <xsd:attribute name="external" use="optional"/>
+ <xsd:attribute name="refid" type="xsd:string" />
+ <xsd:attribute name="external" type="DoxBool" use="optional"/>
</xsd:complexType>
<xsd:complexType name="listingType">
@@ -206,9 +226,9 @@
<xsd:element name="highlight" type="highlightType" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
<xsd:attribute name="lineno" type="xsd:integer" />
- <xsd:attribute name="refid" />
+ <xsd:attribute name="refid" type="xsd:string" />
<xsd:attribute name="refkind" type="DoxRefKind" />
- <xsd:attribute name="external" />
+ <xsd:attribute name="external" type="DoxBool" />
</xsd:complexType>
<xsd:complexType name="highlightType" mixed="true">
@@ -220,14 +240,14 @@
</xsd:complexType>
<xsd:complexType name="referenceType" mixed="true">
- <xsd:attribute name="refid" />
- <xsd:attribute name="compoundref" use="optional" />
+ <xsd:attribute name="refid" type="xsd:string" />
+ <xsd:attribute name="compoundref" type="xsd:string" use="optional" />
<xsd:attribute name="startline" type="xsd:integer" />
<xsd:attribute name="endline" type="xsd:integer" />
</xsd:complexType>
<xsd:complexType name="locationType">
- <xsd:attribute name="file" />
+ <xsd:attribute name="file" type="xsd:string" />
<xsd:attribute name="line" type="xsd:integer" />
<xsd:attribute name="bodystart" type="xsd:integer" />
<xsd:attribute name="bodyend" type="xsd:integer" />
@@ -240,7 +260,7 @@
<xsd:element name="sect2" type="docSect2Type" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="internal" type="docInternalS1Type" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docSect2Type" mixed="true">
@@ -250,7 +270,7 @@
<xsd:element name="sect3" type="docSect3Type" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="internal" type="docInternalS2Type" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docSect3Type" mixed="true">
@@ -260,7 +280,7 @@
<xsd:element name="sect4" type="docSect4Type" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="internal" type="docInternalS3Type" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docSect4Type" mixed="true">
@@ -269,7 +289,7 @@
<xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="internal" type="docInternalS4Type" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docInternalType" mixed="true">
@@ -382,11 +402,11 @@
</xsd:complexType>
<xsd:complexType name="docAnchorType" mixed="true">
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docFormulaType" mixed="true">
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docIndexEntryType">
@@ -437,9 +457,9 @@
<xsd:complexType name="docRefTextType" mixed="true">
<xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="refid" />
- <xsd:attribute name="kindref" />
- <xsd:attribute name="external" />
+ <xsd:attribute name="refid" type="xsd:string" />
+ <xsd:attribute name="kindref" type="DoxRefKind" />
+ <xsd:attribute name="external" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docTableType">
@@ -488,7 +508,7 @@
<xsd:complexType name="docTocItemType" mixed="true">
<xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docTocListType">
@@ -506,11 +526,19 @@
<xsd:group name="docParamListGroup">
<xsd:sequence>
- <xsd:element name="parametername" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="parametername" type="docParamName" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="parameterdescription" type="descriptionType" />
</xsd:sequence>
</xsd:group>
+ <xsd:complexType name="docParamName">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="direction" type="DoxParamDir" use="optional" />
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
<xsd:complexType name="docParamListType">
<xsd:sequence>
<xsd:group ref="docParamListGroup" maxOccurs="unbounded" />
@@ -523,7 +551,7 @@
<xsd:element name="xreftitle" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="xrefdescription" type="descriptionType" />
</xsd:sequence>
- <xsd:attribute name="id" />
+ <xsd:attribute name="id" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docCopyType">
@@ -532,7 +560,7 @@
<xsd:element name="sect1" type="docSect1Type" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="internal" type="docInternalType" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="link" />
+ <xsd:attribute name="link" type="xsd:string" />
</xsd:complexType>
<xsd:complexType name="docCharType">
@@ -722,5 +750,13 @@
</xsd:restriction>
</xsd:simpleType>
+ <xsd:simpleType name="DoxParamDir">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="in"/>
+ <xsd:enumeration value="out"/>
+ <xsd:enumeration value="inout"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
</xsd:schema>
diff --git a/src/compound_xsd.h b/src/compound_xsd.h
index 6af2a92..adf1a25 100644
--- a/src/compound_xsd.h
+++ b/src/compound_xsd.h
@@ -36,7 +36,7 @@
" <xsd:element name=\"location\" type=\"locationType\" minOccurs=\"0\" />\n"
" <xsd:element name=\"listofallmembers\" type=\"listofallmembersType\" minOccurs=\"0\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" <xsd:attribute name=\"kind\" type=\"DoxCompoundKind\" />\n"
" <xsd:attribute name=\"prot\" type=\"DoxProtectionKind\" />\n"
" </xsd:complexType>\n"
@@ -52,35 +52,55 @@
" <xsd:element name=\"scope\" />\n"
" <xsd:element name=\"name\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"refid\" />\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
" <xsd:attribute name=\"prot\" type=\"DoxProtectionKind\" />\n"
" <xsd:attribute name=\"virt\" type=\"DoxVirtualKind\" />\n"
" <xsd:attribute name=\"ambiguityscope\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"compoundRefType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"refid\" />\n"
-" <xsd:attribute name=\"prot\" type=\"DoxProtectionKind\" />\n"
-" <xsd:attribute name=\"virt\" type=\"DoxVirtualKind\" />\n"
+" <xsd:simpleContent>\n"
+" <xsd:extension base=\"xsd:string\">\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" <xsd:attribute name=\"prot\" type=\"DoxProtectionKind\" />\n"
+" <xsd:attribute name=\"virt\" type=\"DoxVirtualKind\" />\n"
+" </xsd:extension>\n"
+" </xsd:simpleContent>\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"reimplementType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"refid\" />\n"
+" <xsd:simpleContent>\n"
+" <xsd:extension base=\"xsd:string\">\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" </xsd:extension>\n"
+" </xsd:simpleContent>\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"incType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"refid\" />\n"
-" <xsd:attribute name=\"local\" type=\"DoxBool\" />\n"
+" <xsd:simpleContent>\n"
+" <xsd:extension base=\"xsd:string\">\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" <xsd:attribute name=\"local\" type=\"DoxBool\" />\n"
+" </xsd:extension>\n"
+" </xsd:simpleContent>\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"refType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"refid\" />\n"
+" <xsd:simpleContent>\n"
+" <xsd:extension base=\"xsd:string\">\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" </xsd:extension>\n"
+" </xsd:simpleContent>\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"refTextType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"refid\" />\n"
-" <xsd:attribute name=\"kindref\" />\n"
-" <xsd:attribute name=\"external\" />\n"
+" <xsd:simpleContent>\n"
+" <xsd:extension base=\"xsd:string\">\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" <xsd:attribute name=\"kindref\" type=\"DoxRefKind\" />\n"
+" <xsd:attribute name=\"external\" type=\"xsd:string\" />\n"
+" </xsd:extension>\n"
+" </xsd:simpleContent>\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"sectiondefType\">\n"
@@ -112,7 +132,7 @@
" <xsd:element name=\"referencedby\" type=\"referenceType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" </xsd:sequence>\n"
" <xsd:attribute name=\"kind\" type=\"DoxMemberKind\" />\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" <xsd:attribute name=\"prot\" type=\"DoxProtectionKind\" />\n"
" <xsd:attribute name=\"static\" type=\"DoxBool\" />\n"
" <xsd:attribute name=\"const\" type=\"DoxBool\" />\n"
@@ -140,7 +160,7 @@
" <xsd:element name=\"detaileddescription\" type=\"descriptionType\" minOccurs=\"0\" />\n"
" <xsd:element name=\"initializer\" type=\"linkedTextType\" minOccurs=\"0\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" <xsd:attribute name=\"prot\" type=\"DoxProtectionKind\" />\n"
" </xsd:complexType>\n"
"\n"
@@ -179,20 +199,20 @@
" <xsd:element name=\"link\" type=\"linkType\" minOccurs=\"0\" />\n"
" <xsd:element name=\"childnode\" type=\"childnodeType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"childnodeType\">\n"
" <xsd:sequence>\n"
" <xsd:element name=\"edgelabel\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"refid\" />\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
" <xsd:attribute name=\"relation\" type=\"DoxGraphRelation\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"linkType\">\n"
-" <xsd:attribute name=\"refid\" />\n"
-" <xsd:attribute name=\"external\" use=\"optional\"/>\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" <xsd:attribute name=\"external\" type=\"DoxBool\" use=\"optional\"/>\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"listingType\">\n"
@@ -206,9 +226,9 @@
" <xsd:element name=\"highlight\" type=\"highlightType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" </xsd:sequence>\n"
" <xsd:attribute name=\"lineno\" type=\"xsd:integer\" />\n"
-" <xsd:attribute name=\"refid\" />\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
" <xsd:attribute name=\"refkind\" type=\"DoxRefKind\" />\n"
-" <xsd:attribute name=\"external\" />\n"
+" <xsd:attribute name=\"external\" type=\"DoxBool\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"highlightType\" mixed=\"true\">\n"
@@ -220,14 +240,14 @@
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"referenceType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"refid\" />\n"
-" <xsd:attribute name=\"compoundref\" use=\"optional\" />\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" <xsd:attribute name=\"compoundref\" type=\"xsd:string\" use=\"optional\" />\n"
" <xsd:attribute name=\"startline\" type=\"xsd:integer\" />\n"
" <xsd:attribute name=\"endline\" type=\"xsd:integer\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"locationType\">\n"
-" <xsd:attribute name=\"file\" />\n"
+" <xsd:attribute name=\"file\" type=\"xsd:string\" />\n"
" <xsd:attribute name=\"line\" type=\"xsd:integer\" />\n"
" <xsd:attribute name=\"bodystart\" type=\"xsd:integer\" />\n"
" <xsd:attribute name=\"bodyend\" type=\"xsd:integer\" />\n"
@@ -240,7 +260,7 @@
" <xsd:element name=\"sect2\" type=\"docSect2Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" <xsd:element name=\"internal\" type=\"docInternalS1Type\" minOccurs=\"0\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docSect2Type\" mixed=\"true\">\n"
@@ -250,7 +270,7 @@
" <xsd:element name=\"sect3\" type=\"docSect3Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" <xsd:element name=\"internal\" type=\"docInternalS2Type\" minOccurs=\"0\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docSect3Type\" mixed=\"true\">\n"
@@ -260,7 +280,7 @@
" <xsd:element name=\"sect4\" type=\"docSect4Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" <xsd:element name=\"internal\" type=\"docInternalS3Type\" minOccurs=\"0\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docSect4Type\" mixed=\"true\">\n"
@@ -269,7 +289,7 @@
" <xsd:element name=\"para\" type=\"docParaType\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" <xsd:element name=\"internal\" type=\"docInternalS4Type\" minOccurs=\"0\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docInternalType\" mixed=\"true\">\n"
@@ -382,11 +402,11 @@
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docAnchorType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docFormulaType\" mixed=\"true\">\n"
-" <xsd:attribute name=\"id\" />\n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docIndexEntryType\">\n"
@@ -437,9 +457,9 @@
"\n"
" <xsd:complexType name=\"docRefTextType\" mixed=\"true\">\n"
" <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
-" <xsd:attribute name=\"refid\" />\n"
-" <xsd:attribute name=\"kindref\" />\n"
-" <xsd:attribute name=\"external\" />\n"
+" <xsd:attribute name=\"refid\" type=\"xsd:string\" />\n"
+" <xsd:attribute name=\"kindref\" type=\"DoxRefKind\" />\n"
+" <xsd:attribute name=\"external\" type=\"xsd:string\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docTableType\">\n"
@@ -488,7 +508,7 @@
"\n"
" <xsd:complexType name=\"docTocItemType\" mixed=\"true\">\n"
" <xsd:group ref=\"docTitleCmdGroup\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
-" <xsd:attribute name=\"id\" /> \n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" /> \n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docTocListType\">\n"
@@ -506,11 +526,19 @@
"\n"
" <xsd:group name=\"docParamListGroup\">\n"
" <xsd:sequence>\n"
-" <xsd:element name=\"parametername\" type=\"xsd:string\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
+" <xsd:element name=\"parametername\" type=\"docParamName\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" <xsd:element name=\"parameterdescription\" type=\"descriptionType\" />\n"
" </xsd:sequence>\n"
" </xsd:group>\n"
"\n"
+" <xsd:complexType name=\"docParamName\">\n"
+" <xsd:simpleContent>\n"
+" <xsd:extension base=\"xsd:string\">\n"
+" <xsd:attribute name=\"direction\" type=\"DoxParamDir\" use=\"optional\" />\n"
+" </xsd:extension>\n"
+" </xsd:simpleContent>\n"
+" </xsd:complexType>\n"
+"\n"
" <xsd:complexType name=\"docParamListType\">\n"
" <xsd:sequence>\n"
" <xsd:group ref=\"docParamListGroup\" maxOccurs=\"unbounded\" />\n"
@@ -523,7 +551,7 @@
" <xsd:element name=\"xreftitle\" type=\"xsd:string\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" <xsd:element name=\"xrefdescription\" type=\"descriptionType\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"id\" /> \n"
+" <xsd:attribute name=\"id\" type=\"xsd:string\" /> \n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docCopyType\">\n"
@@ -532,7 +560,7 @@
" <xsd:element name=\"sect1\" type=\"docSect1Type\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n"
" <xsd:element name=\"internal\" type=\"docInternalType\" minOccurs=\"0\" />\n"
" </xsd:sequence>\n"
-" <xsd:attribute name=\"link\" /> \n"
+" <xsd:attribute name=\"link\" type=\"xsd:string\" /> \n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docCharType\">\n"
@@ -722,5 +750,13 @@
" </xsd:restriction>\n"
" </xsd:simpleType>\n"
"\n"
+" <xsd:simpleType name=\"DoxParamDir\">\n"
+" <xsd:restriction base=\"xsd:string\">\n"
+" <xsd:enumeration value=\"in\"/>\n"
+" <xsd:enumeration value=\"out\"/>\n"
+" <xsd:enumeration value=\"inout\"/>\n"
+" </xsd:restriction>\n"
+" </xsd:simpleType>\n"
+"\n"
"</xsd:schema>\n"
"\n"
diff --git a/src/definition.cpp b/src/definition.cpp
index a99549b..aa20c7b 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -76,6 +76,7 @@ static void removeFromMap(Definition *d)
Definition::Definition(const char *df,int dl,
const char *name,const char *b,
const char *d,bool isSymbol)
+ : m_reachableDefs(17)
{
//QCString ns;
m_defFileName = df;
@@ -111,6 +112,8 @@ Definition::Definition(const char *df,int dl,
m_docFile=(QCString)"<"+name+">";
m_isSymbol = isSymbol;
if (m_isSymbol) addToMap(name,this);
+ m_reachableDefs.setAutoDelete(TRUE);
+ m_reachabilityComputed=FALSE;
}
Definition::~Definition()
@@ -578,9 +581,10 @@ void Definition::writeSourceRefs(OutputList &ol,const char *scopeName)
bool Definition::hasDocumentation() const
{
+ static bool extractAll = Config_getBool("EXTRACT_ALL");
return !m_doc.isEmpty() || // has detailed docs
!m_brief.isEmpty() || // has brief description
- Config_getBool("EXTRACT_ALL"); // extract everything
+ extractAll; // extract everything
}
void Definition::addSourceReferencedBy(MemberDef *md)
@@ -640,8 +644,10 @@ void Definition::addInnerCompound(Definition *)
err("Error: Definition::addInnerCompound() called\n");
}
-QCString Definition::qualifiedName() const
+QCString Definition::qualifiedName()
{
+ if (!m_qualifiedName.isEmpty()) return m_qualifiedName;
+
//printf("start Definition::qualifiedName() localName=%s\n",m_localName.data());
if (m_outerScope==0)
{
@@ -649,17 +655,16 @@ QCString Definition::qualifiedName() const
else return m_localName;
}
- QCString qualifiedName;
if (m_outerScope->name()=="<globalScope>")
{
- qualifiedName = m_localName.copy();
+ m_qualifiedName = m_localName.copy();
}
else
{
- qualifiedName = m_outerScope->qualifiedName()+"::"+m_localName;
+ m_qualifiedName = m_outerScope->qualifiedName()+"::"+m_localName;
}
//printf("end Definition::qualifiedName()=%s\n",qualifiedName.data());
- return qualifiedName;
+ return m_qualifiedName;
};
QCString Definition::localName() const
@@ -756,3 +761,32 @@ QCString Definition::convertNameToFile(const char *name,bool allowDots) const
}
}
+void Definition::addReachableDef(Definition *def,int distance)
+{
+ if (m_reachableDefs.find(def->qualifiedName()))
+ {
+ m_reachableDefs.insert(def->qualifiedName(),new ReachableDefinition(def,distance));
+ }
+}
+
+void Definition::computeReachability()
+{
+ if (m_reachabilityComputed) return;
+ addReachableDef(this,0);
+ Definition *parent = getOuterScope();
+ int i=1;
+ while (parent)
+ {
+ parent->computeReachability();
+ QDictIterator<ReachableDefinition> dli(m_reachableDefs);
+ ReachableDefinition *rd;
+ for (dli.toFirst();(rd=dli.current());++dli)
+ {
+ addReachableDef(rd->def,i);
+ }
+ parent=parent->getOuterScope();
+ i++;
+ }
+ m_reachabilityComputed=TRUE;
+}
+
diff --git a/src/definition.h b/src/definition.h
index 88d0479..a0a3cd9 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -20,6 +20,7 @@
#include "qtbc.h"
#include <qlist.h>
+#include <qdict.h>
class FileDef;
class OutputList;
@@ -32,6 +33,14 @@ class GroupDef;
class GroupList;
struct ListItemInfo;
struct SectionInfo;
+class Definition;
+
+struct ReachableDefinition
+{
+ ReachableDefinition(Definition *d,int dist) : def(d), distance(dist) {}
+ Definition *def;
+ int distance;
+};
/*! The common base class of all entity definitions found in the sources. */
class Definition
@@ -58,7 +67,7 @@ class Definition
/*! Returns the base name of the output file that contains this
* definition.
*/
- virtual QCString qualifiedName() const;
+ virtual QCString qualifiedName();
QCString localName() const;
virtual QCString getOutputFileBase() const = 0;
/*! Returns the name of the source listing of this file. */
@@ -132,6 +141,7 @@ class Definition
virtual Definition *getOuterScope() const { return m_outerScope; }
virtual void addInnerCompound(Definition *d);
virtual void setOuterScope(Definition *d) { m_outerScope = d; }
+ virtual void computeReachability();
MemberSDict *getReferencesMembers() const { return m_sourceRefsDict; }
MemberSDict *getReferencedByMembers() const { return m_sourceRefByDict; }
@@ -139,6 +149,7 @@ class Definition
void makePartOfGroup(GroupDef *gd);
GroupList *partOfGroups() const { return m_partOfGroups; }
QCString convertNameToFile(const char *name,bool allowDots=FALSE) const;
+ void addReachableDef(Definition *d,int distance);
protected:
int m_startBodyLine; // line number of the start of the definition
@@ -158,6 +169,9 @@ class Definition
/*! List of groups this definition is part of */
GroupList *m_partOfGroups;
+ // reachability of other definitions from this one
+ QDict<ReachableDefinition> m_reachableDefs;
+ bool m_reachabilityComputed;
private:
int getXRefListId(const char *listName) const;
@@ -181,6 +195,9 @@ class Definition
QList<ListItemInfo> *m_xrefListItems;
QCString m_symbolName;
bool m_isSymbol;
+
+
+ QCString m_qualifiedName;
};
class DefinitionList : public QList<Definition>
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 33cccff..d6fcee9 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -3154,13 +3154,13 @@ endparamlist:
//--------------------------------------------------------------------------
-int DocParamSect::parse(const QString &cmdName)
+int DocParamSect::parse(const QString &cmdName,Direction d)
{
int retval=RetVal_OK;
DBG(("DocParamSect::parse() start\n"));
g_nodeStack.push(this);
- DocParamList *pl = new DocParamList(this,m_type);
+ DocParamList *pl = new DocParamList(this,m_type,d);
if (m_children.isEmpty())
{
pl->markFirst();
@@ -3204,7 +3204,9 @@ int DocPara::handleSimpleSection(DocSimpleSect::Type t)
return (rv!=TK_NEWPARA) ? rv : RetVal_OK;
}
-int DocPara::handleParamSection(const QString &cmdName,DocParamSect::Type t)
+int DocPara::handleParamSection(const QString &cmdName,
+ DocParamSect::Type t,
+ int direction=DocParamSect::Unspecified)
{
DocParamSect *ps=0;
if (!m_children.isEmpty() && // previous element
@@ -3219,7 +3221,7 @@ int DocPara::handleParamSection(const QString &cmdName,DocParamSect::Type t)
ps=new DocParamSect(this,t);
m_children.append(ps);
}
- int rv=ps->parse(cmdName);
+ int rv=ps->parse(cmdName,(DocParamSect::Direction)direction);
return (rv!=TK_NEWPARA) ? rv : RetVal_OK;
}
@@ -3738,7 +3740,7 @@ int DocPara::handleCommand(const QString &cmdName)
warn_doc_error(g_fileName,doctokenizerYYlineno,"Warning: unexpected command %s",g_token->name.data());
break;
case CMD_PARAM:
- retval = handleParamSection(cmdName,DocParamSect::Param);
+ retval = handleParamSection(cmdName,DocParamSect::Param,g_token->paramDir);
break;
case CMD_RETVAL:
retval = handleParamSection(cmdName,DocParamSect::RetVal);
diff --git a/src/docparser.h b/src/docparser.h
index 8df9c53..ff13c46 100644
--- a/src/docparser.h
+++ b/src/docparser.h
@@ -909,8 +909,13 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode
{
Unknown, Param, RetVal, Exception
};
- DocParamSect(DocNode *parent,Type t) : m_parent(parent), m_type(t) {}
- int parse(const QString &cmdName);
+ enum Direction
+ {
+ In=1, Out=2, InOut=3, Unspecified=0
+ };
+ DocParamSect(DocNode *parent,Type t)
+ : m_parent(parent), m_type(t) {}
+ int parse(const QString &cmdName,Direction d);
Kind kind() const { return Kind_ParamSect; }
Type type() const { return m_type; }
DocNode *parent() const { return m_parent; }
@@ -919,6 +924,7 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode
private:
DocNode * m_parent;
Type m_type;
+ Direction m_dir;
};
/*! Node representing a paragraph in the documentation tree */
@@ -943,7 +949,8 @@ class DocPara : public CompAccept<DocPara>, public DocNode
int handleHtmlEndTag(const QString &tagName);
int handleSimpleSection(DocSimpleSect::Type t);
int handleXRefItem();
- int handleParamSection(const QString &cmdName,DocParamSect::Type t);
+ int handleParamSection(const QString &cmdName,DocParamSect::Type t,
+ int direction);
void handleIncludeOperator(const QString &cmdName,DocIncOperator::Type t);
void handleImage(const QString &cmdName);
void handleDotFile(const QString &cmdName);
@@ -965,14 +972,15 @@ class DocPara : public CompAccept<DocPara>, public DocNode
class DocParamList : public DocNode
{
public:
- DocParamList(DocNode *parent,DocParamSect::Type t)
- : m_parent(parent) , m_type(t), m_isFirst(TRUE), m_isLast(TRUE)
+ DocParamList(DocNode *parent,DocParamSect::Type t,DocParamSect::Direction d)
+ : m_parent(parent) , m_type(t), m_dir(d), m_isFirst(TRUE), m_isLast(TRUE)
{ m_paragraph=new DocPara(this); }
virtual ~DocParamList() { delete m_paragraph; }
Kind kind() const { return Kind_ParamList; }
DocNode *parent() const { return m_parent; }
const QStrList &parameters() { return m_params; }
DocParamSect::Type type() const { return m_type; }
+ DocParamSect::Direction direction() const { return m_dir; }
void markFirst(bool b=TRUE) { m_isFirst=b; }
void markLast(bool b=TRUE) { m_isLast=b; }
bool isFirst() const { return m_isFirst; }
@@ -986,12 +994,13 @@ class DocParamList : public DocNode
int parse(const QString &cmdName);
private:
- DocNode * m_parent;
- DocPara * m_paragraph;
- QStrList m_params;
- DocParamSect::Type m_type;
- bool m_isFirst;
- bool m_isLast;
+ DocNode * m_parent;
+ DocPara * m_paragraph;
+ QStrList m_params;
+ DocParamSect::Type m_type;
+ DocParamSect::Direction m_dir;
+ bool m_isFirst;
+ bool m_isLast;
};
/*! @brief Node representing an item of a auto list */
diff --git a/src/doctokenizer.h b/src/doctokenizer.h
index 4bac78d..6b5fac8 100644
--- a/src/doctokenizer.h
+++ b/src/doctokenizer.h
@@ -98,6 +98,10 @@ struct TokenInfo
// url
bool isEMailAddr;
+
+ // param attributes
+ enum ParamDir { In=1, Out=2, InOut=3, Unspecified=0 };
+ ParamDir paramDir;
};
// globals
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 5c9b6ea..31a315d 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -288,6 +288,8 @@ LINKMASK [^ \t\n\r\\@<&${}]+("("[^\n)]*")")?({BLANK}*("const"|"volatile"))?
SPCMD1 {CMD}[a-z_A-Z0-9]+
SPCMD2 {CMD}[\\@<>&$#%~]
SPCMD3 {CMD}form#[0-9]+
+INOUT "in"|"out"|("in"{BLANK}*","{BLANK}*"out")|("out"{BLANK}*","{BLANK}*"in")
+PARAMIO {CMD}param{BLANK}*"["{BLANK}*{INOUT}{BLANK}*"]"
TEMPCHAR [a-z_A-Z0-9,: \t\*\&]
FUNCCHAR [a-z_A-Z0-9,:\<\> \t\*\&]
SCOPESEP "::"|"#"|"."
@@ -391,8 +393,35 @@ LABELID [a-z_A-Z][a-z_A-Z0-9\-]*
<St_Para>{SPCMD1} |
<St_Para>{SPCMD2} { /* special command */
g_token->name = yytext+1;
+ g_token->paramDir=TokenInfo::Unspecified;
return TK_COMMAND;
}
+<St_Para>{PARAMIO} { /* param [in,out] command */
+ g_token->name = "param";
+ QString s(yytext);
+ bool isIn = s.find("in")!=-1;
+ bool isOut = s.find("out")!=-1;
+ if (isIn)
+ {
+ if (isOut)
+ {
+ g_token->paramDir=TokenInfo::InOut;
+ }
+ else
+ {
+ g_token->paramDir=TokenInfo::In;
+ }
+ }
+ else if (isOut)
+ {
+ g_token->paramDir=TokenInfo::Out;
+ }
+ else
+ {
+ g_token->paramDir=TokenInfo::Unspecified;
+ }
+ return TK_COMMAND;
+ }
<St_Para>("http:"|"https:"|"ftp:"|"file:"|"news:"){URLMASK} { // URL
g_token->name=yytext;
g_token->isEMailAddr=FALSE;
@@ -567,6 +596,7 @@ LABELID [a-z_A-Z][a-z_A-Z0-9\-]*
<St_TitleN>{SPCMD1} |
<St_TitleN>{SPCMD2} { /* special command */
g_token->name = yytext+1;
+ g_token->paramDir=TokenInfo::Unspecified;
return TK_COMMAND;
}
<St_TitleN>{WORD1} |
@@ -592,6 +622,7 @@ LABELID [a-z_A-Z][a-z_A-Z0-9\-]*
<St_TitleQ>{SPCMD1} |
<St_TitleQ>{SPCMD2} { /* special command */
g_token->name = yytext+1;
+ g_token->paramDir=TokenInfo::Unspecified;
return TK_COMMAND;
}
<St_TitleQ>{WORD1NQ} |
@@ -663,6 +694,7 @@ LABELID [a-z_A-Z][a-z_A-Z0-9\-]*
<St_Ref2>{SPCMD1} |
<St_Ref2>{SPCMD2} { /* special command */
g_token->name = yytext+1;
+ g_token->paramDir=TokenInfo::Unspecified;
return TK_COMMAND;
}
<St_Ref2>{WORD1NQ} |
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index d71e7c1..6ca2c29 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1217,24 +1217,9 @@ static void findUsingDeclarations(Entry *root)
// the possible scopes in which the using statement was found, starting
// with the most inner scope and going to the most outer scope (i.e.
// file scope).
-// int scopeOffset = scName.length();
-// do
-// {
-// QCString scope=scopeOffset>0 ?
-// scName.left(scopeOffset)+"::" : QCString();
-// //printf("Trying with scope=`%s'\n",scope.data());
-// usingCd = getClass(scope+root->name);
-// if (scopeOffset==0)
-// {
-// scopeOffset=-1;
-// }
-// else if ((scopeOffset=scName.findRev("::",scopeOffset-1))==-1)
-// {
-// scopeOffset=0;
-// }
-// } while (scopeOffset>=0 && usingCd==0);
-
- usingCd = getResolvedClass(nd,fd,root->name);
+
+ MemberDef *mtd=0;
+ usingCd = getResolvedClass(nd,fd,root->name,&mtd);
//printf("%s -> %p\n",root->name.data(),usingCd);
if (usingCd==0) // definition not in the input => add an artificial class
@@ -1248,8 +1233,20 @@ static void findUsingDeclarations(Entry *root)
usingCd->setClassIsArtificial();
}
- // add the namespace the correct scope
- if (usingCd)
+ if (mtd) // add the typedef to the correct scope
+ {
+ if (nd)
+ {
+ //printf("Inside namespace %s\n",nd->name().data());
+ nd->addUsingDeclaration(mtd);
+ }
+ else if (fd)
+ {
+ //printf("Inside file %s\n",nd->name().data());
+ fd->addUsingDeclaration(mtd);
+ }
+ }
+ else if (usingCd) // add the class to the correct scope
{
if (nd)
{
@@ -1623,20 +1620,23 @@ static MemberDef *addVariableToFile(
return md;
}
- if (nd==0 && md->isExplicit()!=root->explicitExternal)
- {
- // merge ingroup specifiers
- if (md->getGroupDef()==0 && root->groups->first())
- {
- //GroupDef *gd=Doxygen::groupSDict[root->groups->first()->groupname.data()];
- //md->setGroupDef(gd, root->groups->first()->pri, root->fileName, root->startLine, !root->doc.isEmpty());
- addMemberToGroups(root,md);
- }
- else if (md->getGroupDef()!=0 && root->groups->count()==0)
- {
- root->groups->append(new Grouping(md->getGroupDef()->name(), md->getGroupPri()));
- }
- }
+ // TODO: rethink why we would need this!
+ //if (nd==0 && md->isExplicit()!=root->explicitExternal)
+ //{
+ // // merge ingroup specifiers
+ // if (md->getGroupDef()==0 && root->groups->first())
+ // {
+ // //GroupDef *gd=Doxygen::groupSDict[root->groups->first()->groupname.data()];
+ // //md->setGroupDef(gd, root->groups->first()->pri, root->fileName, root->startLine, !root->doc.isEmpty());
+ // addMemberToGroups(root,md);
+ // }
+ // else if (md->getGroupDef()!=0 && root->groups->count()==0)
+ // {
+ // // enabling has the result that an ungrouped, undocumented external variable is put
+ // // in a group if the definition is documented and grouped!
+ // //root->groups->append(new Grouping(md->getGroupDef()->name(), md->getGroupPri()));
+ // }
+ //}
}
}
// new global variable, enum value or typedef
@@ -1668,10 +1668,6 @@ static MemberDef *addVariableToFile(
md->enableCallGraph(root->callGraph);
md->setExplicitExternal(root->explicitExternal);
addMemberToGroups(root,md);
- //if (root->mGrpId!=-1)
- //{
- // md->setMemberGroup(memberGroupDict[root->mGrpId]);
- //}
md->setRefItems(root->sli);
if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@')
@@ -2286,8 +2282,8 @@ static void buildFunctionList(Entry *root)
QCString nsName,rnsName;
if (nd) nsName = nd->name().copy();
if (rnd) rnsName = rnd->name().copy();
- NamespaceSDict *unl = fd ? fd->getUsedNamespaces() : 0;
- ClassSDict *ucl = fd ? fd->getUsedClasses() : 0;
+ NamespaceSDict *unl = fd ? fd->getUsedNamespaces() : 0;
+ SDict<Definition> *ucl = fd ? fd->getUsedClasses() : 0;
//printf("matching arguments for %s%s %s%s\n",
// md->name().data(),md->argsString(),rname.data(),argListToString(root->argList).data());
if (
@@ -2968,32 +2964,34 @@ static ClassDef *findClassWithinClassContext(ClassDef *cd,const QCString &name)
if (result && result!=cd) return result;
}
}
- ClassSDict *cl = nd->getUsedClasses();
+ SDict<Definition> *cl = nd->getUsedClasses();
if (cl)
{
- ClassSDict::Iterator cli(*cl);
- ClassDef *ucd;
+ SDict<Definition>::Iterator cli(*cl);
+ Definition *ucd;
for (cli.toFirst(); (ucd=cli.current()) ; ++cli)
{
- if (rightScopeMatch(ucd->name(),name))
+ if (ucd->definitionType()==Definition::TypeClass &&
+ rightScopeMatch(ucd->name(),name))
{
- return ucd;
+ return (ClassDef *)ucd;
}
}
}
// TODO: check any inbetween namespaces as well!
if (fd) // and in the global namespace
{
- ClassSDict *cl = fd->getUsedClasses();
+ SDict<Definition> *cl = fd->getUsedClasses();
if (cl)
{
- ClassSDict::Iterator cli(*cl);
- ClassDef *ucd;
+ SDict<Definition>::Iterator cli(*cl);
+ Definition *ucd;
for (cli.toFirst(); (ucd=cli.current()); ++cli)
{
- if (rightScopeMatch(ucd->name(),name))
+ if (ucd->definitionType()==Definition::TypeClass &&
+ rightScopeMatch(ucd->name(),name))
{
- return ucd;
+ return (ClassDef *)ucd;
}
}
}
@@ -3020,16 +3018,17 @@ static ClassDef *findClassWithinClassContext(ClassDef *cd,const QCString &name)
}
}
}
- ClassSDict *cl = fd->getUsedClasses();
+ SDict<Definition> *cl = fd->getUsedClasses();
if (cl)
{
- ClassSDict::Iterator cli(*cl);
- ClassDef *ucd;
+ SDict<Definition>::Iterator cli(*cl);
+ Definition *ucd;
for (cli.toFirst(); (ucd=cli.current()) ; ++cli)
{
- if (rightScopeMatch(ucd->name(),name))
+ if (ucd->definitionType()==Definition::TypeClass &&
+ rightScopeMatch(ucd->name(),name))
{
- return ucd;
+ return (ClassDef *)ucd;
}
}
}
@@ -4139,8 +4138,8 @@ static bool findGlobalMember(Entry *root,
// namespaceName.data(),nd ? nd->name().data() : "<none>");
FileDef *fd=findFileDef(Doxygen::inputNameDict,root->fileName,ambig);
//printf("File %s\n",fd ? fd->name().data() : "<none>");
- NamespaceSDict *nl = fd ? fd->getUsedNamespaces() : 0;
- ClassSDict *cl = fd ? fd->getUsedClasses() : 0;
+ NamespaceSDict *nl = fd ? fd->getUsedNamespaces() : 0;
+ SDict<Definition> *cl = fd ? fd->getUsedClasses() : 0;
//printf("NamespaceList %p\n",nl);
// search in the list of namespaces that are imported via a
@@ -4676,14 +4675,14 @@ static void findMember(Entry *root,
}
}
- ClassSDict *cl = new ClassSDict(17);
+ SDict<Definition> *cl = new SDict<Definition>(17);
if (nd)
{
- ClassSDict *ncl = nd->getUsedClasses();
+ SDict<Definition> *ncl = nd->getUsedClasses();
if (ncl)
{
- ClassSDict::Iterator csdi(*ncl);
- ClassDef *ncd;
+ SDict<Definition>::Iterator csdi(*ncl);
+ Definition *ncd;
for (csdi.toFirst();(ncd=csdi.current());++csdi)
{
cl->append(ncd->qualifiedName(),ncd);
@@ -4692,11 +4691,11 @@ static void findMember(Entry *root,
}
if (fd)
{
- ClassSDict *fcl = fd->getUsedClasses();
+ SDict<Definition> *fcl = fd->getUsedClasses();
if (fcl)
{
- ClassSDict::Iterator csdi(*fcl);
- ClassDef *fcd;
+ SDict<Definition>::Iterator csdi(*fcl);
+ Definition *fcd;
for (csdi.toFirst();(fcd=csdi.current());++csdi)
{
cl->append(fcd->qualifiedName(),fcd);
diff --git a/src/filedef.cpp b/src/filedef.cpp
index b04c5e3..0c00968 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -681,15 +681,15 @@ void FileDef::addUsingDirective(NamespaceDef *nd)
}
}
-void FileDef::addUsingDeclaration(ClassDef *cd)
+void FileDef::addUsingDeclaration(Definition *d)
{
if (usingDeclList==0)
{
- usingDeclList = new ClassSDict;
+ usingDeclList = new SDict<Definition>(17);
}
- if (usingDeclList->find(cd->qualifiedName())==0)
+ if (usingDeclList->find(d->qualifiedName())==0)
{
- usingDeclList->append(cd->qualifiedName(),cd);
+ usingDeclList->append(d->qualifiedName(),d);
}
}
@@ -1053,8 +1053,8 @@ void FileDef::combineUsingRelations()
// add used classes of namespace nd to this namespace
if (nd->getUsedClasses())
{
- ClassSDict::Iterator cli(*nd->getUsedClasses());
- ClassDef *ucd;
+ SDict<Definition>::Iterator cli(*nd->getUsedClasses());
+ Definition *ucd;
for (cli.toFirst();(ucd=cli.current());++cli)
{
//printf("Adding class %s to the using list of %s\n",cd->qualifiedName().data(),qualifiedName().data());
diff --git a/src/filedef.h b/src/filedef.h
index d9d2f46..5d64763 100644
--- a/src/filedef.h
+++ b/src/filedef.h
@@ -134,8 +134,8 @@ class FileDef : public Definition
void addUsingDirective(NamespaceDef *nd);
NamespaceSDict *getUsedNamespaces() const { return usingDirList; }
- void addUsingDeclaration(ClassDef *cd);
- ClassSDict *getUsedClasses() const { return usingDeclList; }
+ void addUsingDeclaration(Definition *def);
+ SDict<Definition> *getUsedClasses() const { return usingDeclList; }
void combineUsingRelations();
bool generateSourceFile() const;
@@ -188,7 +188,7 @@ class FileDef : public Definition
QDict<IncludeInfo> *includedByDict;
QList<IncludeInfo> *includedByList;
NamespaceSDict *usingDirList;
- ClassSDict *usingDeclList;
+ SDict<Definition> *usingDeclList;
//DefineList *defineList;
QCString path;
QCString filepath;
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index a2ca11f..62460df 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -189,12 +189,12 @@ void HtmlDocVisitor::visit(DocVerbatim *s)
switch(s->type())
{
case DocVerbatim::Code: // fall though
- m_t << "<pre class=\"fragment\"><div>";
+ m_t << "<pre><div class=\"fragment\">";
parseCode(m_ci,s->context(),s->text().latin1(),s->isExample(),s->exampleFile());
m_t << "</div></pre>";
break;
case DocVerbatim::Verbatim:
- m_t << "<pre class=\"fragment\"><div>";
+ m_t << "<pre><div class=\"fragment\">";
filter(s->text());
m_t << "</div></pre>";
break;
@@ -246,16 +246,16 @@ void HtmlDocVisitor::visit(DocInclude *inc)
switch(inc->type())
{
case DocInclude::Include:
- m_t << "<pre class=\"fragment\"><div>";
+ m_t << "<pre><div class=\"fragment\">";
parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile());
m_t << "</div></pre>";
case DocInclude::IncWithLines:
{
- m_t << "<div class=\"fragment\"><pre>";
+ m_t << "<pre><div class=\"fragment\">";
QFileInfo cfi( inc->file() );
FileDef fd( cfi.dirPath(), cfi.fileName() );
parseCode(m_ci,inc->context(),inc->text().latin1(),inc->isExample(),inc->exampleFile(), &fd);
- m_t << "</pre></div>";
+ m_t << "</div></pre>";
}
break;
break;
@@ -265,7 +265,7 @@ void HtmlDocVisitor::visit(DocInclude *inc)
m_t << inc->text();
break;
case DocInclude::VerbInclude:
- m_t << "<pre class=\"fragment\"><div>";
+ m_t << "<pre><div class=\"fragment\">";
filter(inc->text());
m_t << "</div></pre>";
break;
@@ -278,7 +278,7 @@ void HtmlDocVisitor::visit(DocIncOperator *op)
// op->type(),op->isFirst(),op->isLast(),op->text().data());
if (op->isFirst())
{
- if (!m_hide) m_t << "<pre class=\"fragment\"><div>";
+ if (!m_hide) m_t << "<pre><div class=\"fragment\">";
pushEnabled();
m_hide=TRUE;
}
@@ -868,7 +868,25 @@ void HtmlDocVisitor::visitPost(DocParamSect *)
void HtmlDocVisitor::visitPre(DocParamList *pl)
{
if (m_hide) return;
- m_t << " <tr><td valign=top><em>";
+ m_t << " <tr><td>";
+ if (pl->direction()!=DocParamSect::Unspecified)
+ {
+ m_t << "<tt>[";
+ if (pl->direction()==DocParamSect::In)
+ {
+ m_t << "in";
+ }
+ else if (pl->direction()==DocParamSect::Out)
+ {
+ m_t << "out";
+ }
+ else if (pl->direction()==DocParamSect::InOut)
+ {
+ m_t << "in,out";
+ }
+ m_t << "]</tt>&nbsp;";
+ }
+ m_t << "</td><td valign=top><em>";
QStrListIterator li(pl->parameters());
const char *s;
bool first=TRUE;
diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index 0da3849..0e3316a 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -888,7 +888,25 @@ void LatexDocVisitor::visitPost(DocParamSect *)
void LatexDocVisitor::visitPre(DocParamList *pl)
{
if (m_hide) return;
- m_t << "\\item[{\\em ";
+ m_t << "\\item[";
+ if (pl->direction()!=DocParamSect::Unspecified)
+ {
+ m_t << "\\mbox{";
+ if (pl->direction()==DocParamSect::In)
+ {
+ m_t << "$\\leftarrow$";
+ }
+ else if (pl->direction()==DocParamSect::Out)
+ {
+ m_t << "$\\rightarrow$";
+ }
+ else if (pl->direction()==DocParamSect::InOut)
+ {
+ m_t << "$\\leftrightarrow$";
+ }
+ m_t << "} ";
+ }
+ m_t << "{\\em ";
QStrListIterator li(pl->parameters());
const char *s;
bool first=TRUE;
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 4e44a98..9676557 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -2226,7 +2226,7 @@ bool MemberDef::isObjCMethod() const
return FALSE;
}
-QCString MemberDef::qualifiedName() const
+QCString MemberDef::qualifiedName()
{
if (isObjCMethod())
{
diff --git a/src/memberdef.h b/src/memberdef.h
index c19133e..564fdc0 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -99,7 +99,7 @@ class MemberDef : public Definition
const char *getGroupFileName() const { return groupFileName; }
int getGroupStartLine() const { return groupStartLine; }
bool getGroupHasDocs() const { return groupHasDocs; }
- QCString qualifiedName() const;
+ QCString qualifiedName();
// direct kind info
Protection protection() const { return prot; }
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index 6d00bbc..5178b76 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -36,7 +36,7 @@ NamespaceDef::NamespaceDef(const char *df,int dl,
fileName+=name;
classSDict = new ClassSDict(17);
namespaceSDict = new NamespaceSDict(17);
- m_innerCompounds = new SDict<Definition>(17);
+ m_innerCompounds = new SDict<Definition>(257);
usingDirList = 0;
usingDeclList = 0;
setReference(lref);
@@ -399,15 +399,15 @@ void NamespaceDef::addUsingDirective(NamespaceDef *nd)
}
}
-void NamespaceDef::addUsingDeclaration(ClassDef *cd)
+void NamespaceDef::addUsingDeclaration(Definition *d)
{
if (usingDeclList==0)
{
- usingDeclList = new ClassSDict;
+ usingDeclList = new SDict<Definition>(17);
}
- if (usingDeclList->find(cd->qualifiedName())==0)
+ if (usingDeclList->find(d->qualifiedName())==0)
{
- usingDeclList->append(cd->qualifiedName(),cd);
+ usingDeclList->append(d->qualifiedName(),d);
}
}
@@ -480,8 +480,8 @@ void NamespaceDef::combineUsingRelations()
// add used classes of namespace nd to this namespace
if (nd->getUsedClasses())
{
- ClassSDict::Iterator cli(*nd->getUsedClasses());
- ClassDef *ucd;
+ SDict<Definition>::Iterator cli(*nd->getUsedClasses());
+ Definition *ucd;
for (cli.toFirst();(ucd=cli.current());++cli)
{
//printf("Adding class %s to the using list of %s\n",cd->qualifiedName().data(),qualifiedName().data());
diff --git a/src/namespacedef.h b/src/namespacedef.h
index 7334f8e..51d30d2 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -55,8 +55,8 @@ class NamespaceDef : public Definition
int countMembers();
void addUsingDirective(NamespaceDef *nd);
NamespaceSDict *getUsedNamespaces() const { return usingDirList; }
- void addUsingDeclaration(ClassDef *cd);
- ClassSDict *getUsedClasses() const { return usingDeclList; }
+ void addUsingDeclaration(Definition *def);
+ SDict<Definition> *getUsedClasses() const { return usingDeclList; }
void combineUsingRelations();
QCString displayName() const;
@@ -118,7 +118,7 @@ class NamespaceDef : public Definition
NamespaceSDict *usingDirList;
- ClassSDict *usingDeclList;
+ SDict<Definition> *usingDeclList;
SDict<Definition> *m_innerCompounds;
MemberList allMemberList;
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
index c5c9858..3a05f20 100644
--- a/src/perlmodgen.cpp
+++ b/src/perlmodgen.cpp
@@ -232,7 +232,7 @@ void PerlModOutput::iaddQuoted(const char *s)
}
}
-inline void PerlModOutput::iaddField(const char *s)
+void PerlModOutput::iaddField(const char *s)
{
continueBlock();
m_stream->add(s);
diff --git a/src/scanner.l b/src/scanner.l
index 457f5b0..f8c7033 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -491,7 +491,7 @@ static void prependScope()
/*! Returns TRUE iff the current entry could be a K&R style C function */
static bool checkForKnRstyleC()
{
- if (((QCString)yyFileName).right(2)!=".c") return FALSE; // must be a C file
+ if (((QCString)yyFileName).right(2).lower()!=".c") return FALSE; // must be a C file
if (!current->argList) return FALSE;
ArgumentListIterator ali(*current->argList);
Argument *a;
@@ -3575,12 +3575,14 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
}
<ClassVar>"<" { current->name += *yytext;
sharpCount=1;
+ roundCount=0;
lastSkipSharpContext = YY_START;
specName = &current->name;
BEGIN ( Specialization );
}
<Bases>"<" {
sharpCount=1;
+ roundCount=0;
lastSkipSharpContext = YY_START;
if (insideObjC) // start of protocol list
{
@@ -3594,17 +3596,19 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
}
}
<Specialization>"<" { *specName += *yytext;
- sharpCount++;
+ if (roundCount==0) sharpCount++;
}
<Specialization>">" {
*specName += *yytext;
- if (--sharpCount<=0)
+ if (roundCount==0 && --sharpCount<=0)
BEGIN(lastSkipSharpContext);
}
<Specialization>{BN}+ { lineCount(); *specName +=' '; }
<Specialization>"<<" { *specName += yytext; }
<Specialization>">>" { *specName += yytext; }
<Specialization>"typename"{BN}+ { lineCount(); }
+<Specialization>"(" { *specName += *yytext; roundCount++; }
+<Specialization>")" { *specName += *yytext; roundCount--; }
<Specialization>. {
*specName += *yytext;
}
diff --git a/src/util.cpp b/src/util.cpp
index c535634..f962c1f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -60,12 +60,13 @@ extern char **environ;
//------------------------------------------------------------------------
-static QCache<int> g_accessibilityCache(10000,10000);
+static QCache<ClassDef*> g_lookupCache(20000,20000);
+// object that automatically initializes the cache at startup
class CacheInitializer
{
public:
- CacheInitializer() { g_accessibilityCache.setAutoDelete(TRUE); }
+ CacheInitializer() { g_lookupCache.setAutoDelete(TRUE); }
} g_cacheInitializer;
@@ -578,7 +579,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
MemberDef **pTypeDef,
QCString *pTemplSpec
);
-int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
+int isAccessibleFromWithExpScope(Definition *scope,FileDef *fileScope,Definition *item,
const QCString &explicitScopePart);
/*! Returns the class representing the value of the typedef represented by \a md
@@ -673,7 +674,7 @@ QCString substTypedef(Definition *scope,FileDef *fileScope,const QCString &name)
if (md->isTypedef()) // d is a typedef
{
// test accessibility of typedef within scope.
- int distance = isAccessibleFrom(scope,fileScope,d,"");
+ int distance = isAccessibleFromWithExpScope(scope,fileScope,d,"");
if (distance!=-1 && distance<minDistance)
// definition is accessible and a better match
{
@@ -711,7 +712,7 @@ static Definition *followPath(Definition *start,FileDef *fileScope,const QCStrin
return current; // path could be followed
}
-bool accessibleViaUsingClass(const ClassSDict *cl,
+bool accessibleViaUsingClass(const SDict<Definition> *cl,
FileDef *fileScope,
Definition *item,
const QCString &explicitScopePart=""
@@ -719,26 +720,14 @@ bool accessibleViaUsingClass(const ClassSDict *cl,
{
if (cl) // see if the class was imported via a using statement
{
- ClassSDict::Iterator cli(*cl);
- ClassDef *ucd;
+ SDict<Definition>::Iterator cli(*cl);
+ Definition *ucd;
+ bool explicitScopePartEmpty = explicitScopePart.isEmpty();
for (cli.toFirst();(ucd=cli.current());++cli)
{
//printf("Trying via used class %s\n",ucd->name().data());
- Definition *sc = explicitScopePart.isEmpty() ? ucd : followPath(ucd,fileScope,explicitScopePart);
- if (item->definitionType()==Definition::TypeMember)
- {
- MemberDef *md = (MemberDef *)item;
- if (md->isTypedef()) // d is a typedef
- {
- QCString spec;
- ClassDef *typedefClass = newResolveTypedef(fileScope,md,&spec);
- if (sc && sc==typedefClass) return TRUE;
- }
- }
- else // item is a class
- {
- if (sc && sc==item) return TRUE;
- }
+ Definition *sc = explicitScopePartEmpty ? ucd : followPath(ucd,fileScope,explicitScopePart);
+ if (sc && sc==item) return TRUE;
//printf("Try via used class done\n");
}
}
@@ -773,15 +762,10 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
{
//fprintf(stderr,"<isAccesibleFrom(scope=%s,item=%s itemScope=%s)\n",
// scope->name().data(),item->name().data(),item->getOuterScope()->name().data());
- QCString key=scope->name()+"+"+item->qualifiedName();
- int *pval=g_accessibilityCache.find(key);
+
int result=0; // assume we found it
int i;
- if (pval) // value was cached
- {
- //fprintf(stderr,"> found cached value=%d\n",*pval);
- return *pval;
- }
+
if (item->getOuterScope()==scope)
{
//fprintf(stderr,"> found it\n");
@@ -790,7 +774,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
{
if (fileScope)
{
- ClassSDict *cl = fileScope->getUsedClasses();
+ SDict<Definition> *cl = fileScope->getUsedClasses();
if (accessibleViaUsingClass(cl,fileScope,item))
{
//fprintf(stderr,"> found via used class\n");
@@ -812,7 +796,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
if (scope->definitionType()==Definition::TypeNamespace)
{
NamespaceDef *nscope = (NamespaceDef*)scope;
- ClassSDict *cl = nscope->getUsedClasses();
+ SDict<Definition> *cl = nscope->getUsedClasses();
if (accessibleViaUsingClass(cl,fileScope,item))
{
//fprintf(stderr,"> found via used class\n");
@@ -831,7 +815,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
result= (i==-1) ? -1 : i+1;
}
done:
- g_accessibilityCache.insert(key,new int(result));
+ //g_lookupCache.insert(key,new int(result));
return result;
}
@@ -840,7 +824,7 @@ done:
* if item in not in this scope. The explicitScopePart limits the search
* to scopes that match \a scope plus the explicit part.
*/
-int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
+int isAccessibleFromWithExpScope(Definition *scope,FileDef *fileScope,Definition *item,
const QCString &explicitScopePart)
{
if (explicitScopePart.isEmpty())
@@ -848,17 +832,10 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
// handle degenerate case where there is no explicit scope.
return isAccessibleFrom(scope,fileScope,item);
}
- //printf("<isAccesibleFrom(%s,%s,%s)\n",scope?scope->name().data():"<global>",
+ //printf("<isAccessibleFromWithExpScope(%s,%s,%s)\n",scope?scope->name().data():"<global>",
// item?item->name().data():"<none>",
// explicitScopePart.data());
- QCString key=scope->name()+"+"+item->qualifiedName()+"+"+explicitScopePart;
- int *pval=g_accessibilityCache.find(key);
int result=0; // assume we found it
- if (pval) // value was cached
- {
- //printf("> found cached value=%d\n",*pval);
- return *pval;
- }
Definition *newScope = followPath(scope,fileScope,explicitScopePart);
if (newScope) // explicitScope is inside scope => newScope is the result
{
@@ -878,14 +855,14 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
// in A via a using directive.
//printf("newScope is a namespace: %s!\n",newScope->name().data());
NamespaceDef *nscope = (NamespaceDef*)newScope;
- ClassSDict *cl = nscope->getUsedClasses();
+ SDict<Definition> *cl = nscope->getUsedClasses();
if (cl)
{
- ClassSDict::Iterator cli(*cl);
- ClassDef *cd;
+ SDict<Definition>::Iterator cli(*cl);
+ Definition *cd;
for (cli.toFirst();(cd=cli.current());++cli)
{
- i = isAccessibleFrom(scope,fileScope,item,cd->name());
+ i = isAccessibleFromWithExpScope(scope,fileScope,item,cd->name());
if (i!=-1)
{
//printf("> found via explicit scope of used class\n");
@@ -902,7 +879,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
{
if (g_visitedNamespaces.find(nd->name())==0)
{
- i = isAccessibleFrom(scope,fileScope,item,nd->name());
+ i = isAccessibleFromWithExpScope(scope,fileScope,item,nd->name());
if (i!=-1)
{
//printf("> found via explicit scope of used namespace\n");
@@ -915,7 +892,8 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
// repeat for the parent scope
if (scope!=Doxygen::globalScope)
{
- i = isAccessibleFrom(scope->getOuterScope(),fileScope,item,explicitScopePart);
+ i = isAccessibleFromWithExpScope(scope->getOuterScope(),fileScope,
+ item,explicitScopePart);
}
//printf("> result=%d\n",i);
result = (i==-1) ? -1 : i+1;
@@ -927,7 +905,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
if (scope->definitionType()==Definition::TypeNamespace)
{
NamespaceDef *nscope = (NamespaceDef*)scope;
- ClassSDict *cl = nscope->getUsedClasses();
+ SDict<Definition> *cl = nscope->getUsedClasses();
if (accessibleViaUsingClass(cl,fileScope,item,explicitScopePart))
{
//printf("> found in used class\n");
@@ -944,7 +922,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
{
if (fileScope)
{
- ClassSDict *cl = fileScope->getUsedClasses();
+ SDict<Definition> *cl = fileScope->getUsedClasses();
if (accessibleViaUsingClass(cl,fileScope,item,explicitScopePart))
{
//printf("> found in used class\n");
@@ -962,13 +940,14 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
}
else // continue by looking into the parent scope
{
- int i=isAccessibleFrom(scope->getOuterScope(),fileScope,item,explicitScopePart);
+ int i=isAccessibleFromWithExpScope(scope->getOuterScope(),fileScope,
+ item,explicitScopePart);
//printf("> result=%d\n",i);
result= (i==-1) ? -1 : i+1;
}
}
done:
- g_accessibilityCache.insert(key,new int(result));
+ //g_lookupCache.insert(key,new int(result));
return result;
}
@@ -1006,6 +985,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
replaceNamespaceAliases(explicitScopePart,explicitScopePart.length());
name=name.mid(qualifierIndex+2);
}
+
if (name.isEmpty())
{
//printf("] empty name\n");
@@ -1016,22 +996,43 @@ ClassDef *getResolvedClassRec(Definition *scope,
//printf("Looking for symbol %s result=%p\n",name.data(),dl);
if (dl==0)
{
- //printf("] no such symbol\n");
- return 0; // symbol not found
+ // name is not a known symbol
+ return 0;
}
+ // Since it is often the case that the same name is searched in the same
+ // scope over an over again (especially for the linked source code generation)
+ // we use a cache to collect previous results. This is possible since the
+ // result of a lookup is deterministic. As the key we use the concatenated
+ // scope, the name to search for and the explicit scope prefix. The speedup
+ // achieved by this simple cache can be enormous.
+ QCString key=scope->name()+"+"+name+"+"+explicitScopePart;
+ ClassDef **pval=g_lookupCache.find(key);
+ //printf("Searching for %s result=%p\n",key.data(),pval);
+ if (pval)
+ {
+ return *pval;
+ }
+ else // not found yet; we already add a 0 to avoid the possibility of
+ // endless recursion.
+ {
+ g_lookupCache.insert(key,new ClassDef*(0));
+ }
+
+ ClassDef *bestMatch=0;
+
//printf(" found %d symbol with name %s\n",dl->count(),name.data());
// now we look int the list of Definitions and determine which one is the "best"
DefinitionListIterator dli(*dl);
Definition *d;
- ClassDef *bestMatch=0;
MemberDef *bestTypedef=0;
QCString bestTemplSpec;
int minDistance=10000; // init at "infinite"
- for (dli.toFirst();(d=dli.current());++dli) // foreach definition
+ int count=0;
+ for (dli.toFirst();(d=dli.current());++dli,++count) // foreach definition
{
- //printf(" found type %x name=%s\n",
- // d->definitionType(),d->name().data());
+ //fprintf(stderr," found type %x name=%s (%d/%d)\n",
+ // d->definitionType(),d->name().data(),count,dl->count());
// only look at classes and members
if (d->definitionType()==Definition::TypeClass ||
@@ -1039,7 +1040,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
{
g_visitedNamespaces.clear();
// test accessibility of definition within scope.
- int distance = isAccessibleFrom(scope,fileScope,d,explicitScopePart);
+ int distance = isAccessibleFromWithExpScope(scope,fileScope,d,explicitScopePart);
if (distance!=-1) // definition is accessible
{
// see if we are dealing with a class or a typedef
@@ -1060,8 +1061,6 @@ ClassDef *getResolvedClassRec(Definition *scope,
if (md->isTypedef()) // d is a typedef
{
//printf(" found typedef!\n");
- QCString spec;
- ClassDef *typedefClass = newResolveTypedef(fileScope,md,&spec);
// we found a symbol at this distance, but if it didn't
// resolve to a class, we still have to make sure that
@@ -1069,8 +1068,9 @@ ClassDef *getResolvedClassRec(Definition *scope,
// that symbol is hidden by this one.
if (distance<minDistance)
{
+ QCString spec;
minDistance=distance;
- bestMatch = typedefClass;
+ bestMatch = newResolveTypedef(fileScope,md,&spec);
//printf(" bestTypeDef=%p\n",md);
bestTypedef = md;
bestTemplSpec = spec;
@@ -1092,6 +1092,16 @@ ClassDef *getResolvedClassRec(Definition *scope,
{
*pTemplSpec = bestTemplSpec;
}
+
+ pval=g_lookupCache.find(key);
+ if (pval)
+ {
+ *pval=bestMatch;
+ }
+ else
+ {
+ g_lookupCache.insert(key,new ClassDef*(bestMatch));
+ }
//printf("] bestMatch=%s distance=%d\n",
// bestMatch?bestMatch->name().data():"<none>",minDistance);
return bestMatch;
@@ -1119,7 +1129,6 @@ ClassDef *getResolvedClass(Definition *scope,
{
scope=Doxygen::globalScope;
}
- //printf("-------- start\n");
//printf("getResolvedClass(%s,%s)\n",scope?scope->name().data():"<global>",n);
ClassDef *result = getResolvedClassRec(scope,fileScope,n,pTypeDef,pTemplSpec);
if (!mayBeUnlinkable && result && !result->isLinkable())
@@ -1129,7 +1138,6 @@ ClassDef *getResolvedClass(Definition *scope,
//printf("getResolvedClass(%s,%s)=%s\n",scope?scope->name().data():"<global>",
// n,result?result->name().data():"<none>");
//
- //printf("-------- end\n");
return result;
}
@@ -1308,54 +1316,28 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,FileDef *fileSco
NamespaceDef *nd=0;
GroupDef *gd=0;
- //QCString searchName=name;
- //printf("word=`%s' scope=`%s'\n",
- // word.data(),scope ? scope->name().data() : "<none>"
- // );
-// Definition *curScope = scope;
- // check if `word' is a documented class name
- //int scopeOffset=scopeName.length();
-// do // for each scope (starting with full scope and going to empty scope)
-// {
- //printf("Searching %s in %s...\n",word.data(),curScope?curScope->name().data():"<global>");
-// QCString fullName = word;
-// QCString prefix;
-// replaceNamespaceAliases(fullName,fullName.length());
-// //if (scopeOffset>0)
-// if (curScope && curScope!=Doxygen::globalScope)
-// {
-// prefix = curScope->name();
-// replaceNamespaceAliases(prefix,prefix.length());
-// fullName.prepend(prefix+"::");
-// }
-
- MemberDef *typeDef=0;
- if ((cd=getResolvedClass(scope,fileScope,word,&typeDef)))
+ MemberDef *typeDef=0;
+ if ((cd=getResolvedClass(scope,fileScope,word,&typeDef)))
+ {
+ // add link to the result
+ if (external ? cd->isLinkable() : cd->isLinkableInProject())
{
- // add link to the result
- if (external ? cd->isLinkable() : cd->isLinkableInProject())
- {
- out.writeLink(cd->getReference(),cd->getOutputFileBase(),0,word);
- found=TRUE;
- }
+ out.writeLink(cd->getReference(),cd->getOutputFileBase(),0,word);
+ found=TRUE;
}
- else if (typeDef)
+ }
+ else if (typeDef)
+ {
+ if (external ? typeDef->isLinkable() : typeDef->isLinkableInProject())
{
- if (external ? typeDef->isLinkable() : typeDef->isLinkableInProject())
- {
- out.writeLink(typeDef->getReference(),
- typeDef->getOutputFileBase(),
- typeDef->anchor(),
- word);
- found=TRUE;
- }
+ out.writeLink(typeDef->getReference(),
+ typeDef->getOutputFileBase(),
+ typeDef->anchor(),
+ word);
+ found=TRUE;
}
+ }
-// if (curScope) curScope = curScope->getOuterScope();
-// } //while (!found && scopeOffset>=0);
-// while (!found && curScope);
-
-//endloop:
if (scope &&
(scope->definitionType()==Definition::TypeClass ||
scope->definitionType()==Definition::TypeNamespace
@@ -2072,7 +2054,7 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA,
const QCString &className,
const QCString &namespaceName,
NamespaceSDict *usingNamespaces,
- ClassSDict *usingClasses)
+ SDict<Definition> *usingClasses)
{
//printf("match argument start %s:%s <-> %s:%s using nsp=%p class=%p\n",
// srcA->type.data(),srcA->name.data(),
@@ -2186,8 +2168,8 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA,
}
if (usingClasses && usingClasses->count()>0)
{
- ClassSDict::Iterator cli(*usingClasses);
- ClassDef *cd;
+ SDict<Definition>::Iterator cli(*usingClasses);
+ Definition *cd;
for (;(cd=cli.current());++cli)
{
srcAType=trimScope(cd->name(),srcAType);
@@ -2339,7 +2321,7 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA,
bool matchArguments(ArgumentList *srcAl,ArgumentList *dstAl,
const char *cl,const char *ns,bool checkCV,
NamespaceSDict *usingNamespaces,
- ClassSDict *usingClasses)
+ SDict<Definition> *usingClasses)
{
QCString className=cl;
QCString namespaceName=ns;
@@ -3536,6 +3518,7 @@ bool hasVisibleRoot(BaseClassList *bcl)
QCString escapeCharsInString(const char *name,bool allowDots)
{
+ static bool caseSenseNames = Config_getBool("CASE_SENSE_NAMES");
QCString result;
char c;
const char *p=name;
@@ -3557,7 +3540,7 @@ QCString escapeCharsInString(const char *name,bool allowDots)
case ',': result+="_00"; break;
case ' ': result+="_01"; break;
default:
- if (Config_getBool("CASE_SENSE_NAMES") || !isupper(c))
+ if (caseSenseNames || !isupper(c))
{
result+=c;
}
@@ -3578,8 +3561,10 @@ QCString escapeCharsInString(const char *name,bool allowDots)
*/
QCString convertNameToFile(const char *name,bool allowDots)
{
+ static bool shortNames = Config_getBool("SHORT_NAMES");
+ static bool createSubdirs = Config_getBool("CREATE_SUBDIRS");
QCString result;
- if (Config_getBool("SHORT_NAMES"))
+ if (shortNames)
{
static QDict<void> usedNames(10007);
static int count=1;
@@ -3601,7 +3586,7 @@ QCString convertNameToFile(const char *name,bool allowDots)
{
result=escapeCharsInString(name,allowDots);
}
- if (Config_getBool("CREATE_SUBDIRS"))
+ if (createSubdirs)
{
if (Doxygen::htmlDirMap==0)
{
diff --git a/src/util.h b/src/util.h
index 1ed34c5..248f640 100644
--- a/src/util.h
+++ b/src/util.h
@@ -26,6 +26,7 @@
#include <qlist.h>
#include <qtextstream.h>
#include <ctype.h>
+#include "sortdict.h"
class ClassDef;
class FileDef;
@@ -43,13 +44,13 @@ class GroupDef;
class NamespaceSDict;
class ClassList;
class MemberGroupSDict;
-class Definition;
struct TagInfo;
class MemberNameInfoSDict;
struct ListItemInfo;
class PageDef;
struct SectionInfo;
class QDir;
+class Definition;
//--------------------------------------------------------------------
@@ -129,7 +130,7 @@ void writePageRef(OutputDocInterface &od,const char *cn,const char *mn);
bool matchArguments(ArgumentList *,ArgumentList *,
const char *cl=0,const char *ns=0,bool checkCV=TRUE,
NamespaceSDict *usingNamespaces=0,
- ClassSDict *usingClasses=0);
+ SDict<Definition> *usingClasses=0);
void mergeArguments(ArgumentList *,ArgumentList *,bool forceNameOverwrite=FALSE);
QCString substituteClassNames(const QCString &s);
QCString substitute(const char *s,const char *src,const char *dst);
@@ -212,7 +213,7 @@ QCString linkToText(const char *link,bool isFileName);
QCString stripExtension(const char *fName);
void replaceNamespaceAliases(QCString &scope,int i);
int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item);
-int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item,
+int isAccessibleFromWithExpScope(Definition *scope,FileDef *fileScope,Definition *item,
const QCString &explicitScopePart);
int computeQualifiedIndex(const QString &name);
void addDirPrefix(QCString &fileName);
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index 423da30..a128a00 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -752,7 +752,25 @@ void XmlDocVisitor::visitPre(DocParamList *pl)
const char *s;
for (li.toFirst();(s=li.current());++li)
{
- m_t << "<parametername>";
+ m_t << "<parametername";
+ if (pl->direction()!=DocParamSect::Unspecified)
+ {
+ m_t << " direction=\"";
+ if (pl->direction()==DocParamSect::In)
+ {
+ m_t << "in";
+ }
+ else if (pl->direction()==DocParamSect::Out)
+ {
+ m_t << "out";
+ }
+ else if (pl->direction()==DocParamSect::InOut)
+ {
+ m_t << "inout";
+ }
+ m_t << "\"";
+ }
+ m_t << ">";
filter(s);
m_t << "</parametername>" << endl;
}