Reorganize code some more so it will build on the GS

2013-07-25 10:21:21 -05:00 · 2013-07-25 10:21:21 -05:00 · 7bee84757f
parent 5ba0e3bcc7
commit 7bee84757f
31 changed files with 173 additions and 137 deletions
--- a/Make.engine
+++ b/Make.engine
@ -1,10 +1,14 @@
-OBJS=abCalc.o expr/abCExpr.o expr/abCExpReal.o expr/abCExprInt.o abCStack.o \
-    abCMode.o abCMain.o ops/abCOp.o abCError.o ops/abCOpAdd.o \
-    ops/abCOpSubtr.o ops/abCOpMult.o ops/abCOpDiv.o ops/abCOpPower.o \
-    ops/abCOpAnd.o ops/abCOpOr.o ops/abCOpXor.o ops/abCOpNot.o \
-    ops/abCOpBin.o ops/abCOpOct.o ops/abCOpDec.o ops/abCOpHex.o ops/abCOpStws.o \
-    ops/abCOpRcws.o ops/abCOpSl.o ops/abCOpRl.o ops/abCOpSr.o ops/abCOpRr.o \
-    ops/abCOpAsr.o
+CALC_OBJS=abCalc.o abCStack.o abCMode.o abCError.o
+
+EXPR_OBJS=expr/abCExpr.o expr/abCExpReal.o expr/abCExprInt.o
+
+OPS_OBJS=ops/abCOp.o ops/abCOpAdd.o ops/abCOpSubtr.o ops/abCOpMult.o \
+    ops/abCOpDiv.o ops/abCOpPower.o ops/abCOpAnd.o ops/abCOpOr.o ops/abCOpXor.o \
+    ops/abCOpNot.o ops/abCOpBin.o ops/abCOpOct.o ops/abCOpDec.o ops/abCOpHex.o \
+    ops/abCOpStws.o ops/abCOpRcws.o ops/abCOpSl.o ops/abCOpRl.o ops/abCOpSr.o \
+    ops/abCOpRr.o ops/abCOpAsr.o
+
+OBJS=abCMain.o $(CALC_OBJS) $(EXPR_OBJS) $(OPS_OBJS)

 abCMain.o: abCalc.h abCStack.h expr/abCExpr.h ops/abCOp.h abCError.h

--- a/Make.mac
+++ b/Make.mac
@ -1,6 +1,6 @@
 NAME=abCalc

-CFLAGS=-Iexpr -Iops -I.
+CFLAGS=-I.

 all: $(NAME)

--- a/11
+++ b/11
@ -9,7 +9,14 @@ $(NAME): $(OBJS)

 clean:
 	cp -p rm -f $(NAME) $(OBJS) $(NAME).r $(NAME).root
+	cp -p rm -f *.root
+	cp -p rm -f expr/*.root
+	cp -p rm -f ops/*.root
+
+fixtype:
+	chtyp -l CC *.c *.h
+	chtyp -l CC expr/*.c expr/*.h
+	chtyp -l CC ops/*.c ops/*.h

 %.o: %.c
-	chtyp -l CC $<
-	occ -c $<
+	occ $(CFLAGS) -c $<
--- a/abCMain.c
+++ b/abCMain.c
@ -9,11 +9,13 @@
 #include <stdlib.h>

 #include "abCalc.h"
-#include "abCExpr.h"
 #include "abCStack.h"
-#include "abCOp.h"
 #include "abCError.h"

+#include "expr/abCExpr.h"
+
+#include "ops/abCOp.h"
+

 char gBuffer[AB_CALC_EXPR_STRING_MAX];
 abCalcExpr gExpr;
--- a/abCMode.h
+++ b/abCMode.h
@ -8,7 +8,7 @@
 #define ABCMODE_H


-#include "abCExpr.h"
+#include "expr/abCExpr.h"


 typedef enum abCalcModeIntBase
--- a/abCStack.h
+++ b/abCStack.h
@ -8,7 +8,8 @@
 #define ABCSTACK_H


-#include "abCExpr.h"
+#include "expr/abCExpr.h"
+

 void abCalcStackInit(void);

--- a/abCalc.c
+++ b/abCalc.c
@ -4,14 +4,16 @@
 */


-#include "abCExpr.h"
-#include "abCExprInt.h"
-#include "abCExpReal.h"
 #include "abCMode.h"
 #include "abCStack.h"
-#include "abCOp.h"
 #include "abCError.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+#include "expr/abCExpReal.h"
+
+#include "ops/abCOp.h"
+

 void abCalcInit(void)
 {
--- a/expr/abCExpReal.c
+++ b/expr/abCExpReal.c
@ -9,7 +9,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include "abCExpr.h"
+#include "expr/abCExpr.h"


 static abCalcExpr *abCalcExprRealParse(abCalcExpr *expr, char *buffer);
--- a/expr/abCExpr.c
+++ b/expr/abCExpr.c
@ -6,7 +6,7 @@

 #include <stdlib.h>

-#include "abCExpr.h"
+#include "expr/abCExpr.h"


 static abCalcExprCallbacks *gCallbacks[abCalcExprTypeMax];
--- a/expr/abCExprInt.c
+++ b/expr/abCExprInt.c
@ -8,9 +8,10 @@
 #include <string.h>
 #include <stdlib.h>

-#include "abCExpr.h"
 #include "abCMode.h"

+#include "expr/abCExpr.h"
+

 static abCalcExpr *abCalcExprIntParse(abCalcExpr *expr, char *buffer);
 static char *abCalcExprIntFormat(abCalcExpr *expr, char *buffer);
--- a/ops/abCOp.c
+++ b/ops/abCOp.c
@ -7,33 +7,35 @@
 #include <stdio.h>
 #include <string.h>

-#include "abCOp.h"
-#include "abCExpr.h"
 #include "abCError.h"
 #include "abCStack.h"

-#include "abCOpAdd.h"
-#include "abCOpSubtr.h"
-#include "abCOpMult.h"
-#include "abCOpDiv.h"
-#include "abCOpPower.h"
+#include "expr/abCExpr.h"

-#include "abCOpAnd.h"
-#include "abCOpOr.h"
-#include "abCOpXor.h"
-#include "abCOpNot.h"
-#include "abCOpSl.h"
-#include "abCOpRl.h"
-#include "abCOpSr.h"
-#include "abCOpRr.h"
-#include "abCOpAsr.h"
+#include "ops/abCOp.h"

-#include "abCOpBin.h"
-#include "abCOpOct.h"
-#include "abCOpDec.h"
-#include "abCOpHex.h"
-#include "abCOpStws.h"
-#include "abCOpRcws.h"
+#include "ops/abCOpAdd.h"
+#include "ops/abCOpSubtr.h"
+#include "ops/abCOpMult.h"
+#include "ops/abCOpDiv.h"
+#include "ops/abCOpPower.h"
+
+#include "ops/abCOpAnd.h"
+#include "ops/abCOpOr.h"
+#include "ops/abCOpXor.h"
+#include "ops/abCOpNot.h"
+#include "ops/abCOpSl.h"
+#include "ops/abCOpRl.h"
+#include "ops/abCOpSr.h"
+#include "ops/abCOpRr.h"
+#include "ops/abCOpAsr.h"
+
+#include "ops/abCOpBin.h"
+#include "ops/abCOpOct.h"
+#include "ops/abCOpDec.h"
+#include "ops/abCOpHex.h"
+#include "ops/abCOpStws.h"
+#include "ops/abCOpRcws.h"


 #define AB_CALC_MAX_OPS 128
--- a/ops/abCOpAdd.c
+++ b/ops/abCOpAdd.c
@ -6,15 +6,17 @@

 #include <stdio.h>

-#include "abCOpAdd.h"

-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExpReal.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExpReal.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpAdd.h"
+

 #define OP_NAME "+"

--- a/ops/abCOpAnd.c
+++ b/ops/abCOpAnd.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpAnd.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpAnd.h"
+

 #define OP_NAME "AND"

--- a/ops/abCOpAsr.c
+++ b/ops/abCOpAsr.c
@ -6,15 +6,16 @@

 #include <stdio.h>

-#include "abCOpAsr.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCMode.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpAsr.h"
+

 #define OP_NAME "ASR"

--- a/ops/abCOpBin.c
+++ b/ops/abCOpBin.c
@ -6,11 +6,11 @@

 #include <stdio.h>

-#include "abCOpBin.h"
-
-#include "abCOp.h"
 #include "abCMode.h"

+#include "ops/abCOp.h"
+#include "ops/abCOpBin.h"
+

 #define OP_NAME "BIN"

--- a/ops/abCOpDec.c
+++ b/ops/abCOpDec.c
@ -6,11 +6,11 @@

 #include <stdio.h>

-#include "abCOpDec.h"
-
-#include "abCOp.h"
 #include "abCMode.h"

+#include "ops/abCOp.h"
+#include "ops/abCOpDec.h"
+

 #define OP_NAME "DEC"

--- a/ops/abCOpDiv.c
+++ b/ops/abCOpDiv.c
@ -6,15 +6,16 @@

 #include <stdio.h>

-#include "abCOpDiv.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExpReal.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExpReal.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpDiv.h"
+

 #define OP_NAME "/"

--- a/ops/abCOpHex.c
+++ b/ops/abCOpHex.c
@ -6,11 +6,11 @@

 #include <stdio.h>

-#include "abCOpHex.h"
-
-#include "abCOp.h"
 #include "abCMode.h"

+#include "ops/abCOp.h"
+#include "ops/abCOpHex.h"
+

 #define OP_NAME "HEX"

--- a/ops/abCOpMult.c
+++ b/ops/abCOpMult.c
@ -6,15 +6,16 @@

 #include <stdio.h>

-#include "abCOpMult.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExpReal.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExpReal.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpMult.h"
+

 #define OP_NAME "*"

--- a/ops/abCOpNot.c
+++ b/ops/abCOpNot.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpNot.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpNot.h"
+

 #define OP_NAME "NOT"

--- a/ops/abCOpOct.c
+++ b/ops/abCOpOct.c
@ -6,11 +6,11 @@

 #include <stdio.h>

-#include "abCOpOct.h"
-
-#include "abCOp.h"
 #include "abCMode.h"

+#include "ops/abCOp.h"
+#include "ops/abCOpOct.h"
+

 #define OP_NAME "OCT"

--- a/ops/abCOpOr.c
+++ b/ops/abCOpOr.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpOr.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpOr.h"
+

 #define OP_NAME "OR"

--- a/ops/abCOpPower.c
+++ b/ops/abCOpPower.c
@ -7,14 +7,15 @@
 #include <math.h>
 #include <stdio.h>

-#include "abCOpPower.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExpReal.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExpReal.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpPower.h"
+

 #define OP_NAME "^"

--- a/ops/abCOpRcws.c
+++ b/ops/abCOpRcws.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpRcws.h"
-
-#include "abCOp.h"
-#include "abCExpr.h"
-#include "abCExpReal.h"
 #include "abCStack.h"
 #include "abCMode.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExpReal.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpRcws.h"
+

 #define OP_NAME "RCWS"

--- a/ops/abCOpRl.c
+++ b/ops/abCOpRl.c
@ -6,15 +6,16 @@

 #include <stdio.h>

-#include "abCOpRl.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCMode.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpRl.h"
+

 #define OP_NAME "RL"

--- a/ops/abCOpRr.c
+++ b/ops/abCOpRr.c
@ -6,15 +6,16 @@

 #include <stdio.h>

-#include "abCOpRr.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCMode.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpRr.h"
+

 #define OP_NAME "RR"

--- a/ops/abCOpSl.c
+++ b/ops/abCOpSl.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpSl.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpSl.h"
+

 #define OP_NAME "SL"

--- a/ops/abCOpSr.c
+++ b/ops/abCOpSr.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpSr.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpSr.h"
+

 #define OP_NAME "SR"

--- a/ops/abCOpStws.c
+++ b/ops/abCOpStws.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpStws.h"
-
-#include "abCOp.h"
-#include "abCExpr.h"
 #include "abCError.h"
 #include "abCStack.h"
 #include "abCMode.h"

+#include "expr/abCExpr.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpStws.h"
+

 #define OP_NAME "STWS"

--- a/ops/abCOpSubtr.c
+++ b/ops/abCOpSubtr.c
@ -6,15 +6,16 @@

 #include <stdio.h>

-#include "abCOpSubtr.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExpReal.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExpReal.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpSubtr.h"
+

 #define OP_NAME "-"

--- a/ops/abCOpXor.c
+++ b/ops/abCOpXor.c
@ -6,14 +6,15 @@

 #include <stdio.h>

-#include "abCOpXor.h"
-
-#include "abCOp.h"
 #include "abCError.h"
-#include "abCExpr.h"
-#include "abCExprInt.h"
 #include "abCStack.h"

+#include "expr/abCExpr.h"
+#include "expr/abCExprInt.h"
+
+#include "ops/abCOp.h"
+#include "ops/abCOpXor.h"
+

 #define OP_NAME "XOR"