Commit 8dc1328e authored by dimitri's avatar dimitri

Release-1.4.0

parent 81adebde
DOXYGEN Version 1.3.9.1-20041228 DOXYGEN Version 1.4.0
Please read the installation section of the manual Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions. (http://www.doxygen.org/install.html) for instructions.
-------- --------
Dimitri van Heesch (28 December 2004) Dimitri van Heesch (31 December 2004)
DOXYGEN Version 1.3.9.1_20041228 DOXYGEN Version 1.4.0
Please read INSTALL for compilation instructions. Please read INSTALL for compilation instructions.
...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. ...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy, Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (28 December 2004) Dimitri van Heesch (dimitri@stack.nl) (31 December 2004)
1.3.9.1-20041228 1.4.0
Summary: A documentation system for C/C++. Summary: A documentation system for C/C++.
Name: doxygen Name: doxygen
Version: 1.3.9.1_20041228 Version: 1.4.0
Release: 1 Release: 1
Epoch: 1 Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
......
...@@ -2178,12 +2178,6 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} ...@@ -2178,12 +2178,6 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
g_type.resize(0); g_type.resize(0);
BEGIN(g_memCallContext); BEGIN(g_memCallContext);
} }
<MemberCall>[^a-z_A-Z0-9(\n] {
g_code->codify(yytext);
g_type.resize(0);
g_name.resize(0);
BEGIN(g_memCallContext);
}
<Body>[,=;\[] { <Body>[,=;\[] {
if (g_insideObjC && *yytext=='[') if (g_insideObjC && *yytext=='[')
{ {
...@@ -2394,7 +2388,7 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} ...@@ -2394,7 +2388,7 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
g_code->codify(yytext); g_code->codify(yytext);
g_parmType.resize(0);g_parmName.resize(0); g_parmType.resize(0);g_parmName.resize(0);
} }
<MemberCall2,FuncCall>")" { <MemberCall,MemberCall2,FuncCall>")" {
g_theVarContext.addVariable(g_parmType,g_parmName); g_theVarContext.addVariable(g_parmType,g_parmName);
g_theCallContext.popScope(); g_theCallContext.popScope();
g_theCallContext.setClass(0); g_theCallContext.setClass(0);
...@@ -2638,6 +2632,12 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} ...@@ -2638,6 +2632,12 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
<RemoveSpecialCComment>"//"|"/*" <RemoveSpecialCComment>"//"|"/*"
<RemoveSpecialCComment>\n { g_yyLineNr++; } <RemoveSpecialCComment>\n { g_yyLineNr++; }
<RemoveSpecialCComment>. <RemoveSpecialCComment>.
<MemberCall>[^a-z_A-Z0-9(\n] {
g_code->codify(yytext);
g_type.resize(0);
g_name.resize(0);
BEGIN(g_memCallContext);
}
<*>\n({B}*"//"[!/][^\n]*\n)+ { // remove special one-line comment <*>\n({B}*"//"[!/][^\n]*\n)+ { // remove special one-line comment
if (Config_getBool("STRIP_CODE_COMMENTS")) if (Config_getBool("STRIP_CODE_COMMENTS"))
{ {
......
...@@ -372,11 +372,12 @@ static void detectNoDocumentedParams() ...@@ -372,11 +372,12 @@ static void detectNoDocumentedParams()
if (!g_memberDef->hasDocumentedParams() && if (!g_memberDef->hasDocumentedParams() &&
g_hasParamCommand) g_hasParamCommand)
{ {
//printf("%s->setHasDocumentedParams(TRUE);\n",g_memberDef->name().data());
g_memberDef->setHasDocumentedParams(TRUE); g_memberDef->setHasDocumentedParams(TRUE);
} }
else if (!g_memberDef->hasDocumentedParams()) else if (!g_memberDef->hasDocumentedParams())
{ {
bool allDoc=TRUE; bool allDoc=TRUE; // no paramater => all parameters are documented
if ( // member has parameters if ( // member has parameters
al && // but the member has a parameter list al && // but the member has a parameter list
al->count()>0 // with at least one parameter (that is not void) al->count()>0 // with at least one parameter (that is not void)
...@@ -388,8 +389,12 @@ static void detectNoDocumentedParams() ...@@ -388,8 +389,12 @@ static void detectNoDocumentedParams()
// see if all parameters have documentation // see if all parameters have documentation
for (ali.toFirst();(a=ali.current()) && allDoc;++ali) for (ali.toFirst();(a=ali.current()) && allDoc;++ali)
{ {
allDoc = !a->docs.isEmpty(); if (!a->name.isEmpty() && a->type!="void")
//printf("a->name=%s doc=%s\n",a->name.data(),a->docs.data()); {
allDoc = !a->docs.isEmpty();
}
//printf("a->type=%s a->name=%s doc=%s\n",
// a->type.data(),a->name.data(),a->docs.data());
} }
if (!allDoc && declAl) // try declaration arguments as well if (!allDoc && declAl) // try declaration arguments as well
{ {
...@@ -398,16 +403,19 @@ static void detectNoDocumentedParams() ...@@ -398,16 +403,19 @@ static void detectNoDocumentedParams()
Argument *a; Argument *a;
for (ali.toFirst();(a=ali.current()) && allDoc;++ali) for (ali.toFirst();(a=ali.current()) && allDoc;++ali)
{ {
allDoc = !a->docs.isEmpty(); if (!a->name.isEmpty() && a->type!="void")
{
allDoc = !a->docs.isEmpty();
}
//printf("a->name=%s doc=%s\n",a->name.data(),a->docs.data()); //printf("a->name=%s doc=%s\n",a->name.data(),a->docs.data());
} }
} }
} }
if (allDoc) if (allDoc)
{ {
//printf("%s->setHasDocumentedParams(TRUE);\n",g_memberDef->name().data());
g_memberDef->setHasDocumentedParams(TRUE); g_memberDef->setHasDocumentedParams(TRUE);
} }
} }
//printf("Member %s hasReturnCommand=%d\n",g_memberDef->name().data(),g_hasReturnCommand); //printf("Member %s hasReturnCommand=%d\n",g_memberDef->name().data(),g_hasReturnCommand);
if (!g_memberDef->hasDocumentedReturnType() && // docs not yet found if (!g_memberDef->hasDocumentedReturnType() && // docs not yet found
......
...@@ -279,7 +279,7 @@ OPTSTARS ("//"{BLANK}*)?"*"*{BLANK}* ...@@ -279,7 +279,7 @@ OPTSTARS ("//"{BLANK}*)?"*"*{BLANK}*
LISTITEM {BLANK}*{OPTSTARS}"-"("#")?{WS} LISTITEM {BLANK}*{OPTSTARS}"-"("#")?{WS}
ENDLIST {BLANK}*{OPTSTARS}"."{BLANK}*\n ENDLIST {BLANK}*{OPTSTARS}"."{BLANK}*\n
ATTRIB {ID}{WS}*("="{WS}*(("\""[^\"]*"\"")|("'"[^\']*"'")|[^ \t\r\n'"><]+))? ATTRIB {ID}{WS}*("="{WS}*(("\""[^\"]*"\"")|("'"[^\']*"'")|[^ \t\r\n'"><]+))?
URLCHAR [a-z_A-Z0-9\!\~\:\;\'\$\?\@\&\%\#\.\-\+\/\=] URLCHAR [a-z_A-Z0-9\!\~\,\:\;\'\$\?\@\&\%\#\.\-\+\/\=]
URLMASK (([a-z_A-Z][^\>\"\n]*{URLCHAR})|({URLCHAR}+))([({]{URLCHAR}*[)}])? URLMASK (([a-z_A-Z][^\>\"\n]*{URLCHAR})|({URLCHAR}+))([({]{URLCHAR}*[)}])?
FILESCHAR [a-z_A-Z0-9\\:\\\/\-\+] FILESCHAR [a-z_A-Z0-9\\:\\\/\-\+]
FILEECHAR [a-z_A-Z0-9\-\+] FILEECHAR [a-z_A-Z0-9\-\+]
...@@ -675,7 +675,7 @@ REFWORD ("#"|"::")?({ID}("."|"#"|"::"|"-"))*{ID}{FUNCARG}? ...@@ -675,7 +675,7 @@ REFWORD ("#"|"::")?({ID}("."|"#"|"::"|"-"))*{ID}{FUNCARG}?
unput(' '); unput(' ');
return 0; return 0;
} }
<St_Ref>{BLANK}+"\"" { <St_Ref>{WS}+"\"" {
BEGIN(St_Ref2); BEGIN(St_Ref2);
} }
<St_Ref>\n { <St_Ref>\n {
......
...@@ -125,25 +125,25 @@ void XmlDocVisitor::visit(DocStyleChange *s) ...@@ -125,25 +125,25 @@ void XmlDocVisitor::visit(DocStyleChange *s)
switch (s->style()) switch (s->style())
{ {
case DocStyleChange::Bold: case DocStyleChange::Bold:
if (s->enable()) m_t << "<bold>"; else m_t << "</bold> "; if (s->enable()) m_t << "<bold>"; else m_t << "</bold>";
break; break;
case DocStyleChange::Italic: case DocStyleChange::Italic:
if (s->enable()) m_t << "<emphasis>"; else m_t << "</emphasis> "; if (s->enable()) m_t << "<emphasis>"; else m_t << "</emphasis>";
break; break;
case DocStyleChange::Code: case DocStyleChange::Code:
if (s->enable()) m_t << "<computeroutput>"; else m_t << "</computeroutput> "; if (s->enable()) m_t << "<computeroutput>"; else m_t << "</computeroutput>";
break; break;
case DocStyleChange::Subscript: case DocStyleChange::Subscript:
if (s->enable()) m_t << "<subscript>"; else m_t << "</subscript> "; if (s->enable()) m_t << "<subscript>"; else m_t << "</subscript>";
break; break;
case DocStyleChange::Superscript: case DocStyleChange::Superscript:
if (s->enable()) m_t << "<superscript>"; else m_t << "</superscript> "; if (s->enable()) m_t << "<superscript>"; else m_t << "</superscript>";
break; break;
case DocStyleChange::Center: case DocStyleChange::Center:
if (s->enable()) m_t << "<center>"; else m_t << "</center> "; if (s->enable()) m_t << "<center>"; else m_t << "</center>";
break; break;
case DocStyleChange::Small: case DocStyleChange::Small:
if (s->enable()) m_t << "<small>"; else m_t << "</small> "; if (s->enable()) m_t << "<small>"; else m_t << "</small>";
break; break;
case DocStyleChange::Preformatted: case DocStyleChange::Preformatted:
if (s->enable()) if (s->enable())
...@@ -153,7 +153,7 @@ void XmlDocVisitor::visit(DocStyleChange *s) ...@@ -153,7 +153,7 @@ void XmlDocVisitor::visit(DocStyleChange *s)
} }
else else
{ {
m_t << "</preformatted> "; m_t << "</preformatted>";
m_insidePre=FALSE; m_insidePre=FALSE;
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment