Commit 23f7c36f authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Merge branch 'master' of github.com:doxygen/doxygen

parents 56051878 84d1195b

src/commentcnv.l

+6 −3
Original line number Diff line number Diff line
@@ -241,7 +241,10 @@ void replaceComment(int offset); 


%%



<Scan>[^"'!\/\n\\#\\-]*           { /* eat anything that is not " / or \n */ 

<Scan>[^"'!\/\n\\#\\-\\,]*           { /* eat anything that is not " / , or \n */ 

                                       copyToOutput(yytext,(int)yyleng); 

                                     }

<Scan>[\\,]                          { /* eat , so we have a nice separator in long initialization lines */ 

                                       copyToOutput(yytext,(int)yyleng); 

                                     }

<Scan>"\"\"\""!                     { /* start of python long comment */

src/scanner.l

+4 −1
Original line number Diff line number Diff line
@@ -3252,7 +3252,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) 
					    *pCopyCurlyGString+=yytext; 

					  }

                                        }

<GCopyCurly>[^"'{}\/\n]+		{

<GCopyCurly>[^"'{}\/\n,]+		{

  					  *pCopyCurlyGString+=yytext;

  					}

<GCopyCurly>[,]+		        {

  					  *pCopyCurlyGString+=yytext;

  					}

<GCopyCurly>"/"				{ *pCopyCurlyGString+=yytext; }

src/doxygen.cpp

+1 −1

File changed.

Contains only whitespace changes.