better bracket handling in the scanner

diff --git a/scan.l b/scan.l
index 7569bd1e8454f8627ec88016964d6058c2611eab..1bcb09b42c330f756be9676dc1563ce96811a411 100644 (file)
--- a/scan.l
+++ b/scan.l
@@ -883,7 +883,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0';  /* chop trailing brace */
                        }
        }
 
-    {M4QSTART}  ACTION_ECHO_QEND;
+    {M4QSTART}  ACTION_ECHO_QSTART;
     {M4QEND}    ACTION_ECHO_QEND;
     .           ACTION_ECHO;
        {NL}            {
@@ -906,7 +906,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0';  /* chop trailing brace */
 <ACTION>{
        "{"             ACTION_ECHO; ++bracelevel;
        "}"             ACTION_ECHO; --bracelevel;
-    {M4QSTART}  ACTION_ECHO_QEND;
+    {M4QSTART}  ACTION_ECHO_QSTART;
     {M4QEND}    ACTION_ECHO_QEND;
        [^[:alpha:]_{}"'/\n\[\]]+       ACTION_ECHO;
     [\[\]]      ACTION_ECHO;