Remove the lazy common.h for better partial compilation

src/das.c

@@ -10,7 +10,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
+#include "das.h"
+#include "dasdefs.h"
+#include "output.h"
+#include "statement.h"
+#include "symbol.h"
 
 int yyparse(void);
 extern FILE *yyin;

src/das.h

@@ -8,8 +8,6 @@
 #define VERSION "0.13"
 #define VERSTRING "BlueDAS DCPU-16 Assembler, version " VERSION
 
-extern int das_error;
-
 extern struct options {
 	int asm_print_pc;
 	int asm_main_col;
@@ -21,14 +19,4 @@ extern struct options {
 	int big_endian;
 } options;
 
-/* fixme: better errors and warnings, with line numbers and such */
-#define error(fmt, args...) do { \
-	fprintf(stderr, "error: " fmt "\n", ##args); \
-	das_error = 1; \
-} while (0)
-
-#define warn(fmt, args...) do { \
-	fprintf(stderr, "warning: " fmt "\n", ##args); \
-} while (0)
-
 #endif // DAS_H

src/das.l

@@ -6,7 +6,7 @@
 void yyerror(char *);
 #include "y.tab.h"
 #include "dasdefs.h"
-#include "das.h"
+#include "output.h"
 static int get_constant(void);
 %}
 

src/das.y

@@ -5,7 +5,12 @@
  */
 #include <stdio.h>
 
-#include "common.h"
+#include "expression.h"
+#include "dasdefs.h"
+#include "dat.h"
+#include "instruction.h"
+#include "output.h"
+#include "symbol.h"
 
 int yylex();
 

src/dasdefs.c

@@ -8,7 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
+#include "dasdefs.h"
+#include "output.h"
 
 /*
  * macro magic. use GCC designated initialisers to build a sparse array

src/dat.c

@@ -1,4 +1,12 @@
-#include "common.h"
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "das.h"
+#include "dasdefs.h"
+#include "expression.h"
+#include "output.h"
+#include "statement.h"
 
 enum dat_types {
 	DATTYPE_STRING,

src/expression.c

@@ -5,7 +5,12 @@
  * Released under the GPL v2
  *
  */
-#include "common.h"
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "symbol.h"
+#include "output.h"
 #include "y.tab.h"
 
 enum expr_type {

src/instruction.c

@@ -8,7 +8,15 @@
   #undef DEBUG
 #endif
 
-#include "common.h"
+#include <assert.h>
+#include <error.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "dasdefs.h"
+#include "instruction.h"
+#include "output.h"
+#include "statement.h"
 
 struct operand {
 	enum opstyle style;

src/output.h

@@ -1,6 +1,10 @@
 #ifndef OUTPUT_H
 #define OUTPUT_H
 
+#include <stdio.h>
+
+extern int das_error;
+
 /* wrap fprintf as print() so extra things may be added if wanted */
 #define print(to, fmt, args...) fprintf(to, fmt, ##args)
 
@@ -10,6 +14,16 @@
 		printf(fmt, ##args); \
 } while (0)
 
+/* fixme: better errors and warnings, with line numbers and such */
+#define error(fmt, args...) do { \
+	fprintf(stderr, "error: " fmt "\n", ##args); \
+	das_error = 1; \
+} while (0)
+
+#define warn(fmt, args...) do { \
+	fprintf(stderr, "warning: " fmt "\n", ##args); \
+} while (0)
+
 /* report internal bugs */
 #define BUG_ON(x) ({ int r = !!(x); \
 	if (r) { \

src/statement.c

@@ -4,7 +4,14 @@
  * Copyright 2012 Jon Povey <jon@leetfighter.com>
  * Released under the GPL v2
  */
-#include "common.h"
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "das.h"
+#include "list.h"
+#include "output.h"
+#include "statement.h"
 
 #define MAX_BINARY_WORDS (1 << 16)			/* 16-bit (word) address space */
 #define MAX_BINARY_BYTES (MAX_BINARY_WORDS * 2)

src/statement.h

@@ -8,6 +8,8 @@
  */
 #include <stdio.h>
 
+#include "dasdefs.h"
+
 enum stmt_type {
 	STMT_NONE,
 	STMT_INSTRUCTION,

src/symbol.c

@@ -4,7 +4,15 @@
  * Copyright 2012 Jon Povey <jon@leetfighter.com>
  * Released under the GPL v2
  */
-#include "common.h"
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "das.h"
+#include "expression.h"
+#include "list.h"
+#include "output.h"
+#include "statement.h"
 
 enum sym_flags {
 	SYM_LABEL = 0x1,	/* definition label found */

src/symbol.h

@@ -11,7 +11,6 @@ struct symbol;
 
 #include "expression.h"
 #include "instruction.h"
-#include "list.h"
 
 /* Parse */
 struct symbol* symbol_parse(char *name);