Check token type before trying to match tokid. Fixes PR 12923.

diff --git a/src/ChangeLog b/src/ChangeLog
index 51aec5716b610f4ce142173618ad42d46383da83..a2ae0c917271fc394434be8209f93b10b989a6c2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,12 @@
+Mon May  2 22:28:17 2005  Ben Pfaff  <blp@gnu.org>
+
+       * get.c: (cmd_match_files) Check token type before trying to match
+       tokid.  Fixes PR 12923.
+
 Mon May  2 22:16:51 2005  Ben Pfaff  <blp@gnu.org>
 
-       * flip.c: [HAVE_SYS_TYPES_H] Include <sys/types.h>.
+       * flip.c: [HAVE_SYS_TYPES_H] Include <sys/types.h>.  Fixes PR
+       12789.
 
 Mon May  2 22:02:52 2005  Ben Pfaff  <blp@gnu.org>
 

diff --git a/src/get.c b/src/get.c
index 851059ca1139377c969a73c4ed236fbc8bf79b37..0073383b0df4c9509bdd7320d90778672c0a80d4 100644 (file)
--- a/src/get.c
+++ b/src/get.c
@@ -728,7 +728,8 @@ cmd_match_files (void)
   dict_set_case_limit (mtf.dict, dict_get_case_limit (default_dict));
 
   lex_match ('/');
-  while (lex_id_match ("FILE", tokid) || lex_id_match ("TABLE", tokid)) 
+  while (token == T_ID
+         && (lex_id_match ("FILE", tokid) || lex_id_match ("TABLE", tokid)))
     {
       struct mtf_file *file = xmalloc (sizeof *file);
 
@@ -741,6 +742,7 @@ cmd_match_files (void)
         }
       else
         assert (0);
+      lex_match ('=');
 
       file->by = NULL;
       file->handle = NULL;
@@ -774,9 +776,7 @@ cmd_match_files (void)
             mtf.head = file;
           first_table->prev = file;
         }
-         
-      lex_match ('=');
-         
+
       if (lex_match ('*'))
         {
           file->handle = NULL;