lexer: New function lex_force_match_phrase().

[pspp] / src / language / dictionary / mrsets.c

diff --git a/src/language/dictionary/mrsets.c b/src/language/dictionary/mrsets.c
index ffd97b68002342f4513ba9881ead70dd5bc86ec8..9c91ba9861f5aebcb00b0689bbbf34fe8bc8a2e7 100644 (file)
--- a/src/language/dictionary/mrsets.c
+++ b/src/language/dictionary/mrsets.c
@@ -147,8 +147,7 @@ parse_group (struct lexer *lexer, struct dictionary *dict,
         }
       else if (type == MRSET_MD && lex_match_id (lexer, "LABELSOURCE"))
         {
-          if (!lex_force_match (lexer, T_EQUALS)
-              || !lex_force_match_id (lexer, "VARLABEL"))
+          if (!lex_force_match_phrase (lexer, "=VARLABEL"))
             goto error;
 
           labelsource_varlabel = true;
@@ -504,8 +503,7 @@ static bool
 parse_mrset_names (struct lexer *lexer, struct dictionary *dict,
                    struct stringi_set *mrset_names)
 {
-  if (!lex_force_match_id (lexer, "NAME")
-      || !lex_force_match (lexer, T_EQUALS))
+  if (!lex_force_match_phrase (lexer, "NAME="))
     return false;
 
   stringi_set_init (mrset_names);