X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=listing.c;h=e1fd73a7f42420de4ca0747750edf3d890a80c87;hp=2fcf315c48739d057dbd46ddad1d3cc1acdd9534;hb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4;hpb=26019087571ebcafae571c7d32f485ceb8af8c5d

diff --git a/listing.c b/listing.c
index 2fcf315..e1fd73a 100644
--- a/listing.c
+++ b/listing.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // LISTING.C - Listing Output
-// Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -14,11 +14,11 @@
 // nnnnn           =vvvvvvvv
 
 #include "listing.h"
-#include "version.h"
-#include "token.h"
+#include "error.h"
 #include "procln.h"
 #include "sect.h"
-#include "error.h"
+#include "token.h"
+#include "version.h"
 
 char * list_fname;					// Listing filename
 uint8_t subttl[TITLESIZ];			// Current subtitle
@@ -66,9 +66,9 @@ int eject(void)
 //
 // Return GEMDOS format date
 //
-VALUE dos_date(void)
+uint32_t dos_date(void)
 {
-	VALUE v;
+	uint32_t v;
 	struct tm * tm;
 	time_t tloc;
 
@@ -83,9 +83,9 @@ VALUE dos_date(void)
 //
 // Return GEMDOS format time
 //
-VALUE dos_time(void)
+uint32_t dos_time(void)
 {
-	VALUE v;
+	uint32_t v;
 	struct tm * tm;
 	time_t tloc;
 
@@ -100,7 +100,7 @@ VALUE dos_time(void)
 //
 // Generate a time string
 //
-void time_string(char * buf, VALUE time)
+void time_string(char * buf, uint32_t time)
 {
 	int hour;
 	char * ampm;
@@ -123,7 +123,7 @@ void time_string(char * buf, VALUE time)
 //
 // Generate a date string
 //
-void date_string(char * buf, VALUE date)
+void date_string(char * buf, uint32_t date)
 {
 	sprintf(buf, "%d-%s-%d",
 		(int)(date & 0x1F), month[(date >> 5) & 0xF], (int)((date >> 9) + 1980));
@@ -252,8 +252,6 @@ void ship_ln(const char * ln)
 //
 void InitListing(void)
 {
-	extern VALUE dos_date(), dos_time();
-
 	subflag = 0;
 	pageno = 0;
 	nlines = 0;
@@ -412,7 +410,7 @@ void lstout(char tag)
 //
 // Output a value to listing
 //
-int listvalue(VALUE v)
+int listvalue(uint32_t v)
 {
 	sprintf(buf, "=%08X", v);
 	strncpy(lnimage + DATA_COL - 1, buf, 9);
@@ -434,19 +432,19 @@ int d_subttl(void)
 	int ejectok;
 	ejectok = 1;
 
-	if (*tok == '-')
+	if (*tok.u32 == '-')
 	{
 		ejectok = 0;
-		++tok;
+		++tok.u32;
 	}
 
-	if (*tok != STRING)
+	if (*tok.u32 != STRING)
 		return error("missing string");
 
-//	strcpy(subttl, (char *)tok[1]);
-	strcpy(subttl, string[tok[1]]);
+//	strcpy(subttl, (char *)tok.u32[1]);
+	strcpy(subttl, string[tok.u32[1]]);
 
-	tok += 2;
+	tok.u32 += 2;
 
 	// Always eject on pages 2+
 	if (ejectok && (subflag || pageno > 1))
@@ -464,12 +462,12 @@ int d_subttl(void)
 //
 int d_title(void)
 {
-	if (*tok != STRING)
+	if (*tok.u32 != STRING)
 		return error("missing string");
 
-//	strcpy(title, (char*)tok[1]);
-	strcpy(title, string[tok[1]]);
-	tok += 2;
+//	strcpy(title, (char*)tok.u32[1]);
+	strcpy(title, string[tok.u32[1]]);
+	tok.u32 += 2;
 
 	if (pageno > 1)
 	{