another tiny bit of cleanup

git-svn-id: https://svn.code.sf.net/p/acme-crossass/code-0/trunk@350 4df02467-bbd4-4a76-a152-e7ce94205b78

src/Makefile

@@ -26,11 +26,11 @@ cliargs.o: cliargs.h cliargs.c
 
 cpu.o: config.h dynabuf.h global.h mnemo.h tree.h cpu.h cpu.c
 
-dynabuf.o: config.h acme.h global.h input.h dynabuf.h dynabuf.c
+dynabuf.o: config.h global.h input.h dynabuf.h dynabuf.c
 
 encoding.o: encoding.h encoding.c
 
-flow.o: config.h acme.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
+flow.o: config.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
 
 global.o: config.h platform.h acme.h cpu.h dynabuf.h encoding.h input.h macro.h pseudoopcodes.h section.h symbol.h global.h global.c
 
@@ -48,7 +48,7 @@ pseudoopcodes.o: alu.h flow.h global.h input.h macro.h output.h symbol.h pseudoo
 
 section.o: config.h dynabuf.h global.h symbol.h tree.h section.h section.c
 
-symbol.o: config.h acme.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
+symbol.o: config.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
 
 tree.o: config.h dynabuf.h global.h symbol.h tree.h tree.c
 

src/Makefile.dos

@@ -26,11 +26,11 @@ cliargs.o: cliargs.h cliargs.c
 
 cpu.o: config.h dynabuf.h global.h mnemo.h tree.h cpu.h cpu.c
 
-dynabuf.o: config.h acme.h global.h input.h dynabuf.h dynabuf.c
+dynabuf.o: config.h global.h input.h dynabuf.h dynabuf.c
 
 encoding.o: encoding.h encoding.c
 
-flow.o: config.h acme.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
+flow.o: config.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
 
 global.o: config.h platform.h acme.h cpu.h dynabuf.h encoding.h input.h macro.h pseudoopcodes.h section.h symbol.h global.h global.c
 
@@ -48,7 +48,7 @@ pseudoopcodes.o: alu.h flow.h global.h input.h macro.h output.h symbol.h pseudoo
 
 section.o: config.h dynabuf.h global.h symbol.h tree.h section.h section.c
 
-symbol.o: config.h acme.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
+symbol.o: config.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
 
 tree.o: config.h dynabuf.h global.h symbol.h tree.h tree.c
 

src/Makefile.mingw

@@ -29,11 +29,11 @@ cliargs.o: cliargs.h cliargs.c
 
 cpu.o: config.h dynabuf.h global.h mnemo.h tree.h cpu.h cpu.c
 
-dynabuf.o: config.h acme.h global.h input.h dynabuf.h dynabuf.c
+dynabuf.o: config.h global.h input.h dynabuf.h dynabuf.c
 
 encoding.o: encoding.h encoding.c
 
-flow.o: config.h acme.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
+flow.o: config.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
 
 global.o: config.h platform.h acme.h cpu.h dynabuf.h encoding.h input.h macro.h pseudoopcodes.h section.h symbol.h global.h global.c
 
@@ -51,7 +51,7 @@ pseudoopcodes.o: alu.h flow.h global.h input.h macro.h output.h symbol.h pseudoo
 
 section.o: config.h dynabuf.h global.h symbol.h tree.h section.h section.c
 
-symbol.o: config.h acme.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
+symbol.o: config.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
 
 tree.o: config.h dynabuf.h global.h symbol.h tree.h tree.c
 

src/Makefile.riscos

@@ -25,11 +25,11 @@ cliargs.o: cliargs.h cliargs.c
 
 cpu.o: config.h dynabuf.h global.h mnemo.h tree.h cpu.h cpu.c
 
-dynabuf.o: config.h acme.h global.h input.h dynabuf.h dynabuf.c
+dynabuf.o: config.h global.h input.h dynabuf.h dynabuf.c
 
 encoding.o: encoding.h encoding.c
 
-flow.o: config.h acme.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
+flow.o: config.h alu.h dynabuf.h global.h input.h mnemo.h symbol.h tree.h flow.h flow.c
 
 global.o: config.h platform.h acme.h cpu.h dynabuf.h encoding.h input.h macro.h pseudoopcodes.h section.h symbol.h global.h global.c
 
@@ -47,7 +47,7 @@ pseudoopcodes.o: alu.h flow.h global.h input.h macro.h output.h symbol.h pseudoo
 
 section.o: config.h dynabuf.h global.h symbol.h tree.h section.h section.c
 
-symbol.o: config.h acme.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
+symbol.o: config.h alu.h cpu.h dynabuf.h global.h input.h section.h tree.h symbol.h symbol.c
 
 tree.o: config.h dynabuf.h global.h symbol.h tree.h tree.c
 

src/_riscos.c

@@ -9,7 +9,6 @@
 
 #include <stdlib.h>
 #include <kernel.h>
-#include "acme.h"
 #include "input.h"
 
 

src/acme.c

@@ -336,14 +336,16 @@ static void perform_pass(void)
 	// TODO: atm "--from-to" reads two numbers. if that is changed in the
 	// future to two general expressions, this is the point where they would
 	// need to be evaluated.
+	if (config.process_verbosity > 8)
+		printf("Found %d undefined expressions.\n", pass.undefined_count);
 	if (pass.error_count)
 		exit(ACME_finalize(EXIT_FAILURE));
 }
 
 
 static struct report	global_report;
-// do passes until done (or errors occurred). Return whether output is ready.
+// do passes until done (or errors occurred).
-static boolean do_actual_work(void)
+static void do_actual_work(void)
 {
 	int	undefs_before;	// number of undefined results in previous pass
 
@@ -375,16 +377,19 @@ static boolean do_actual_work(void)
 				perform_pass();
 				report_close(report);
 			}
+			// FIXME - add some code here to do "if there were errors, call BUG()"
 		}
-		return TRUE;
+		save_output_file();
-	}
+	} else {
 		// There are still errors (unsolvable by doing further passes),
 		// so perform additional pass to find and show them.
 		if (config.process_verbosity > 1)
 			puts("Extra pass to display errors.");
 		pass.complain_about_undefined = TRUE;	// activate error output
 		perform_pass();	// perform pass, but now show "value undefined"
-	return FALSE;
+		// FIXME - perform_pass() calls exit() when there were errors,
+		// so if controls returns here, call BUG()!
+	}
 }
 
 
@@ -744,7 +749,6 @@ int main(int argc, const char *argv[])
 	// init output buffer
 	output_createbuffer();
 	// do the actual work
-	if (do_actual_work())
+	do_actual_work();
-		save_output_file();
 	return ACME_finalize(EXIT_SUCCESS);	// dump labels, if wanted
 }

src/dynabuf.c

@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "acme.h"
 #include "global.h"
 #include "input.h"
 

src/flow.c

@@ -13,7 +13,6 @@
 // 24 Nov 2007	Added "!ifndef"
 #include "flow.h"
 #include <string.h>
-#include "acme.h"
 #include "alu.h"
 #include "config.h"
 #include "dynabuf.h"

src/symbol.c

@@ -9,7 +9,6 @@
 // 23 Nov 2014	Added label output in VICE format
 #include "symbol.h"
 #include <stdio.h>
-#include "acme.h"
 #include "alu.h"
 #include "dynabuf.h"
 #include "global.h"

src/version.h

@@ -9,7 +9,7 @@
 
 #define RELEASE		"0.97"		// update before release	FIXME
 #define CODENAME	"Zem"		// update before release
-#define CHANGE_DATE	"22 Feb"	// update before release	FIXME
+#define CHANGE_DATE	"23 Feb"	// update before release	FIXME
 #define CHANGE_YEAR	"2024"		// update before release
 //#define HOME_PAGE	"http://home.pages.de/~mac_bacon/smorbrod/acme/"
 #define HOME_PAGE	"http://sourceforge.net/p/acme-crossass/"	// FIXME