summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-01-05 10:26:10 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-01-05 10:26:10 (GMT)
commita66e1ada3c7467e267ff39262178fa4577f0b6ab (patch)
treeee15d10d932fa1d21de3ebfcb445e2bd81b9f00b /src/scanner.l
parentff11b7d98ad7d24770afd151aa6b439adc7506d2 (diff)
downloadDoxygen-a66e1ada3c7467e267ff39262178fa4577f0b6ab.zip
Doxygen-a66e1ada3c7467e267ff39262178fa4577f0b6ab.tar.gz
Doxygen-a66e1ada3c7467e267ff39262178fa4577f0b6ab.tar.bz2
Release-1.2.13.1
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l48
1 files changed, 13 insertions, 35 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 6371b71..e70d3da 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -936,11 +936,6 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
}
<FindMembers>"template"({BN}*)"<"/[>]? {
lineCount();
- // class template specifier already found => member template specifier
- // already inside class => member template specifier
- //if (current->tArgList /*|| (current_root->section&Entry::COMPOUND_MASK)*/)
- //{
- // printf("-------> member template \n");
if (current->tArgLists==0)
{
current->tArgLists = new QList<ArgumentList>;
@@ -950,33 +945,6 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
al->setAutoDelete(TRUE);
current->tArgLists->append(al);
currentArgumentList = al;
- //if (current->mtArgList)
- // {
- // if (current->tArgList)
- // {
- // delete current->tArgList;
- // }
- // current->tArgList = current->mtArgList;
- // current->mtArgList = 0;
- // }
- // current->mtArgList = new ArgumentList;
- // current->mtArgList->setAutoDelete(TRUE);
- // currentArgumentList = current->mtArgList;
- //}
- //else // class template specifier
- //{
- // printf("-------> class template\n");
- // if (current->tArgList)
- // {
- // current->tArgList->clear();
- // }
- // else
- // {
- // current->tArgList = new ArgumentList;
- // current->tArgList->setAutoDelete(TRUE);
- // }
- // currentArgumentList = current->tArgList;
- //}
templateStr="<";
fullArgString = templateStr.copy();
copyArgString = &templateStr;
@@ -2198,7 +2166,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
BEGIN(SkipCPP);
}
*/
-<FuncQual>[{:;] { unput(*yytext); BEGIN( Function ); }
+<FuncQual>[{:;,] { unput(*yytext); BEGIN( Function ); }
<FuncQual>{BN}*"const"{BN}* {
lineCount() ;
current->args += " const ";
@@ -2263,7 +2231,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
<Function>":" {
BEGIN(SkipInits);
}
-<Function>[;{] {
+<Function>[;{,] {
current->name=current->name.simplifyWhiteSpace();
current->type=current->type.simplifyWhiteSpace();
current->args=current->args.simplifyWhiteSpace();
@@ -2325,7 +2293,11 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
current = new Entry ;
initEntry();
lastCurlyContext = FindMembers;
- if( *yytext == '{' )
+ if ( *yytext == ',' )
+ {
+ current->type = previous->type.data();
+ }
+ if ( *yytext == '{' )
{
if (current_root->section & Entry::COMPOUND_MASK)
previous->memSpec = previous->memSpec | Entry::Inline;
@@ -4023,9 +3995,15 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
<Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,AfterDoc>^{B}*(("//"{B}*)?)"*"+[ \t]*"-"("#")?{B}+ {
current->doc += yytext;
}
+<Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,AfterDoc>^{B}*(("//"{B}*)?)"*"+[ \t]*"."{B}*\n {
+ current->doc += yytext;
+ }
<ClassDocBrief,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+[ \t]*"-"("#")?{B}+ {
current->brief += "-";
}
+<ClassDocBrief,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+[ \t]*"."{B}*\n {
+ current->brief += ".";
+ }
<Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,ClassDocBrief,AfterDoc,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+/[^/]
<Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,ClassDocBrief,AfterDoc,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+{B}+ {
current->doc+=' ';