X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=error.c;h=6db7ad0f29c29d3d7261fafcd9f15dad2888222d;hp=75e91490d3d44df485fed4cd180befc545055443;hb=bdbf34766f4d074a5933eb1326fe4ce03d249e10;hpb=eace4e1b294ccec54a5c476619f616f5da0bf8a9

diff --git a/error.c b/error.c
index 75e9149..6db7ad0 100644
--- a/error.c
+++ b/error.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // ERROR.C - Error Handling
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -91,7 +91,24 @@ int error(const char * text, ...)
 	if (listing > 0)
 		ship_ln(buf);
 
-	sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
+	if (cur_inobj)
+	{
+		switch (cur_inobj->in_type)
+		{
+		case SRC_IFILE:
+			sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
+			break;
+		case SRC_IMACRO:
+			sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.imacro->im_macro->lineList->lineno, buf);
+			break;
+		case SRC_IREPT:
+			sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.irept->lineno, buf);
+			break;
+		}
+	}
+	else
+		// No current file so cur_inobj is NULL
+		sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
 
 	if (err_flag)
 		unused = write(err_fd, buf1, (LONG)strlen(buf1));