Reorganize code to ensure files are not too wide for prodos

Make.engine

@@ -0,0 +1,46 @@
+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
+
+abCMain.o: abCalc.h abCStack.h expr/abCExpr.h ops/abCOp.h abCError.h
+
+abCalc.o: abCalc.h expr/abCExpr.h abCMode.h expr/abCExpReal.h expr/abCExprInt.h \
+    abCStack.h ops/abCOp.h abCError.h
+abCStack.o: expr/abCExpr.h abCStack.h abCError.h
+abCMode.o: abCMode.h expr/abCExpr.h
+abCError.o: abCError.h
+
+expr/abCExpr.o: expr/abCExpr.h
+expr/abCExpReal.o: expr/abCExpr.h expr/abCExpReal.h
+expr/abCExprInt.o: expr/abCExpr.h abCMode.h expr/abCExprInt.h
+
+ops/abCOp.o: ops/abCOp.h abCError.h expr/abCExpr.h abCStack.h ops/abCOpAdd.h \
+    ops/abCOpSubtr.h ops/abCOpMult.h ops/abCOpDiv.h ops/abCOpPower.h \
+    ops/abCOpAnd.h ops/abCOpOr.h ops/abCOpXor.h ops/abCOpNot.h ops/abCOpBin.h \
+    ops/abCOpOct.h ops/abCOpDec.h ops/abCOpHex.h ops/abCOpStws.h ops/abCOpRcws.h \
+    ops/abCOpSl.h ops/abCOpRl.h ops/abCOpSr.h ops/abCOpRr.h ops/abCOpAsr.h
+ops/abCOpAdd.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpAdd.h
+ops/abCOpSubtr.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpSubtr.h
+ops/abCOpMult.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpMult.h
+ops/abCOpDiv.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpDiv.h
+ops/abCOpPower.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h abCStack.h ops/abCOpPower.h
+ops/abCOpAnd.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpAnd.h
+ops/abCOpOr.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpOr.h
+ops/abCOpXor.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpXor.h
+ops/abCOpNot.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpNot.h
+ops/abCOpBin.o: ops/abCOp.h abCMode.h ops/abCOpBin.h
+ops/abCOpOct.o: ops/abCOp.h abCMode.h ops/abCOpOct.h
+ops/abCOpDec.o: ops/abCOp.h abCMode.h ops/abCOpDec.h
+ops/abCOpHex.o: ops/abCOp.h abCMode.h ops/abCOpHex.h
+ops/abCOpStws.o: ops/abCOp.h abCMode.h abCStack.h expr/abCExpr.h abCError.h ops/abCOpStws.h
+ops/abCOpRcws.o: ops/abCOp.h abCMode.h abCStack.h expr/abCExpr.h expr/abCExpReal.h ops/abCOpRcws.h
+ops/abCOpSl.o: ops/abCOp.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpSl.h
+ops/abCOpRl.o: ops/abCOp.h abCMode.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpRl.h
+ops/abCOpSr.o: ops/abCOp.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpSr.h
+ops/abCOpRr.o: ops/abCOp.h abCMode.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpRr.h
+ops/abCOpAsr.o: ops/abCOp.h abCMode.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpAsr.h
+

Make.mac

@@ -0,0 +1,13 @@
+NAME=abCalc
+
+CFLAGS=-Iexpr -Iops -I.
+
+all: $(NAME)
+
+include Make.engine
+
+$(NAME): $(OBJS)
+	cc -o $(NAME) $(OBJS)
+
+clean:
+	rm -f $(NAME) $(OBJS)

Makefile

@@ -1,53 +1,15 @@
-OBJS=abCalc.o abCalcExpr.o abCalcExpReal.o abCalcExprInt.o abCalcStack.o \
-    abCalcMode.o abCalcMain.o abCalcOp.o abCalcError.o abCalcOpAdd.o \
-    abCalcOpSubtr.o abCalcOpMult.o abCalcOpDiv.o abCalcOpPower.o \
-    abCalcOpAnd.o abCalcOpOr.o abCalcOpXor.o abCalcOpNot.o \
-    abCalcOpBin.o abCalcOpOct.o abCalcOpDec.o abCalcOpHex.o abCalcOpStws.o \
-    abCalcOpRcws.o abCalcOpSl.o abCalcOpRl.o abCalcOpSr.o abCalcOpRr.o \
-    abCalcOpAsr.o
-
 NAME=abCalc
 
 all: $(NAME)
 
-abCalcExpr.o: abCalcExpr.h
+.INCLUDE: "Make.engine"
-abCalcExpReal.o: abCalcExpr.h abCalcExpReal.h
-abCalcExprInt.o: abCalcExpr.h abCalcMode.h abCalcExprInt.h
-abCalcStack.o: abCalcExpr.h abCalcStack.h abCalcError.h
-abCalcMode.o: abCalcMode.h abCalcExpr.h
-abCalcError.o: abCalcError.h
-abCalc.o: abCalc.h abCalcExpr.h abCalcMode.h abCalcExpReal.h abCalcExprInt.h \
-    abCalcStack.h abCalcOp.h abCalcError.h
-abCalcMain.o: abCalc.h abCalcStack.h abCalcExpr.h abCalcOp.h abCalcError.h
-abCalcOp.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcStack.h abCalcOpAdd.h \
-    abCalcOpSubtr.h abCalcOpMult.h abCalcOpDiv.h abCalcOpPower.h \
-    abCalcOpAnd.h abCalcOpOr.h abCalcOpXor.h abCalcOpNot.h abCalcOpBin.h \
-    abCalcOpOct.h abCalcOpDec.h abCalcOpHex.h abCalcOpStws.h abCalcOpRcws.h \
-    abCalcOpSl.h abCalcOpRl.h abCalcOpSr.h abCalcOpRr.h abCalcOpAsr.h
-abCalcOpAdd.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpAdd.h
-abCalcOpSubtr.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpSubtr.h
-abCalcOpMult.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpMult.h
-abCalcOpDiv.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpDiv.h
-abCalcOpPower.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcStack.h abCalcOpPower.h
-abCalcOpAnd.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpAnd.h
-abCalcOpOr.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpOr.h
-abCalcOpXor.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpXor.h
-abCalcOpNot.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpNot.h
-abCalcOpBin.o: abCalcOp.h abCalcMode.h abCalcOpBin.h
-abCalcOpOct.o: abCalcOp.h abCalcMode.h abCalcOpOct.h
-abCalcOpDec.o: abCalcOp.h abCalcMode.h abCalcOpDec.h
-abCalcOpHex.o: abCalcOp.h abCalcMode.h abCalcOpHex.h
-abCalcOpStws.o: abCalcOp.h abCalcMode.h abCalcStack.h abCalcExpr.h abCalcError.h abCalcOpStws.h
-abCalcOpRcws.o: abCalcOp.h abCalcMode.h abCalcStack.h abCalcExpr.h abCalcExpReal.h abCalcOpRcws.h
-abCalcOpSl.o: abCalcOp.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpSl.h
-abCalcOpRl.o: abCalcOp.h abCalcMode.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpRl.h
-abCalcOpSr.o: abCalcOp.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpSr.h
-abCalcOpRr.o: abCalcOp.h abCalcMode.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpRr.h
-abCalcOpAsr.o: abCalcOp.h abCalcMode.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpAsr.h
-
 
 $(NAME): $(OBJS)
-	cc -o $(NAME) $(OBJS)
+	occ -o $(NAME) $(OBJS)
 
 clean:
-	rm -f $(NAME) $(OBJS)
+	cp -p rm -f $(NAME) $(OBJS) $(NAME).r $(NAME).root
+
+%.o: %.c
+	chtyp -l CC $<
+	occ -c $<

abCError.c

@@ -1,5 +1,5 @@
 /* 
-    abCalcError.c
+    abCError.c
         By: Jeremy Rand
  */
 
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "abCalcError.h"
+#include "abCError.h"
 
 
 static char *gErrorStrings[abCalcErrorTypeMax];

abCError.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcError.h
+    abCError.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCERROR_H
+#ifndef ABCERROR_H
-#define ABCALCERROR_H
+#define ABCERROR_H
 
 
 typedef enum abCalcErrorType {

abCMain.c

@@ -1,5 +1,5 @@
 /* 
-    abCalcMain.c
+    abCMain.c
         By: Jeremy Rand
  */
 
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 
 #include "abCalc.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
 
 
 char gBuffer[AB_CALC_EXPR_STRING_MAX];

abCMode.c

@@ -1,10 +1,10 @@
 /* 
-    abCalcMode.c
+    abCMode.c
         By: Jeremy Rand
  */
 
 
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 

abCMode.h

@@ -1,14 +1,14 @@
 /* 
-    abCalcMode.h
+    abCMode.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCMODE_H
+#ifndef ABCMODE_H
-#define ABCALCMODE_H
+#define ABCMODE_H
 
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 
 typedef enum abCalcModeIntBase

abCStack.c

@@ -1,5 +1,5 @@
 /* 
-    abCalcStack.c
+    abCStack.c
         By: Jeremy Rand
  */
 
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "abCalcStack.h"
+#include "abCStack.h"
-#include "abCalcError.h"
+#include "abCError.h"
 
 
 #define AB_CALC_STACK_DEPTH 128

abCStack.h

@@ -1,14 +1,14 @@
 /* 
-    abCalcStack.h
+    abCStack.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCSTACK_H
+#ifndef ABCSTACK_H
-#define ABCALCSTACK_H
+#define ABCSTACK_H
 
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 void abCalcStackInit(void);
 

abCalc.c

@@ -4,13 +4,13 @@
  */
 
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcExpReal.h"
+#include "abCExpReal.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
 
 
 void abCalcInit(void)

expr/abCExpReal.c

@@ -1,5 +1,5 @@
 /* 
-    abCalcExpReal.c
+    abCExpReal.c
         By: Jeremy Rand
  */
 
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 
 static abCalcExpr *abCalcExprRealParse(abCalcExpr *expr, char *buffer);

expr/abCExpReal.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcExpReal.h
+    abCExpReal.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCEXPREAL_H
+#ifndef ABCEXPREAL_H
-#define ABCALCEXPREAL_H
+#define ABCEXPREAL_H
 
 
 struct abCalcExpr;

expr/abCExpr.c

@@ -1,12 +1,12 @@
 /* 
-    abCalcExpr.c
+    abCExpr.c
         By: Jeremy Rand
  */
 
 
 #include <stdlib.h>
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 
 static abCalcExprCallbacks *gCallbacks[abCalcExprTypeMax];

expr/abCExpr.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcExpr.h
+    abCExpr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCEXPR_H
+#ifndef ABCEXPR_H
-#define ABCALCEXPR_H
+#define ABCEXPR_H
 
 
 typedef enum abCalcExprType {

expr/abCExprInt.c

@@ -1,5 +1,5 @@
 /* 
-    abCalcExprInt.c
+    abCExprInt.c
         By: Jeremy Rand
  */
 
@@ -8,8 +8,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 static abCalcExpr *abCalcExprIntParse(abCalcExpr *expr, char *buffer);

expr/abCExprInt.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcExprInt.h
+    abCExprInt.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCEXPRINT_H
+#ifndef ABCEXPRINT_H
-#define ABCALCEXPRINT_H
+#define ABCEXPRINT_H
 
 
 struct abCalcExpr;

ops/abCOp.c

@@ -1,5 +1,5 @@
 /* 
-    abCalcOp.c
+    abCOp.c
         By: Jeremy Rand
  */
 
@@ -7,33 +7,33 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
-#include "abCalcOpAdd.h"
+#include "abCOpAdd.h"
-#include "abCalcOpSubtr.h"
+#include "abCOpSubtr.h"
-#include "abCalcOpMult.h"
+#include "abCOpMult.h"
-#include "abCalcOpDiv.h"
+#include "abCOpDiv.h"
-#include "abCalcOpPower.h"
+#include "abCOpPower.h"
 
-#include "abCalcOpAnd.h"
+#include "abCOpAnd.h"
-#include "abCalcOpOr.h"
+#include "abCOpOr.h"
-#include "abCalcOpXor.h"
+#include "abCOpXor.h"
-#include "abCalcOpNot.h"
+#include "abCOpNot.h"
-#include "abCalcOpSl.h"
+#include "abCOpSl.h"
-#include "abCalcOpRl.h"
+#include "abCOpRl.h"
-#include "abCalcOpSr.h"
+#include "abCOpSr.h"
-#include "abCalcOpRr.h"
+#include "abCOpRr.h"
-#include "abCalcOpAsr.h"
+#include "abCOpAsr.h"
 
-#include "abCalcOpBin.h"
+#include "abCOpBin.h"
-#include "abCalcOpOct.h"
+#include "abCOpOct.h"
-#include "abCalcOpDec.h"
+#include "abCOpDec.h"
-#include "abCalcOpHex.h"
+#include "abCOpHex.h"
-#include "abCalcOpStws.h"
+#include "abCOpStws.h"
-#include "abCalcOpRcws.h"
+#include "abCOpRcws.h"
 
 
 #define AB_CALC_MAX_OPS 128

ops/abCOp.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOp.h
+    abCOp.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOP_H
+#ifndef ABCOP_H
-#define ABCALCOP_H
+#define ABCOP_H
 
 
 #define AB_CALC_OP_ONE_ARG(opName)                       \

ops/abCOpAdd.c

@@ -1,19 +1,19 @@
 /* 
-    abCalcOpAdd.c
+    abCOpAdd.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpAdd.h"
+#include "abCOpAdd.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExpReal.h"
+#include "abCExpReal.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "+"

ops/abCOpAdd.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpAdd.h
+    abCOpAdd.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPADD_H
+#ifndef ABCOPADD_H
-#define ABCALCOPADD_H
+#define ABCOPADD_H
 
 
 void abCalcOpAddInit(void);

ops/abCOpAnd.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpAnd.c
+    abCOpAnd.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpAnd.h"
+#include "abCOpAnd.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "AND"

ops/abCOpAnd.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpAnd.h
+    abCOpAnd.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPAND_H
+#ifndef ABCOPAND_H
-#define ABCALCOPAND_H
+#define ABCOPAND_H
 
 
 void abCalcOpAndInit(void);

ops/abCOpAsr.c

@@ -1,19 +1,19 @@
 /* 
-    abCalcOpAsr.c
+    abCOpAsr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpAsr.h"
+#include "abCOpAsr.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "ASR"

ops/abCOpAsr.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpAsr.h
+    abCOpAsr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPASR_H
+#ifndef ABCOPASR_H
-#define ABCALCOPASR_H
+#define ABCOPASR_H
 
 
 void abCalcOpAsrInit(void);

ops/abCOpBin.c

@@ -1,15 +1,15 @@
 /* 
-    abCalcOpBin.c
+    abCOpBin.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpBin.h"
+#include "abCOpBin.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "BIN"

ops/abCOpBin.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpBin.h
+    abCOpBin.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPBIN_H
+#ifndef ABCOPBIN_H
-#define ABCALCOPBIN_H
+#define ABCOPBIN_H
 
 
 void abCalcOpBinInit(void);

ops/abCOpDec.c

@@ -1,15 +1,15 @@
 /* 
-    abCalcOpDec.c
+    abCOpDec.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpDec.h"
+#include "abCOpDec.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "DEC"

ops/abCOpDec.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpDec.h
+    abCOpDec.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPDEC_H
+#ifndef ABCOPDEC_H
-#define ABCALCOPDEC_H
+#define ABCOPDEC_H
 
 
 void abCalcOpDecInit(void);

ops/abCOpDiv.c

@@ -1,19 +1,19 @@
 /* 
-    abCalcOpDiv.c
+    abCOpDiv.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpDiv.h"
+#include "abCOpDiv.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExpReal.h"
+#include "abCExpReal.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "/"

ops/abCOpDiv.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpDiv.h
+    abCOpDiv.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPDIV_H
+#ifndef ABCOPDIV_H
-#define ABCALCOPDIV_H
+#define ABCOPDIV_H
 
 
 void abCalcOpDivInit(void);

ops/abCOpHex.c

@@ -1,15 +1,15 @@
 /* 
-    abCalcOpHex.c
+    abCOpHex.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpHex.h"
+#include "abCOpHex.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "HEX"

ops/abCOpHex.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpHex.h
+    abCOpHex.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPHEX_H
+#ifndef ABCOPHEX_H
-#define ABCALCOPHEX_H
+#define ABCOPHEX_H
 
 
 void abCalcOpHexInit(void);

ops/abCOpMult.c

@@ -1,19 +1,19 @@
 /* 
-    abCalcOpMult.c
+    abCOpMult.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpMult.h"
+#include "abCOpMult.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExpReal.h"
+#include "abCExpReal.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "*"

ops/abCOpMult.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpMult.h
+    abCOpMult.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPMULT_H
+#ifndef ABCOPMULT_H
-#define ABCALCOPMULT_H
+#define ABCOPMULT_H
 
 
 void abCalcOpMultInit(void);

ops/abCOpNot.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpNot.c
+    abCOpNot.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpNot.h"
+#include "abCOpNot.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "NOT"

ops/abCOpNot.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpNot.h
+    abCOpNot.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPNOT_H
+#ifndef ABCOPNOT_H
-#define ABCALCOPNOT_H
+#define ABCOPNOT_H
 
 
 void abCalcOpNotInit(void);

ops/abCOpOct.c

@@ -1,15 +1,15 @@
 /* 
-    abCalcOpOct.c
+    abCOpOct.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpOct.h"
+#include "abCOpOct.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "OCT"

ops/abCOpOct.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpOct.h
+    abCOpOct.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPOCT_H
+#ifndef ABCOPOCT_H
-#define ABCALCOPOCT_H
+#define ABCOPOCT_H
 
 
 void abCalcOpOctInit(void);

ops/abCOpOr.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpOr.c
+    abCOpOr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpOr.h"
+#include "abCOpOr.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "OR"

ops/abCOpOr.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpOr.h
+    abCOpOr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPOR_H
+#ifndef ABCOPOR_H
-#define ABCALCOPOR_H
+#define ABCOPOR_H
 
 
 void abCalcOpOrInit(void);

ops/abCOpPower.c

@@ -1,5 +1,5 @@
 /* 
-    abCalcOpPower.c
+    abCOpPower.c
         By: Jeremy Rand
  */
 
@@ -7,13 +7,13 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "abCalcOpPower.h"
+#include "abCOpPower.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExpReal.h"
+#include "abCExpReal.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "^"

ops/abCOpPower.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpPower.h
+    abCOpPower.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPPOWER_H
+#ifndef ABCOPPOWER_H
-#define ABCALCOPPOWER_H
+#define ABCOPPOWER_H
 
 
 void abCalcOpPowerInit(void);

ops/abCOpRcws.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpRcws.c
+    abCOpRcws.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpRcws.h"
+#include "abCOpRcws.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExpReal.h"
+#include "abCExpReal.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "RCWS"

ops/abCOpRcws.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpRcws.h
+    abCOpRcws.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPRCWS_H
+#ifndef ABCOPRCWS_H
-#define ABCALCOPRCWS_H
+#define ABCOPRCWS_H
 
 
 void abCalcOpRcwsInit(void);

ops/abCOpRl.c

@@ -1,19 +1,19 @@
 /* 
-    abCalcOpRl.c
+    abCOpRl.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpRl.h"
+#include "abCOpRl.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "RL"

ops/abCOpRl.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpRl.h
+    abCOpRl.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPRL_H
+#ifndef ABCOPRL_H
-#define ABCALCOPRL_H
+#define ABCOPRL_H
 
 
 void abCalcOpRlInit(void);

ops/abCOpRr.c

@@ -1,19 +1,19 @@
 /* 
-    abCalcOpRr.c
+    abCOpRr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpRr.h"
+#include "abCOpRr.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcMode.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCMode.h"
-#include "abCalcExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "RR"

ops/abCOpRr.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpRr.h
+    abCOpRr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPRR_H
+#ifndef ABCOPRR_H
-#define ABCALCOPRR_H
+#define ABCOPRR_H
 
 
 void abCalcOpRrInit(void);

ops/abCOpSl.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpSl.c
+    abCOpSl.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpSl.h"
+#include "abCOpSl.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "SL"

ops/abCOpSl.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpSl.h
+    abCOpSl.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSL_H
+#ifndef ABCOPSL_H
-#define ABCALCOPSL_H
+#define ABCOPSL_H
 
 
 void abCalcOpSlInit(void);

ops/abCOpSr.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpSr.c
+    abCOpSr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpSr.h"
+#include "abCOpSr.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "SR"

ops/abCOpSr.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpSr.h
+    abCOpSr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSR_H
+#ifndef ABCOPSR_H
-#define ABCALCOPSR_H
+#define ABCOPSR_H
 
 
 void abCalcOpSrInit(void);

ops/abCOpStws.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpStws.c
+    abCOpStws.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpStws.h"
+#include "abCOpStws.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "STWS"

ops/abCOpStws.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpStws.h
+    abCOpStws.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSTWS_H
+#ifndef ABCOPSTWS_H
-#define ABCALCOPSTWS_H
+#define ABCOPSTWS_H
 
 
 void abCalcOpStwsInit(void);

ops/abCOpSubtr.c

@@ -1,19 +1,19 @@
 /* 
-    abCalcOpSubtr.c
+    abCOpSubtr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpSubtr.h"
+#include "abCOpSubtr.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExpReal.h"
+#include "abCExpReal.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "-"

ops/abCOpSubtr.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpSubtr.h
+    abCOpSubtr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSUBTR_H
+#ifndef ABCOPSUBTR_H
-#define ABCALCOPSUBTR_H
+#define ABCOPSUBTR_H
 
 
 void abCalcOpSubtrInit(void);

ops/abCOpXor.c

@@ -1,18 +1,18 @@
 /* 
-    abCalcOpXor.c
+    abCOpXor.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpXor.h"
+#include "abCOpXor.h"
 
-#include "abCalcOp.h"
+#include "abCOp.h"
-#include "abCalcError.h"
+#include "abCError.h"
-#include "abCalcExpr.h"
+#include "abCExpr.h"
-#include "abCalcExprInt.h"
+#include "abCExprInt.h"
-#include "abCalcStack.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "XOR"

ops/abCOpXor.h

@@ -1,11 +1,11 @@
 /* 
-    abCalcOpXor.h
+    abCOpXor.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPXOR_H
+#ifndef ABCOPXOR_H
-#define ABCALCOPXOR_H
+#define ABCOPXOR_H
 
 
 void abCalcOpXorInit(void);