improve macro error messages

[pspp] / src / language / control / define.c

diff --git a/src/language/control/define.c b/src/language/control/define.c
index 187eb9fcf840b1e7932d36c49cfc77f1bde1b1ae..e8155e9214d6c77639eb4b80ac6a2e35a02d7194 100644 (file)
--- a/src/language/control/define.c
+++ b/src/language/control/define.c
@@ -37,12 +37,12 @@ force_macro_id (struct lexer *lexer)
 }
 
 static bool
-match_macro_id (struct lexer *lexer, const char *id)
+match_macro_id (struct lexer *lexer, const char *keyword)
 {
-  if (id[0] != '!')
-    return lex_match_id (lexer, id);
+  if (keyword[0] != '!')
+    return lex_match_id (lexer, keyword);
   else if (lex_token (lexer) == T_MACRO_ID
-           && ss_equals_case (lex_tokss (lexer), ss_cstr (id)))
+           && lex_id_match_n (ss_cstr (keyword), lex_tokss (lexer), 4))
     {
       lex_get (lexer);
       return true;
@@ -59,7 +59,7 @@ parse_quoted_token (struct lexer *lexer, struct token *token)
 
   struct substring s = lex_tokss (lexer);
   struct string_lexer slex;
-  string_lexer_init (&slex, s.string, s.length, SEG_MODE_INTERACTIVE);
+  string_lexer_init (&slex, s.string, s.length, SEG_MODE_INTERACTIVE, true);
   struct token another_token = { .type = T_STOP };
   if (!string_lexer_next (&slex, token)
       || string_lexer_next (&slex, &another_token))
@@ -113,9 +113,23 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
         }
       else
         {
+          if (lex_token (lexer) == T_MACRO_ID)
+            {
+              lex_error (lexer, _("Keyword macro parameter must be named in "
+                                  "definition without \"!\" prefix."));
+              goto error;
+            }
           if (!lex_force_id (lexer))
             goto error;
 
+          if (is_macro_keyword (lex_tokss (lexer)))
+            {
+              lex_error (lexer, _("Cannot use macro keyword \"%s\" "
+                                  "as an argument name."),
+                         lex_tokcstr (lexer));
+              goto error;
+            }
+
           p->positional = false;
           p->name = xasprintf ("!%s", lex_tokcstr (lexer));
           lex_get (lexer);
@@ -138,11 +152,14 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
                   lex_error_expecting (lexer, ")");
                   goto error;
                 }
+              char *syntax = lex_next_representation (lexer, 0, 0);
               const struct macro_token mt = {
                 .token = *lex_next (lexer, 0),
-                .representation = lex_next_representation (lexer, 0, 0),
+                .representation = ss_cstr (syntax),
               };
               macro_tokens_add (&p->def, &mt);
+              free (syntax);
+
               lex_get (lexer);
             }
         }
@@ -232,8 +249,9 @@ cmd_debug_expand (struct lexer *lexer, struct dataset *ds UNUSED)
     {
       if (!lex_next_is_from_macro (lexer, 0) && lex_token (lexer) != T_ENDCMD)
         {
-          struct substring rep = lex_next_representation (lexer, 0, 0);
-          msg (MN, "unexpanded token \"%.*s\"", (int) rep.length, rep.string);
+          char *rep = lex_next_representation (lexer, 0, 0);
+          msg (MN, "unexpanded token \"%s\"", rep);
+          free (rep);
         }
       lex_get (lexer);
     }