CVSROOT: /sources/m4 Module name: m4 Changes by: Eric Blake <ericb> 07/01/23 14:28:23
Index: m4/input.c =================================================================== RCS file: /sources/m4/m4/m4/input.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -b -r1.59 -r1.60 --- m4/input.c 23 Dec 2006 00:02:20 -0000 1.59 +++ m4/input.c 23 Jan 2007 14:28:22 -0000 1.60 @@ -1,5 +1,5 @@ /* GNU m4 -- A simple macro processor - Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006 Free Software + Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -1170,11 +1170,13 @@ obstack_1grow (&token_stack, ch); if (m4_has_syntax (M4SYNTAX, ch, - M4_SYNTAX_OTHER | M4_SYNTAX_NUM | M4_SYNTAX_DOLLAR)) + (M4_SYNTAX_OTHER | M4_SYNTAX_NUM | M4_SYNTAX_DOLLAR + | M4_SYNTAX_LBRACE | M4_SYNTAX_RBRACE))) { consume_syntax (context, &token_stack, (M4_SYNTAX_OTHER | M4_SYNTAX_NUM - | M4_SYNTAX_DOLLAR)); + | M4_SYNTAX_DOLLAR | M4_SYNTAX_LBRACE + | M4_SYNTAX_RBRACE)); type = M4_TOKEN_STRING; } else if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_SPACE)) @@ -1192,7 +1194,8 @@ obstack_1grow (&token_stack, ch); if (m4_has_syntax (M4SYNTAX, ch, - M4_SYNTAX_OTHER | M4_SYNTAX_NUM | M4_SYNTAX_DOLLAR)) + (M4_SYNTAX_OTHER | M4_SYNTAX_NUM | M4_SYNTAX_DOLLAR + | M4_SYNTAX_LBRACE | M4_SYNTAX_RBRACE))) type = M4_TOKEN_STRING; else if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_SPACE)) type = M4_TOKEN_SPACE;