diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2012-11-18 21:43:28 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-11-18 21:43:28 (GMT) |
| commit | fee4053bd3dd075a2dd2cba4da8166ec5307eadd (patch) | |
| tree | 94365b932426de715b3a479094b7056e0c4f878b /src/scanner.l | |
| parent | ceb4115c7b941039411e1793e01239610ff112a2 (diff) | |
| download | Doxygen-fee4053bd3dd075a2dd2cba4da8166ec5307eadd.zip Doxygen-fee4053bd3dd075a2dd2cba4da8166ec5307eadd.tar.gz Doxygen-fee4053bd3dd075a2dd2cba4da8166ec5307eadd.tar.bz2 | |
Release-1.8.2-20121118
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/scanner.l b/src/scanner.l index c8dfcaa..c711765 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -25,7 +25,6 @@ #include <assert.h> #include <ctype.h> -#include "qtbc.h" #include <qarray.h> #include <qstack.h> #include <qregexp.h> @@ -303,6 +302,7 @@ static inline int computeIndent(const char *s,int startIndent) while ((c=*p++)) { if (c=='\t') col+=tabSize-(col%tabSize); + else if (c=='\n') col=0; else col++; } return col; @@ -2454,7 +2454,11 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" docBlockInBody = FALSE; docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); - docBlock.resize(0); + + QCString indent; + indent.fill(' ',computeIndent(yytext+1,g_column)); + docBlock=indent; + docBlockTerm = ';'; if (YY_START==EnumBaseType && current->section==Entry::ENUM_SEC) { @@ -2479,7 +2483,11 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" docBlockInBody = FALSE; docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); - docBlock.resize(0); + + QCString indent; + indent.fill(' ',computeIndent(yytext+1,g_column)); + docBlock=indent; + docBlockTerm = ','; if (YY_START==EnumBaseType && current->section==Entry::ENUM_SEC) { @@ -2508,7 +2516,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" docBlockInBody = FALSE; docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); - docBlock.resize(0); + QCString indent; + indent.fill(' ',computeIndent(yytext,g_column)); + docBlock=indent; + docBlockTerm = 0; if (yytext[yyleng-3]=='/') { @@ -5611,11 +5622,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" docBlockInBody = YY_START==SkipCurly; static bool javadocAutoBrief = Config_getBool("JAVADOC_AUTOBRIEF"); docBlockAutoBrief = javadocAutoBrief; - docBlock.resize(0); QCString indent; indent.fill(' ',computeIndent(yytext,g_column)); - docBlock+=indent; + docBlock=indent; if (docBlockAutoBrief) { |