summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-05-28 12:47:44 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2003-05-28 12:47:44 (GMT)
commit35c2baedaa68519999af733a87d8e6ff9a89358c (patch)
tree3e4e50e4fa9b9f0f4c75870e0a09ffc488b34699 /src/scanner.l
parent9e1745a1714d4ece7d490918de2eb7ff2060453e (diff)
downloadDoxygen-35c2baedaa68519999af733a87d8e6ff9a89358c.zip
Doxygen-35c2baedaa68519999af733a87d8e6ff9a89358c.tar.gz
Doxygen-35c2baedaa68519999af733a87d8e6ff9a89358c.tar.bz2
Release-1.3.1
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l
index c979bfb..0cf4f97 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -2126,7 +2126,8 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
<ReadBody,ReadNSBody>{BN}+ { current->program += yytext ;
lineCount() ;
}
-<ReadBody,ReadNSBody>. { current->program += yytext ; }
+<ReadBody,ReadNSBody>. { current->program += yytext ; }
+<ReadBody,ReadNSBody>"'#" { current->program += yytext ; }
<FindMembers>"("/({BN}*{ID}{BN}*"::")*{ID}{BN}*")"{BN}*"(" | /* typedef void (A::func_t)(args...) */
<FindMembers>("("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+)+ { /* typedef void (A::*ptr_t)(args...) */
@@ -2337,6 +2338,11 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
lastCContext = YY_START;
BEGIN( SkipCxxComment );
}
+<ReadFuncArgType,ReadTempArgs>"'#" { if (! insidePHP)
+ REJECT;
+ *copyArgString+=yytext;
+ fullArgString+=yytext;
+ }
<ReadFuncArgType,ReadTempArgs>"#" {
if (! insidePHP)
REJECT;
@@ -4590,11 +4596,17 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
<Doc>"*/" {
checkDocs();
current->doc += "\n\n";
- //printf("End of docs at line %d\n",yyLineNr);
+ //printf("End of docs at line %d: %s\n",yyLineNr,current->doc.data());
if (lastDocContext==SkipCurly && Config_getBool("HIDE_IN_BODY_DOCS"))
{
current->doc.resize(0);
}
+ if (current->section==Entry::GROUPDOC_SEC)
+ {
+ current_root->addSubEntry(current);
+ current = new Entry ;
+ initEntry();
+ }
BEGIN( lastDocContext );
}
<JavaDoc>"*/" {