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

doxygen · doxygen · commit b78ef9825c3e · 2022-04-17T21:02:51.000+02:00
diff --git a/src/layout.cpp b/src/layout.cpp
@@ -91,15 +91,24 @@ static bool elemIsVisible(const XMLHandlers::Attributes &attrib,bool defVal=TRUE
     }
     else if (opt && opt->type==ConfigValues::Info::String)
     {
-      return ConfigValues::instance().*(opt->value.s) != "NO";
+      visible = ConfigValues::instance().*(opt->value.s);
     }
     else if (!opt)
     {
-      err("found unsupported value %s for visible attribute in layout file\n",
-          qPrint(visible));
+      err("found unsupported value '%s' for visible attribute in layout file, reverting to '%s'\n",
+          qPrint(visible),(defVal?"yes":"no"));
+      return defVal;
     }
   }
-  return visible!="no" && visible!="0";
+  QCString visibleLow = visible.lower();
+  if (visibleLow=="no" || visibleLow=="false" || visibleLow=="0") return FALSE;
+  else if (visibleLow=="yes" || visibleLow=="true" || visibleLow=="1") return TRUE;
+  else
+  {
+    err("found unsupported value '%s' for visible attribute in layout file, reverting to '%s'\n",
+        qPrint(visible),(defVal?"yes":"no"));
+    return defVal;
+  }
 }
 
 static bool parentIsVisible(LayoutNavEntry *parent)
diff --git a/src/pre.l b/src/pre.l
@@ -292,6 +292,7 @@ struct preYY_state
   QCString           blockName;
   int                condCtx        = 0;
   bool               skip           = false;
+  bool               insideIDL      = false;
   bool               insideCS       = false; // C# has simpler preprocessor
   bool               insideFtn      = false;
   bool               isSource       = false;
@@ -415,6 +416,7 @@ WSopt [ \t\r]*
 %x      CondLineC
 %x      CondLineCpp
 %x      SkipCond
+%x      IDLquote
 
 %%
 
@@ -435,6 +437,32 @@ WSopt [ \t\r]*
                                           outputArray(yyscanner,yytext,yyleng);
                                           BEGIN(LexCopyLine);
                                         }
+<Start>^{Bopt}"cpp_quote"{Bopt}"("{Bopt}\" {
+                                          if (yyextra->insideIDL)
+                                          {
+                                            BEGIN(IDLquote);
+                                          }
+                                          else
+                                          {
+                                            REJECT;
+                                          }
+                                        }
+<IDLquote>"\\\\"                        {
+                                          outputArray(yyscanner,"\\",1);
+                                        }
+<IDLquote>"\\\""                        {
+                                          outputArray(yyscanner,"\"",1);
+                                        }
+<IDLquote>"\""{Bopt}")"                 {
+                                          BEGIN(Start);
+                                        }
+<IDLquote>\n                            {
+                                          outputChar(yyscanner,'\n');
+                                          yyextra->yyLineNr++;
+                                        }
+<IDLquote>.                             {
+                                          outputArray(yyscanner,yytext,yyleng);
+                                        }
 <Start>^{Bopt}/[^#]                     {
                                           outputArray(yyscanner,yytext,yyleng);
                                           BEGIN(CopyLine);
@@ -1764,7 +1792,7 @@ WSopt [ \t\r]*
                                         }
 <*>{CCS}/{CCE}                          |
 <*>{CCS}[*!]?                           {
-                                          if (YY_START==SkipVerbatim || YY_START==SkipCond)
+                                          if (YY_START==SkipVerbatim || YY_START==SkipCond || YY_START==IDLquote)
                                           {
                                             REJECT;
                                           }
@@ -1786,7 +1814,7 @@ WSopt [ \t\r]*
                                           }
                                         }
 <*>{CPPC}[/!]?                          {
-                                          if (YY_START==SkipVerbatim || YY_START==SkipCond || getLanguageFromFileName(yyextra->fileName)==SrcLangExt_Fortran)
+                                          if (YY_START==SkipVerbatim || YY_START==SkipCond || getLanguageFromFileName(yyextra->fileName)==SrcLangExt_Fortran || YY_START==IDLquote)
                                           {
                                             REJECT;
                                           }
@@ -1844,6 +1872,7 @@ static void setFileName(yyscan_t yyscanner,const QCString &name)
   //printf("setFileName(%s) state->fileName=%s state->yyFileDef=%p\n",
   //    name,qPrint(state->fileName),state->yyFileDef);
   if (state->yyFileDef && state->yyFileDef->isReference()) state->yyFileDef=0;
+  state->insideIDL = getLanguageFromFileName(state->fileName)==SrcLangExt_IDL;
   state->insideCS = getLanguageFromFileName(state->fileName)==SrcLangExt_CSharp;
   state->insideFtn = getLanguageFromFileName(state->fileName)==SrcLangExt_Fortran;
   state->isSource = guessSection(state->fileName);
diff --git a/src/scanner.l b/src/scanner.l
@@ -3489,6 +3489,8 @@ NONLopt [^\n]*
                                           {
                                             yyextra->mtype = Method;
                                             yyextra->virt = Normal;
+                                            yyextra->current->bodyLine = -1;
+                                            yyextra->current->bodyColumn = 1;
                                             yyextra->current->groups.clear();
                                             initEntry(yyscanner);
                                           }
@@ -5038,6 +5040,16 @@ NONLopt [^\n]*
                                           BEGIN(FuncQual);
                                         }
 <OldStyleArgs>.                         { yyextra->current->args += *yytext; }
+<FuncQual,FuncRound,FuncFunc>\"         {
+                                          if (yyextra->insideIDL && yyextra->insideCppQuote)
+                                          {
+                                            BEGIN(EndCppQuote);
+                                          }
+                                          else
+                                          {
+                                            yyextra->current->args += *yytext;
+                                          }
+                                        }
 <FuncQual,FuncRound,FuncFunc>.          { yyextra->current->args += *yytext; }
 <FuncQual>{BN}*"try:"                   |
 <FuncQual>{BN}*"try"{BN}+               { /* try-function-block */
@@ -6963,6 +6975,11 @@ NONLopt [^\n]*
                                           {
                                             BEGIN(EndCppQuote);
                                           }
+                                          else if (yyextra->insidePHP)
+                                          {
+                                            yyextra->lastStringContext=YY_START;
+                                            BEGIN(SkipString);
+                                          }
                                         }
 <*>^{B}*"#"                             {
                                           if (!yyextra->insidePHP)
@@ -6989,13 +7006,6 @@ NONLopt [^\n]*
                                             BEGIN(SkipPHPString);
                                           }
                                         }
-<*>\"                                   {
-                                          if (yyextra->insidePHP)
-                                          {
-                                            yyextra->lastStringContext=YY_START;
-                                            BEGIN(SkipString);
-                                          }
-                                        }
 <*>\?                                   {
                                           if (yyextra->insideCS && (YY_START != SkipRound) && (YY_START != CSAccessorDecl))
                                           {

Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,24 @@ static bool elemIsVisible(const XMLHandlers::Attributes &attrib,bool defVal=TRUE`
`91`	`91`	`}`
`92`	`92`	`else if (opt && opt->type==ConfigValues::Info::String)`
`93`	`93`	`{`
`94`		`- return ConfigValues::instance().*(opt->value.s) != "NO";`
	`94`	`+ visible = ConfigValues::instance().*(opt->value.s);`
`95`	`95`	`}`
`96`	`96`	`else if (!opt)`
`97`	`97`	`{`
`98`		`- err("found unsupported value %s for visible attribute in layout file\n",`
`99`		`- qPrint(visible));`
	`98`	`+ err("found unsupported value '%s' for visible attribute in layout file, reverting to '%s'\n",`
	`99`	`+ qPrint(visible),(defVal?"yes":"no"));`
	`100`	`+ return defVal;`
`100`	`101`	`}`
`101`	`102`	`}`
`102`		`- return visible!="no" && visible!="0";`
	`103`	`+ QCString visibleLow = visible.lower();`
	`104`	`+ if (visibleLow=="no" \|\| visibleLow=="false" \|\| visibleLow=="0") return FALSE;`
	`105`	`+ else if (visibleLow=="yes" \|\| visibleLow=="true" \|\| visibleLow=="1") return TRUE;`
	`106`	`+ else`
	`107`	`+ {`
	`108`	`+ err("found unsupported value '%s' for visible attribute in layout file, reverting to '%s'\n",`
	`109`	`+ qPrint(visible),(defVal?"yes":"no"));`
	`110`	`+ return defVal;`
	`111`	`+ }`
`103`	`112`	`}`
`104`	`113`
`105`	`114`	`static bool parentIsVisible(LayoutNavEntry *parent)`
Original file line number	Diff line number	Diff line change
`@@ -3489,6 +3489,8 @@ NONLopt [^\n]*`
`3489`	`3489`	`{`
`3490`	`3490`	`yyextra->mtype = Method;`
`3491`	`3491`	`yyextra->virt = Normal;`
	`3492`	`+ yyextra->current->bodyLine = -1;`
	`3493`	`+ yyextra->current->bodyColumn = 1;`
`3492`	`3494`	`yyextra->current->groups.clear();`
`3493`	`3495`	`initEntry(yyscanner);`
`3494`	`3496`	`}`
`@@ -5038,6 +5040,16 @@ NONLopt [^\n]*`
`5038`	`5040`	`BEGIN(FuncQual);`
`5039`	`5041`	`}`
`5040`	`5042`	`<OldStyleArgs>. { yyextra->current->args += *yytext; }`
	`5043`	`+<FuncQual,FuncRound,FuncFunc>\" {`
	`5044`	`+ if (yyextra->insideIDL && yyextra->insideCppQuote)`
	`5045`	`+ {`
	`5046`	`+ BEGIN(EndCppQuote);`
	`5047`	`+ }`
	`5048`	`+ else`
	`5049`	`+ {`
	`5050`	`+ yyextra->current->args += *yytext;`
	`5051`	`+ }`
	`5052`	`+ }`
`5041`	`5053`	`<FuncQual,FuncRound,FuncFunc>. { yyextra->current->args += *yytext; }`
`5042`	`5054`	`<FuncQual>{BN}*"try:" \|`
`5043`	`5055`	`<FuncQual>{BN}"try"{BN}+ { / try-function-block */`
`@@ -6963,6 +6975,11 @@ NONLopt [^\n]*`
`6963`	`6975`	`{`
`6964`	`6976`	`BEGIN(EndCppQuote);`
`6965`	`6977`	`}`
	`6978`	`+ else if (yyextra->insidePHP)`
	`6979`	`+ {`
	`6980`	`+ yyextra->lastStringContext=YY_START;`
	`6981`	`+ BEGIN(SkipString);`
	`6982`	`+ }`
`6966`	`6983`	`}`
`6967`	`6984`	`<>^{B}"#" {`
`6968`	`6985`	`if (!yyextra->insidePHP)`
`@@ -6989,13 +7006,6 @@ NONLopt [^\n]*`
`6989`	`7006`	`BEGIN(SkipPHPString);`
`6990`	`7007`	`}`
`6991`	`7008`	`}`
`6992`		`-<*>\" {`
`6993`		`- if (yyextra->insidePHP)`
`6994`		`- {`
`6995`		`- yyextra->lastStringContext=YY_START;`
`6996`		`- BEGIN(SkipString);`
`6997`		`- }`
`6998`		`- }`
`6999`	`7009`	`<*>\? {`
`7000`	`7010`	`if (yyextra->insideCS && (YY_START != SkipRound) && (YY_START != CSAccessorDecl))`
`7001`	`7011`	`{`