X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=macro.c;h=2af59975c5a7d39e8459164c1b2a85118f3c90d5;hp=5aaa842a52d78d75c4808d676b384a54d5e1d914;hb=60f204cb9e3905100da0d89f14bb40db764acd9e;hpb=d0c28c349ddfb8393568037f68bddbe8979ce0df

diff --git a/macro.c b/macro.c
index 5aaa842..2af5997 100644
--- a/macro.c
+++ b/macro.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // MACRO.C - Macro Definition and Invocation
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -17,20 +17,18 @@
 #include "token.h"
 
 
-LONG curuniq;								// Current macro's unique number
-//TOKEN ** argp;								// Free spot in argptrs[]
-int macnum;									// Unique number for macro definition
-TOKEN * argPtrs[128];						// 128 arguments ought to be enough for anyone
+LONG curuniq;				// Current macro's unique number
+int macnum;					// Unique number for macro definition
+TOKEN * argPtrs[128];		// 128 arguments ought to be enough for anyone
 static int argp;
 
-static LONG macuniq;						// Unique-per-macro number
-static SYM * curmac;						// Macro currently being defined
-//static char ** curmln;						// Previous macro line (or NULL)
-static VALUE argno;							// Formal argument count 
+static LONG macuniq;		// Unique-per-macro number
+static SYM * curmac;		// Macro currently being defined
+static VALUE argno;			// Formal argument count
 
-static LONG * firstrpt;						// First .rept line 
-static LONG * nextrpt;						// Last .rept line 
-static int rptlevel;						// .rept nesting level 
+static LONG * firstrpt;		// First .rept line
+static LONG * nextrpt;		// Last .rept line
+static int rptlevel;		// .rept nesting level
 
 
 //
@@ -40,7 +38,6 @@ void InitMacro(void)
 {
 	macuniq = 0;
 	macnum = 1;
-//	argp = NULL;
 	argp = 0;
 }
 
@@ -53,7 +50,8 @@ void InitMacro(void)
 //
 int ExitMacro(void)
 {
-#warning !!! Bad macro exiting !!!
+WARNING(!!! Bad macro exiting !!!)
+
 /*
 This is a problem. Currently, the argument logic just keeps the current
 arguments and doesn't save anything if a new macro is called in the middle
@@ -80,8 +78,7 @@ of another (nested macros). Need to fix that somehow.
 	argp -= imacro->im_nargs;
 	DEBUG printf("%d (nargs = %d)\n", argp, imacro->im_nargs);
 
-	fpop();
-	return 0;
+	return fpop();
 }
 
 
@@ -110,8 +107,8 @@ int defmac2(char * argname)
 //
 int defmac1(char * ln, int notEndFlag)
 {
-	PTR p;
-	LONG len;
+//	PTR p;
+//	LONG len;
 
 	if (list_flag)
 	{
@@ -151,7 +148,7 @@ features of the language. Seems like we can do better here.
 			*curmln = p.cp;
 
 		curmln = (char **)p.cp;
-		return 1;							// Keep looking 
+		return 1;							// Keep looking
 #else
 		if (curmac->lineList == NULL)
 		{
@@ -240,15 +237,15 @@ int defr1(char * ln, int kwno)
 
 	switch (kwno)
 	{
-	case 0:										// .endr 
+	case 0:										// .endr
 		if (--rptlevel == 0)
 		return(0);
 		goto addln;
-	case 1:										// .rept 
+	case 1:										// .rept
 		rptlevel++;
 	default:
 //MORE stupidity here...
-#warning "!!! Casting (char *) as LONG !!!"
+WARNING(!!! Casting (char *) as LONG !!!)
 	addln:
 		// Allocate length of line + 1('\0') + LONG
 		len = strlen(ln) + 1 + sizeof(LONG);
@@ -257,7 +254,7 @@ int defr1(char * ln, int kwno)
 		*p = 0;
 
 		strcpy((char *)(p + 1), ln);
-		
+
 		if (nextrpt == NULL)
 		{
 			firstrpt = p;           // First line of rept statement
@@ -311,14 +308,14 @@ int defrept(void)
 // Hand off lines of text to the function `lnfunc' until a line containing one
 // of the directives in `dirlist' is encountered. Return the number of the
 // keyword encountered (0..n)
-// 
+//
 // `dirlist' contains null-seperated terminated keywords.  A final null
 // terminates the list. Directives are compared to the keywords without regard
 // to case.
-// 
+//
 // If `lnfunc' is NULL, then lines are simply skipped.
 // If `lnfunc' returns an error, processing is stopped.
-// 
+//
 // `lnfunc' is called with an argument of -1 for every line but the last one,
 // when it is called with an argument of the keyword number that caused the
 // match.
@@ -329,7 +326,7 @@ int lncatch(int (* lnfunc)(), char * dirlist)
 	int k;
 
 	if (lnfunc != NULL)
-		lnsave++;								// Tell tokenizer to keep lines 
+		lnsave++;								// Tell tokenizer to keep lines
 
 	for(;;)
 	{
@@ -360,7 +357,7 @@ int lncatch(int (* lnfunc)(), char * dirlist)
 
 		if (p != NULL)
 		{
-			if (*p == '.')						// ignore leading '.'s 
+			if (*p == '.')						// ignore leading '.'s
 				p++;
 
 			k = kwmatch(p, dirlist);
@@ -439,7 +436,7 @@ int InvokeMacro(SYM * mac, WORD siz)
 //	argp = 0;
 	DEBUG printf("InvokeMacro: argp: %d -> ", argp);
 
-	INOBJ * inobj = a_inobj(SRC_IMACRO);		// Alloc and init IMACRO 
+	INOBJ * inobj = a_inobj(SRC_IMACRO);		// Alloc and init IMACRO
 	IMACRO * imacro = inobj->inobj.imacro;
 	imacro->im_siz = siz;
 	WORD nargs = 0;
@@ -448,7 +445,6 @@ int InvokeMacro(SYM * mac, WORD siz)
 	TOKEN * dest;
 	int stringNum = 0;
 	int argumentNum = 0;
-	int i;
 
 	for(dry_run=1; ; dry_run--)
 	{
@@ -458,7 +454,7 @@ int InvokeMacro(SYM * mac, WORD siz)
 				nargs++;
 			else
 			{
-#if 0				
+#if 0
 				*argptr++ = p;
 #else
 				argPtrs[argp++] = p;
@@ -570,7 +566,7 @@ streams, we can alleviate this problem.]
 //			argp += nargs;
 #endif
 		}
-		else 
+		else
 			break;
 	}