From 5e7006a3cc3fd46af671b09daa27c96c240934e3 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 24 Jul 2013 11:06:36 -0500 Subject: [PATCH] Create an overall abCalc module and hook up the init routines --- Makefile | 3 ++- abCalc.c | 25 ++++++++++++++++++++----- abCalc.h | 14 ++++++++++++++ abCalcMain.c | 9 +++++++++ 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 abCalc.h create mode 100644 abCalcMain.c diff --git a/Makefile b/Makefile index 78037c4..116538c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -OBJS=abCalc.o abCalcExpr.o abCalcExprReal.o abCalcExprInt.o abCalcStack.o abCalcMode.o +OBJS=abCalc.o abCalcExpr.o abCalcExprReal.o abCalcExprInt.o abCalcStack.o abCalcMode.o abCalcMain.o NAME=abCalc all: $(NAME) @@ -8,6 +8,7 @@ abCalcExprReal.o: abCalcExpr.h abCalcExprReal.h abCalcStack.o: abCalcExpr.h abCalcStack.h abCalcMode.o: abCalcMode.h abCalcExpr.h abCalcExprInt.o: abCalcExpr.h abCalcMode.h abCalcExprInt.h +abCalc.o: abCalcExpr.h abCalcMode.h abCalcExprReal.h abCalcExprInt.h abCalcStack.h $(NAME): $(OBJS) cc -o $(NAME) $(OBJS) diff --git a/abCalc.c b/abCalc.c index b5398b5..4569a33 100644 --- a/abCalc.c +++ b/abCalc.c @@ -1,9 +1,24 @@ -#include -#include +/* + abCalc.c + By: Jeremy Rand + */ -int main(void) +#include "abCalcExpr.h" +#include "abCalcExprInt.h" +#include "abCalcExprReal.h" +#include "abCalcMode.h" +#include "abCalcStack.h" + + +void abCalcInit(void) { - printf("Hello, world!\n"); - exit(0); + abCalcExprInit(); + abCalcExprRealInit(); + abCalcExprIntInit(); + + abCalcModeInit(); + abCalcStackInit(); } + + diff --git a/abCalc.h b/abCalc.h new file mode 100644 index 0000000..11f7f3c --- /dev/null +++ b/abCalc.h @@ -0,0 +1,14 @@ +/* + abCalc.h + By: Jeremy Rand + */ + + +#ifndef ABCALC_H +#define ABCALC_H + + +void abCalcInit(void); + + +#endif diff --git a/abCalcMain.c b/abCalcMain.c new file mode 100644 index 0000000..b5398b5 --- /dev/null +++ b/abCalcMain.c @@ -0,0 +1,9 @@ +#include +#include + + +int main(void) +{ + printf("Hello, world!\n"); + exit(0); +}