message: Make msg_emit() take full ownership of its argument.

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

diff --git a/src/language/control/define.c b/src/language/control/define.c
index e8155e9214d6c77639eb4b80ac6a2e35a02d7194..0c227233c4609da591363f0b216021edebc2c2af 100644 (file)
--- a/src/language/control/define.c
+++ b/src/language/control/define.c
@@ -81,7 +81,11 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
 
   /* Parse macro name. */
   struct macro *m = xmalloc (sizeof *m);
-  *m = (struct macro) { .name = ss_xstrdup (lex_tokss (lexer)) };
+  *m = (struct macro) {
+    .name = ss_xstrdup (lex_tokss (lexer)),
+    .file_name = xstrdup_if_nonnull (lex_get_file_name (lexer)),
+    .first_line = lex_get_first_line_number (lexer, 0),
+  };
   lex_get (lexer);
 
   if (!lex_force_match (lexer, T_LPAREN))
@@ -227,6 +231,7 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
       ds_put_byte (&body, '\n');
       lex_get (lexer);
     }
+  m->last_line = lex_get_last_line_number (lexer, 0);
 
   macro_tokens_from_string (&m->body, body.ss, lex_get_syntax_mode (lexer));
   ds_destroy (&body);