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 c21c66a73cab91b9eed75dfd1713159317561857..e8155e9214d6c77639eb4b80ac6a2e35a02d7194 100644 (file)
--- a/src/language/control/define.c
+++ b/src/language/control/define.c
@@ -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);
     }