Changes to m4/m4/m4module.h,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      07/01/23 14:28:23

Index: m4/m4module.h
===================================================================
RCS file: /sources/m4/m4/m4/m4module.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- m4/m4module.h       13 Jan 2007 13:55:37 -0000      1.104
+++ m4/m4module.h       23 Jan 2007 14:28:22 -0000      1.105
@@ -355,30 +355,32 @@
 extern bool             m4_is_syntax_single_comments   (m4_syntax_table *);
 extern bool             m4_is_syntax_macro_escaped     (m4_syntax_table *);
 
-/* These are values to be assigned to syntax table entries, although they
-   are bit masks for fast categorisation in m4__next_token(), only one
-   value per syntax table entry is allowed.  */
+/* These are values to be assigned to syntax table entries.  Although
+   they are bit masks for fast categorization in m4__next_token(),
+   only one value per syntax table entry is allowed.  The enumeration
+   is currently sorted in order of parsing precedence.  */
 enum {
-  M4_SYNTAX_OTHER              = (1 << 0),
-  M4_SYNTAX_IGNORE             = (1 << 1),
-  M4_SYNTAX_SPACE              = (1 << 2),
-  M4_SYNTAX_OPEN               = (1 << 3),
-  M4_SYNTAX_CLOSE              = (1 << 4),
-  M4_SYNTAX_COMMA              = (1 << 5),
-  M4_SYNTAX_DOLLAR             = (1 << 6),
-  M4_SYNTAX_ACTIVE             = (1 << 7),
-  M4_SYNTAX_ESCAPE             = (1 << 8),
-  M4_SYNTAX_ASSIGN             = (1 << 9),
-  M4_SYNTAX_ALPHA              = (1 << 10),
-  M4_SYNTAX_NUM                        = (1 << 11),
-  M4_SYNTAX_LQUOTE             = (1 << 12),
-  M4_SYNTAX_BCOMM              = (1 << 13),
+  M4_SYNTAX_IGNORE             = 0,
+  M4_SYNTAX_ESCAPE             = 1 << 0,
+  M4_SYNTAX_ALPHA              = 1 << 1,
+  M4_SYNTAX_LQUOTE             = 1 << 2,
+  M4_SYNTAX_BCOMM              = 1 << 3,
+  M4_SYNTAX_OTHER              = 1 << 4,
+  M4_SYNTAX_NUM                        = 1 << 5,
+  M4_SYNTAX_DOLLAR             = 1 << 6,
+  M4_SYNTAX_LBRACE             = 1 << 7,
+  M4_SYNTAX_RBRACE             = 1 << 8,
+  M4_SYNTAX_SPACE              = 1 << 9,
+  M4_SYNTAX_ACTIVE             = 1 << 10,
+  M4_SYNTAX_OPEN               = 1 << 11,
+  M4_SYNTAX_CLOSE              = 1 << 12,
+  M4_SYNTAX_COMMA              = 1 << 13,
 
   /* These values are bit masks to OR with categories above, a syntax entry
      may have any number of these in addition to a maximum of one of the
      values above.  */
-  M4_SYNTAX_RQUOTE             = (1 << 14),
-  M4_SYNTAX_ECOMM              = (1 << 15),
+  M4_SYNTAX_RQUOTE             = 1 << 14,
+  M4_SYNTAX_ECOMM              = 1 << 15
 };
 
 #define M4_SYNTAX_MASKS                (M4_SYNTAX_RQUOTE | M4_SYNTAX_ECOMM)