summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 08c116c..16bcd73 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -5500,12 +5500,23 @@ 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: %s\n",yyLineNr,current->doc.data());
- if (lastDocContext==SkipCurly && Config_getBool("HIDE_IN_BODY_DOCS"))
+ if (lastDocContext==SkipCurly)
{
+ if (!Config_getBool("HIDE_IN_BODY_DOCS"))
+ {
+ if (!previous->doc.isEmpty())
+ {
+ previous->doc+="<p>";
+ }
+ previous->doc += current->doc;
+ }
current->doc.resize(0);
}
+ else
+ {
+ current->doc += "\n\n";
+ }
if (current->section==Entry::GROUPDOC_SEC)
{
current_root->addSubEntry(current);