X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Fdefine.c;h=e1d9622ff4067b882a92a8bc259c1bdf8dac2025;hb=56fc407a19b93a622be43a196fca0eabac148023;hp=4c12ac24935badc7cf8c9b2408a2065cb8996d46;hpb=bb7605897eddfc1a416aa5cb2b6a3de13ee624de;p=pspp

diff --git a/src/language/control/define.c b/src/language/control/define.c
index 4c12ac2493..e1d9622ff4 100644
--- a/src/language/control/define.c
+++ b/src/language/control/define.c
@@ -23,6 +23,7 @@
 #include "language/lexer/macro.h"
 #include "language/lexer/scan.h"
 #include "language/lexer/token.h"
+#include "libpspp/intern.h"
 #include "libpspp/message.h"
 
 #include "gl/xalloc.h"
@@ -108,14 +109,8 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
     }
 
   struct macro *m = xmalloc (sizeof *m);
-  *m = (struct macro) {
-    .name = xstrdup (name),
-    .location = xmalloc (sizeof *m->location),
-  };
-  *m->location = (struct msg_location) {
-    .file_name = xstrdup_if_nonnull (lex_get_file_name (lexer)),
-    .first_line = lex_get_first_line_number (lexer, 0),
-  };
+  *m = (struct macro) { .name = xstrdup (name) };
+  struct msg_point macro_start = lex_ofs_start_point (lexer, lex_ofs (lexer));
   lex_get (lexer);
 
   if (!lex_force_match (lexer, T_LPAREN))
@@ -281,7 +276,14 @@ cmd_define (struct lexer *lexer, struct dataset *ds UNUSED)
       ds_put_byte (&body, '\n');
       lex_get (lexer);
     }
-  m->location->last_line = lex_get_last_line_number (lexer, 0);
+
+  struct msg_point macro_end = lex_ofs_end_point (lexer, lex_ofs (lexer) - 1);
+  m->location = xmalloc (sizeof *m->location);
+  *m->location = (struct msg_location) {
+    .file_name = intern_new_if_nonnull (lex_get_file_name (lexer)),
+    .start = { .line = macro_start.line },
+    .end = { .line = macro_end.line },
+  };
 
   macro_tokens_from_string (&m->body, body.ss, lex_get_syntax_mode (lexer));
   ds_destroy (&body);