diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-12-22 16:03:24 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-12-22 16:03:24 (GMT) |
| commit | f4fab829c8e9b4bf54c60fd85805eb008c3838ab (patch) | |
| tree | ed7891ebf8c1dbed877ba72eecb07d5da29b4978 /src/scanner.l | |
| parent | 4a482aae6c3ab0a02ce39a33fa14410ebaec6bc4 (diff) | |
| download | Doxygen-f4fab829c8e9b4bf54c60fd85805eb008c3838ab.zip Doxygen-f4fab829c8e9b4bf54c60fd85805eb008c3838ab.tar.gz Doxygen-f4fab829c8e9b4bf54c60fd85805eb008c3838ab.tar.bz2 | |
Release-1.6.1-20091222
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/scanner.l b/src/scanner.l index 9e9c5f9..df4a382 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2002,7 +2002,10 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) } <TryFunctionBlock>. <TryFunctionBlockEnd>"catch" { BEGIN(TryFunctionBlock); } -<TryFunctionBlockEnd>. { unput(*yytext); +<TryFunctionBlockEnd>\n { unput(*yytext); // added to fix bug id 601138 + BEGIN( FindMembers ); + } +<TryFunctionBlockEnd>. { unput(*yytext); BEGIN( FindMembers ); } <EndCppQuote>")" { @@ -2024,13 +2027,18 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) yyLineNr = atoi(&yytext[1]); //printf("setting line number to %d\n",yyLineNr); lastPreLineCtrlContext = YY_START; + current->program+=yytext; BEGIN( PreLineCtrl ); } <PreLineCtrl>"\""[^\n\"]*"\"" { yyFileName = stripQuotes(yytext); + current->program+=yytext; } -<PreLineCtrl>. {} +<PreLineCtrl>. { + current->program+=yytext; + } <PreLineCtrl>\n { + current->program+=yytext; yyLineNr++; BEGIN( lastPreLineCtrlContext ); } @@ -3306,8 +3314,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) } <ReadBody,ReadNSBody,ReadBodyIntf>. { current->program += yytext ; } -<FindMembers>"("/{BN}*({TSCOPE}{BN}*"::")*{TSCOPE}{BN}*")"{BN}*"(" | /* typedef void (A<int>::func_t)(args...) */ -<FindMembers>("("({BN}*{TSCOPE}{BN}*"::")*({BN}*[*&]{BN}*)+)+ { /* typedef void (A::*ptr_t)(args...) or int (*func(int))[] */ +<FindMembers>"("/{BN}*"::"*{BN}*({TSCOPE}{BN}*"::")*{TSCOPE}{BN}*")"{BN}*"(" | /* typedef void (A<int>::func_t)(args...) */ +<FindMembers>("("({BN}*"::"*{BN}*{TSCOPE}{BN}*"::")*({BN}*[*&]{BN}*)+)+ { /* typedef void (A::*ptr_t)(args...) or int (*func(int))[] */ if (insidePHP) // reference parameter { REJECT @@ -3565,6 +3573,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) } } /* a non-special comment */ +<ReadFuncArgType,ReadTempArgs>"/**/" { /* empty comment */ } <ReadFuncArgType,ReadTempArgs>"/*" { lastCContext = YY_START; BEGIN( SkipComment ); @@ -4536,6 +4545,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) BEGIN( FindMembers ); } } +<CSConstraintType,CSConstraintName>"/**/" { /* empty comment */ } <CSConstraintType,CSConstraintName>("/*"[*!]|"//"[/!])("<"?) { // special comment fullArgString.resize(0); lastCopyArgChar='#'; // end marker |