Fix M4 quotation in section 2 prologue and refactor duplicated code

2 files changed, 32 insertions, 22 deletions

diff --git a/src/scan.l b/src/scan.l
index ecf238a..d5fe347 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -41,8 +41,8 @@ extern const char *escaped_qstart, *escaped_qend;
 #define M4QSTART "[""["
 #define M4QEND "]""]"
 
-#define SECT3_ESCAPED_QSTART "[" M4QEND M4QSTART "[" M4QEND M4QSTART
-#define SECT3_ESCAPED_QEND M4QEND "]" M4QSTART M4QEND "]" M4QSTART
+#define ESCAPED_QSTART "[" M4QEND M4QSTART "[" M4QEND M4QSTART
+#define ESCAPED_QEND M4QEND "]" M4QSTART M4QEND "]" M4QSTART
 
 #define ACTION_ECHO add_action( yytext )
 #define ACTION_IFDEF(def, should_define) \
@@ -51,8 +51,8 @@ extern const char *escaped_qstart, *escaped_qend;
 		action_define( def, 1 ); \
 	}
 
-#define ACTION_ECHO_QSTART add_action (SECT3_ESCAPED_QSTART)
-#define ACTION_ECHO_QEND   add_action (SECT3_ESCAPED_QEND)
+#define ACTION_ECHO_QSTART add_action (ESCAPED_QSTART)
+#define ACTION_ECHO_QEND   add_action (ESCAPED_QEND)
 
 #define ACTION_M4_IFDEF(def, should_define) \
     do{ \
@@ -75,13 +75,13 @@ extern const char *escaped_qstart, *escaped_qend;
 	if(yyleng < MAXLINE) \
          { \
 	strcpy( nmstr, yytext ); \
+	return NAME; \
 	 } \
 	else \
-	 { \
+	 do { \
 	   synerr(_("Input line too long\n")); \
 	   FLEX_EXIT(EXIT_FAILURE);  \
-	 }  \
-	return NAME;
+	 } while (0)
 
 #define PUT_BACK_STRING(str, start) \
 	{ size_t i = strlen( str );	\
@@ -101,10 +101,21 @@ extern const char *escaped_qstart, *escaped_qend;
 	if ( getenv("POSIXLY_CORRECT") ) \
 		posix_compat = true;
 
-#define START_CODEBLOCK do { add_action(M4QSTART); BEGIN(CODEBLOCK); } while(0)
-#define END_CODEBLOCK do { add_action(M4QEND); BEGIN(INITIAL); } while (0)
-#define CODEBLOCK_QSTART "[]""][""[""[]""][""["
-#define CODEBLOCK_QEND "]""]""][""[""]""]""][""["
+#define START_CODEBLOCK(x) do { \
+     /* Emit the needed line directive... */\
+     if (indented_code == false) { \
+         linenum++; \
+         line_directive_out(NULL, 1); \
+     } \
+     add_action(M4QSTART); \
+     yy_push_state(CODEBLOCK); \
+     if ((indented_code = x)) ACTION_ECHO; \
+     } while(0)
+#define END_CODEBLOCK do { \
+     yy_pop_state();\
+    add_action(M4QEND); \
+     if (!indented_code) line_directive_out(NULL, 0);\
+      } while (0)
 %}
 
 %option caseless nodefault noreject stack noyy_top_state
@@ -153,17 +164,12 @@ M4QEND      "]""]"
 
 
 <INITIAL>{
-	^{WS}		indented_code = true; START_CODEBLOCK;
+	^{WS}		START_CODEBLOCK(true);
 	^"/*"		add_action("/*[""["); yy_push_state( COMMENT );
 	^#{OPTWS}line{WS}	yy_push_state( LINEDIR );
 	^"%s"{NAME}?	return SCDECL;
 	^"%x"{NAME}?	return XSCDECL;
-	^"%{".*{NL}	{
-			++linenum;
-			line_directive_out(NULL, 1);
-			indented_code = false;
-			START_CODEBLOCK;
-			}
+	^"%{".*{NL}	START_CODEBLOCK(false);
     ^"%top"[[:blank:]]*"{"[[:blank:]]*{NL}    {
                 brace_start_line = linenum;
                 ++linenum;
@@ -478,7 +484,7 @@ COMMENT,CODE_COMMENT>{
 	^"%{".*	++bracelevel; yyless( 2 );	/* eat only %{ */
 	^"%}".*	--bracelevel; yyless( 2 );	/* eat only %} */
 
-	^{WS}.*	ACTION_ECHO;	/* indented code in prolog */
+	^{WS} START_CODEBLOCK(true); /* indented code in prolog */
 
 	^{NOT_WS}.*	{	/* non-indented code */
 			if ( bracelevel <= 0 )
diff --git a/tests/quotes.l b/tests/quotes.l
index 618f1c1..62f4fb4 100644
--- a/tests/quotes.l
+++ b/tests/quotes.l
@@ -62,7 +62,11 @@ static int foo (int i){
 
 
 %%
-
+  /* indented code    [ 1 ] */
+  /* indented code   [[ 2 ]] */
+  /* indented code  [[[ 3 ]]] */
+  /* indented code [[[[ 4 ]]]] */
+  /* indented code ]] unmatched [[ */
 a       /* action comment    [ 1 ]          */ ;
 b       /* action comment   [[ 2 ]]         */ ;
 c       /* action comment  [[[ 3 ]]]        */ ;
@@ -76,7 +80,7 @@ f       return 1+foo(a[b[c[0]]]);
             /* action block [[[[ 4 ]]]]     TEST_XXX */
             /* action block ]] unmatched [[ TEST_XXX */
             assert(!strcmp("m4_define(alpha, beta)", "m4_""define(alpha, beta)"));
-            return 1+foo(a[b[c[0]]]);  //   TEST_XXX
+            return 1+foo(a[b[c[0]]]);  /*   TEST_XXX */
          }
 %%
 
@@ -94,7 +98,7 @@ int main(void);
 int
 main (void)
 {
-    // m4_m4exit(100)
+    /* m4_m4exit(100) */
     FILE *M4_YY_NOT_IN_HEADER = stdin;
     yyin = CONCAT_IDENTS(M4_, YY_NOT_IN_HEADER);
     yyout = stdout;