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