diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-10-27 20:10:16 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-10-27 20:10:16 (GMT) |
| commit | d2aec1bac5dbf774dd640b36aa0a6d7c1288c570 (patch) | |
| tree | 7b31e0941321a116a730c80e26726da9202178c3 /src/scanner.l | |
| parent | a62d9f8f1c2c97d454ff33bc1a4911d1362d9766 (diff) | |
| download | Doxygen-d2aec1bac5dbf774dd640b36aa0a6d7c1288c570.zip Doxygen-d2aec1bac5dbf774dd640b36aa0a6d7c1288c570.tar.gz Doxygen-d2aec1bac5dbf774dd640b36aa0a6d7c1288c570.tar.bz2 | |
Release-1.6.1-20091027
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l index dd1eb77..9e9c5f9 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -772,6 +772,10 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) <FindMembersPHP>"<?"("php"?) { // PHP code start BEGIN( FindMembers ); } +<FindMembersPHP>"<script"{BN}+"language"{BN}*"="{BN}*['"]?"php"['"]?{BN}*">" { // PHP code start + lineCount() ; + BEGIN( FindMembers ); + } <FindMembersPHP>[^\n<]+ { // Non-PHP code text, ignore } <FindMembersPHP>\n { // Non-PHP code text, ignore @@ -779,7 +783,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) } <FindMembersPHP>. { // Non-PHP code text, ignore } -<FindMembers>"?>" { // PHP code end +<FindMembers>"?>"|"</script>" { // PHP code end if (insidePHP) BEGIN( FindMembersPHP ); else @@ -5368,12 +5372,13 @@ static void handleCommentBlock(const QCString &doc,bool brief) bool needsEntry=FALSE; if (docBlockInBody && hideInBodyDocs) return; //printf("parseCommentBlock [%s]\n",doc.data()); + int lineNr = brief ? current->briefLine : current->docLine; // line of block start while (parseCommentBlock( g_thisParser, docBlockInBody && previous ? previous : current, doc, // text yyFileName, // file - brief ? current->briefLine : current->docLine, // line of block start + lineNr, // line of block start docBlockInBody ? FALSE : brief, docBlockInBody ? FALSE : docBlockAutoBrief, docBlockInBody, |