Changes to m4/m4/input.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/12/23 00:02:21

Index: m4/input.c
===================================================================
RCS file: /sources/m4/m4/m4/input.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- m4/input.c  11 Nov 2006 16:21:25 -0000      1.58
+++ m4/input.c  23 Dec 2006 00:02:20 -0000      1.59
@@ -1037,41 +1037,7 @@
     file = m4_get_current_file (context);
     line = m4_get_current_line (context);
 
-    /* FIXME - other implementations, such as Solaris, parse macro
-       names, then quotes, then comments.  We should probably
-       rearrange this to match.  */
-    if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_BCOMM))
-      {                                        /* COMMENT, SHORT DELIM */
-       obstack_1grow (&token_stack, ch);
-       while ((ch = next_char (context, true)) != CHAR_EOF
-              && !m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_ECOMM))
-         obstack_1grow (&token_stack, ch);
-       if (ch != CHAR_EOF)
-         obstack_1grow (&token_stack, ch);
-       else
-         m4_error_at_line (context, EXIT_FAILURE, 0, file, line,
-                           _("end of file in comment"));
-       type = (m4_get_discard_comments_opt (context)
-               ? M4_TOKEN_NONE : M4_TOKEN_STRING);
-      }
-    else if (!m4_is_syntax_single_comments (M4SYNTAX)
-            && MATCH (context, ch, context->syntax->bcomm.string, true))
-      {                                        /* COMMENT, LONGER DELIM */
-       obstack_grow (&token_stack, context->syntax->bcomm.string,
-                     context->syntax->bcomm.length);
-       while ((ch = next_char (context, true)) != CHAR_EOF
-              && !MATCH (context, ch, context->syntax->ecomm.string, true))
-         obstack_1grow (&token_stack, ch);
-       if (ch != CHAR_EOF)
-         obstack_grow (&token_stack, context->syntax->ecomm.string,
-                       context->syntax->ecomm.length);
-       else
-         m4_error_at_line (context, EXIT_FAILURE, 0, file, line,
-                           _("end of file in comment"));
-       type = (m4_get_discard_comments_opt (context)
-               ? M4_TOKEN_NONE : M4_TOKEN_STRING);
-      }
-    else if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_ESCAPE))
+    if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_ESCAPE))
       {                                        /* ESCAPED WORD */
        obstack_1grow (&token_stack, ch);
        if ((ch = next_char (context, true)) != CHAR_EOF)
@@ -1147,6 +1113,37 @@
          }
        type = M4_TOKEN_STRING;
       }
+    else if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_BCOMM))
+      {                                        /* COMMENT, SHORT DELIM */
+       obstack_1grow (&token_stack, ch);
+       while ((ch = next_char (context, true)) != CHAR_EOF
+              && !m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_ECOMM))
+         obstack_1grow (&token_stack, ch);
+       if (ch != CHAR_EOF)
+         obstack_1grow (&token_stack, ch);
+       else
+         m4_error_at_line (context, EXIT_FAILURE, 0, file, line,
+                           _("end of file in comment"));
+       type = (m4_get_discard_comments_opt (context)
+               ? M4_TOKEN_NONE : M4_TOKEN_STRING);
+      }
+    else if (!m4_is_syntax_single_comments (M4SYNTAX)
+            && MATCH (context, ch, context->syntax->bcomm.string, true))
+      {                                        /* COMMENT, LONGER DELIM */
+       obstack_grow (&token_stack, context->syntax->bcomm.string,
+                     context->syntax->bcomm.length);
+       while ((ch = next_char (context, true)) != CHAR_EOF
+              && !MATCH (context, ch, context->syntax->ecomm.string, true))
+         obstack_1grow (&token_stack, ch);
+       if (ch != CHAR_EOF)
+         obstack_grow (&token_stack, context->syntax->ecomm.string,
+                       context->syntax->ecomm.length);
+       else
+         m4_error_at_line (context, EXIT_FAILURE, 0, file, line,
+                           _("end of file in comment"));
+       type = (m4_get_discard_comments_opt (context)
+               ? M4_TOKEN_NONE : M4_TOKEN_STRING);
+      }
     else if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_ACTIVE))
       {                                        /* ACTIVE CHARACTER */
        obstack_1grow (&token_stack, ch);