From 8ffb1a4b56d5a82016267ce3bf7c3ecd16e008bf Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Tue, 10 Aug 2021 19:59:55 +0200
Subject: [PATCH] Simplified the regular expressions

---
 src/code.l         | 2 +-
 src/commentscan.l  | 2 +-
 src/declinfo.l     | 2 +-
 src/doctokenizer.l | 2 +-
 src/lexcode.l      | 2 +-
 src/lexscanner.l   | 2 +-
 src/scanner.l      | 2 +-
 src/util.cpp       | 3 ++-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/code.l b/src/code.l
index fc782e2153c..408171836fd 100644
--- a/src/code.l
+++ b/src/code.l
@@ -270,7 +270,7 @@ static std::mutex g_usingDirectiveMutex;
 B       [ \t]
 Bopt    {B}*
 BN      [ \t\n\r]
-ID      "$"?[$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
+ID      [$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
 SEP     ("::"|"\\")
 SCOPENAME ({SEP}{BN}*)?({ID}{BN}*{SEP}{BN}*)*("~"{BN}*)?{ID}
 TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">"
diff --git a/src/commentscan.l b/src/commentscan.l
index 4a60eb813b2..6f56897019f 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -480,7 +480,7 @@ NW          [^a-z_A-Z0-9]
 FILESCHAR [a-z_A-Z0-9\x80-\xFF\\:\\\/\-\+@&#]
 FILEECHAR [a-z_A-Z0-9\x80-\xFF\-\+@&#]
 FILE      ({FILESCHAR}*{FILEECHAR}+("."{FILESCHAR}*{FILEECHAR}+)*)|("\""[^\n\"]*"\"")
-ID        "$"?[$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
+ID        [$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
 LABELID   [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]*
 CITESCHAR [a-z_A-Z0-9\x80-\xFF\-\?]
 CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/\?]*
diff --git a/src/declinfo.l b/src/declinfo.l
index c5239515a72..3e3f5036fd7 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -85,7 +85,7 @@ static yy_size_t yyread(char *buf,yy_size_t max_size, yyscan_t yyscanner);
 
 B       [ \t]
 Bopt    {B}*
-ID	"$"?([$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*)|(@[0-9]+)
+ID	([$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*)|(@[0-9]+)
 
 %x      Start
 %x	Template
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 7f7a52ad475..b66eb5b7927 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -226,7 +226,7 @@ WS        [ \t\r\n]
 NONWS     [^ \t\r\n]
 BLANK     [ \t\r]
 BLANKopt  {BLANK}*
-ID        "$"?[$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
+ID        [$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
 LABELID   [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]*
 PHPTYPE   [\\:a-z_A-Z0-9\x80-\xFF\-]+
 CITESCHAR [a-z_A-Z0-9\x80-\xFF\-\?]
diff --git a/src/lexcode.l b/src/lexcode.l
index 652ace8343c..a2c0a97cacb 100644
--- a/src/lexcode.l
+++ b/src/lexcode.l
@@ -128,7 +128,7 @@ BN        [ \t\n\r]
 BL        [ \t\r]*"\n"
 B         [ \t]
 Bopt      {B}*
-ID        "$"?[$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
+ID        [$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
 PRE       [pP][rR][eE]
 CODE      [cC][oO][dD][eE]
 RAWBEGIN  (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"("
diff --git a/src/lexscanner.l b/src/lexscanner.l
index 53deade9284..0c5ca310540 100644
--- a/src/lexscanner.l
+++ b/src/lexscanner.l
@@ -126,7 +126,7 @@ BN        [ \t\n\r]
 BL        [ \t\r]*"\n"
 B         [ \t]
 Bopt      {B}*
-ID        "$"?[$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
+ID        [$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
 PRE       [pP][rR][eE]
 CODE      [cC][oO][dD][eE]
 RAWBEGIN  (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"("
diff --git a/src/scanner.l b/src/scanner.l
index 724ceb6504b..5cb9e5eacda 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -239,7 +239,7 @@ BNopt     {BN}*
 BL        [ \t\r]*"\n"
 B         [ \t]
 Bopt      {B}*
-ID        "$"?[$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
+ID        [$a-z_A-Z\x80-\xFF][$a-z_A-Z0-9\x80-\xFF]*
 SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)(((~|!){BN}*)?{ID})
 TSCOPE    {ID}("<"[a-z_A-Z0-9 \t\*\&,:]*">")?
 CSSCOPENAME (({ID}?{BN}*"."{BN}*)*)((~{BN}*)?{ID})
diff --git a/src/util.cpp b/src/util.cpp
index 767d16f81db..bb6b6fcfac7 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -729,7 +729,8 @@ QCString removeRedundantWhiteSpace(const QCString &s)
         {
           *dst++=c;
           break;
-        } // fallthrough
+        }
+        // else fallthrough
       case '@':  // '@name' -> ' @name'
       case '\'': // ''name' -> '' name'
         if (i>0 && i<l-1 && pc!='=' && pc!=':' && !isspace((uchar)pc) &&