From 28a171496eb10f207d442b657f8a185d9b7e54d9 Mon Sep 17 00:00:00 2001
From: expan <expan@student.cs.uwaterloo.ca>
Date: Thu, 28 Mar 2019 22:13:09 -0400
Subject: [PATCH] combine makefiles
---
Makefile | 22 +++++++++++++++++-----
MakefileOLD | 18 ------------------
parser.c | 4 ++++
3 files changed, 21 insertions(+), 23 deletions(-)
delete mode 100644 MakefileOLD
diff --git a/Makefile b/Makefile
index 6a7083e..8b2a8b2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,22 @@
-all: Parser
+.PHONY: all clean
+#CFLAGS = `pkg-config --cflags glib-2.0`
+#LDLIBS = `pkg-config --libs glib-2.0`
+all: SQLPParser Parser
-Parser: parser.c util.o
- gcc -w parser.c util.o -o Parser
+SQLPParser: SQLPParser.c SQLPGrammar.y SQLPScanner.l util.o
+ bison --verbose -d SQLPGrammar.y
+ flex SQLPScanner.l
+ gcc -w SQLPParser.c util.o -o SQLPParser
+ rm -f lex.yy.c SQLPGrammar.tab.c SQLPGrammar.tab.h
util.o: util.c util.h
- gcc -c util.c
+ gcc -c util.c
+# gcc `pkg-config --cflags --libs glib-2.0` util.c
+ #gcc -c util.c
+
+Parser: parser.c util.o
+ gcc -w parser.c util.o -o Parser
clean:
- rm -f util.o Parser
+ rm -f lex.yy.c *.tab.c *.tab.h *.fasl Parser util.o
+
diff --git a/MakefileOLD b/MakefileOLD
deleted file mode 100644
index b5708ad..0000000
--- a/MakefileOLD
+++ /dev/null
@@ -1,18 +0,0 @@
-.PHONY: all clean
-#CFLAGS = `pkg-config --cflags glib-2.0`
-#LDLIBS = `pkg-config --libs glib-2.0`
-all: SQLPParser
-
-SQLPParser: SQLPParser.c SQLPGrammar.y SQLPScanner.l util.o
- bison --verbose -d SQLPGrammar.y
- flex SQLPScanner.l
- gcc -w SQLPParser.c util.o -o SQLPParser
- rm -f lex.yy.c SQLPGrammar.tab.c SQLPGrammar.tab.h
-
-util.o: util.c util.h
- gcc -c util.c
-# gcc `pkg-config --cflags --libs glib-2.0` util.c
- #gcc -c util.c
-clean:
- rm -f lex.yy.c *.tab.c *.tab.h *.fasl util.o
-
diff --git a/parser.c b/parser.c
index 59f3652..4fb0b00 100644
--- a/parser.c
+++ b/parser.c
@@ -19,8 +19,12 @@ cons_cell* parse(char* input) {
char s[256];
strcpy(s, "one two three");
char* token = strtok(s, " ");
+ cons_cell* cur_cell = car_cons;
while (token) {
printf("token: %s\n", token);
+ cons_cell* cdr_cons = parse(token);
+ cur_cell->cdr = cdr_cons;
+ cur_cell = cdr_cons;
token = strtok(NULL, " ");
}
}
--
GitLab