summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-10-31 15:03:10 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-10-31 15:03:10 (GMT)
commit72bdd6ded877340c062cc2e9d61b8fe56de9a27f (patch)
tree1ac2a754a6be946cffdf1c18187ce0fec442f554
parent2b5a4541fb6f806c02a1f6e65a1ff2610f29751f (diff)
parent59d6a39b1c14ccf7477c50af56e45de51be1a054 (diff)
downloadDoxygen-72bdd6ded877340c062cc2e9d61b8fe56de9a27f.zip
Doxygen-72bdd6ded877340c062cc2e9d61b8fe56de9a27f.tar.gz
Doxygen-72bdd6ded877340c062cc2e9d61b8fe56de9a27f.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r--addon/doxywizard/config_doxyw.l3
-rw-r--r--src/configimpl.l3
2 files changed, 6 insertions, 0 deletions
diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l
index 554571f..d85de12 100644
--- a/addon/doxywizard/config_doxyw.l
+++ b/addon/doxywizard/config_doxyw.l
@@ -396,6 +396,9 @@ static void readIncludeFile(const QString &incName)
}
BEGIN(g_lastState);
}
+<GetQuotedString>("\\\\"|"@\\"|"\\@"|"@@") {
+ g_tmpString+=yytext;
+ }
<GetQuotedString>"\\\"" {
g_tmpString+='"';
}
diff --git a/src/configimpl.l b/src/configimpl.l
index ed23a12..6a527f9 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -922,6 +922,9 @@ static void readIncludeFile(const char *incName)
}
BEGIN(g_lastState);
}
+<GetQuotedString>("\\\\"|"@\\"|"\\@"|"@@") {
+ g_tmpString+=yytext;
+ }
<GetQuotedString>"\\\"" {
g_tmpString+='"';
}