summaryrefslogtreecommitdiffstats
path: root/src/code.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-04-12 09:32:03 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-04-12 09:32:03 (GMT)
commit3cd2917eca7d09a30636b2b16efcd187bc3bf7c0 (patch)
tree97a61f449c3cd2b31dba7908cce7881ee2f0da85 /src/code.l
parent535ddc3bb7b6a6d4b50855a06838c11b84a9f3fd (diff)
downloadDoxygen-3cd2917eca7d09a30636b2b16efcd187bc3bf7c0.zip
Doxygen-3cd2917eca7d09a30636b2b16efcd187bc3bf7c0.tar.gz
Doxygen-3cd2917eca7d09a30636b2b16efcd187bc3bf7c0.tar.bz2
Release-1.3
Diffstat (limited to 'src/code.l')
-rw-r--r--src/code.l13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/code.l b/src/code.l
index 4a2b80a..5335daa 100644
--- a/src/code.l
+++ b/src/code.l
@@ -672,6 +672,7 @@ static void generateClassOrGlobalLink(BaseCodeDocInterface &ol,char *clName,
}
else
{
+ //printf("typeOnly=%d\n",typeOnly);
if (cd==0 && !typeOnly) // not a class, see if it is a global enum/variable/typedef.
{
MemberDef *md = setCallContextForVar(clName);
@@ -1556,7 +1557,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
<MemberCall2,FuncCall>[a-z_A-Z][:a-z_A-Z0-9]*({B}*"<"[^\n\<\>]*">")? {
addParmType();
g_parmName=yytext;
- generateClassOrGlobalLink(*g_code,yytext,TRUE);
+ generateClassOrGlobalLink(*g_code,yytext,!g_insideBody);
}
<MemberCall2,FuncCall>, {
g_code->codify(yytext);
@@ -1798,6 +1799,11 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
codifyLines(yytext);
endFontClass();
}
+ if (YY_START==SkipCxxComment)
+ {
+ endFontClass();
+ BEGIN( g_lastCContext ) ;
+ }
}
<*>\n{B}*"//@"[{}].*\n { // remove one-line group marker
if (Config_getBool("STRIP_CODE_COMMENTS"))
@@ -1815,6 +1821,11 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
codifyLines(yytext);
endFontClass();
}
+ if (YY_START==SkipCxxComment)
+ {
+ endFontClass();
+ BEGIN( g_lastCContext ) ;
+ }
}
<*>\n{B}*"/*@"[{}] { // remove one-line group marker
if (Config_getBool("STRIP_CODE_COMMENTS"))