From 2fdb3e8b65ae7e1490997e5df9ad8cc0929e1589 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Thu, 15 Jun 2017 17:22:39 -0700 Subject: [PATCH] Reorg code --- src/{ => AST}/boolean.c | 0 src/{ => AST}/boolean.h | 0 src/{ => AST}/element.c | 0 src/{ => AST}/element.h | 0 src/{ => AST}/function.c | 0 src/{ => AST}/function.h | 0 src/{ => AST}/mutableset.c | 0 src/{ => AST}/mutableset.h | 0 src/{ => AST}/ops.h | 0 src/{ => AST}/order.c | 0 src/{ => AST}/order.h | 0 src/{ => AST}/predicate.c | 0 src/{ => AST}/predicate.h | 0 src/{ => AST}/set.c | 0 src/{ => AST}/set.h | 0 src/{ => AST}/table.c | 0 src/{ => AST}/table.h | 0 src/{ => Backend}/constraint.c | 0 src/{ => Backend}/constraint.h | 0 src/{ => Backend}/inc_solver.c | 0 src/{ => Backend}/inc_solver.h | 0 src/{ => Backend}/solver_interface.h | 0 src/{ => Collections}/hashset.h | 0 src/{ => Collections}/hashtable.h | 0 src/{ => Collections}/structs.c | 0 src/{ => Collections}/structs.h | 0 src/{ => Collections}/vector.h | 0 src/Makefile | 23 +++++++++-------------- 28 files changed, 9 insertions(+), 14 deletions(-) rename src/{ => AST}/boolean.c (100%) rename src/{ => AST}/boolean.h (100%) rename src/{ => AST}/element.c (100%) rename src/{ => AST}/element.h (100%) rename src/{ => AST}/function.c (100%) rename src/{ => AST}/function.h (100%) rename src/{ => AST}/mutableset.c (100%) rename src/{ => AST}/mutableset.h (100%) rename src/{ => AST}/ops.h (100%) rename src/{ => AST}/order.c (100%) rename src/{ => AST}/order.h (100%) rename src/{ => AST}/predicate.c (100%) rename src/{ => AST}/predicate.h (100%) rename src/{ => AST}/set.c (100%) rename src/{ => AST}/set.h (100%) rename src/{ => AST}/table.c (100%) rename src/{ => AST}/table.h (100%) rename src/{ => Backend}/constraint.c (100%) rename src/{ => Backend}/constraint.h (100%) rename src/{ => Backend}/inc_solver.c (100%) rename src/{ => Backend}/inc_solver.h (100%) rename src/{ => Backend}/solver_interface.h (100%) rename src/{ => Collections}/hashset.h (100%) rename src/{ => Collections}/hashtable.h (100%) rename src/{ => Collections}/structs.c (100%) rename src/{ => Collections}/structs.h (100%) rename src/{ => Collections}/vector.h (100%) diff --git a/src/boolean.c b/src/AST/boolean.c similarity index 100% rename from src/boolean.c rename to src/AST/boolean.c diff --git a/src/boolean.h b/src/AST/boolean.h similarity index 100% rename from src/boolean.h rename to src/AST/boolean.h diff --git a/src/element.c b/src/AST/element.c similarity index 100% rename from src/element.c rename to src/AST/element.c diff --git a/src/element.h b/src/AST/element.h similarity index 100% rename from src/element.h rename to src/AST/element.h diff --git a/src/function.c b/src/AST/function.c similarity index 100% rename from src/function.c rename to src/AST/function.c diff --git a/src/function.h b/src/AST/function.h similarity index 100% rename from src/function.h rename to src/AST/function.h diff --git a/src/mutableset.c b/src/AST/mutableset.c similarity index 100% rename from src/mutableset.c rename to src/AST/mutableset.c diff --git a/src/mutableset.h b/src/AST/mutableset.h similarity index 100% rename from src/mutableset.h rename to src/AST/mutableset.h diff --git a/src/ops.h b/src/AST/ops.h similarity index 100% rename from src/ops.h rename to src/AST/ops.h diff --git a/src/order.c b/src/AST/order.c similarity index 100% rename from src/order.c rename to src/AST/order.c diff --git a/src/order.h b/src/AST/order.h similarity index 100% rename from src/order.h rename to src/AST/order.h diff --git a/src/predicate.c b/src/AST/predicate.c similarity index 100% rename from src/predicate.c rename to src/AST/predicate.c diff --git a/src/predicate.h b/src/AST/predicate.h similarity index 100% rename from src/predicate.h rename to src/AST/predicate.h diff --git a/src/set.c b/src/AST/set.c similarity index 100% rename from src/set.c rename to src/AST/set.c diff --git a/src/set.h b/src/AST/set.h similarity index 100% rename from src/set.h rename to src/AST/set.h diff --git a/src/table.c b/src/AST/table.c similarity index 100% rename from src/table.c rename to src/AST/table.c diff --git a/src/table.h b/src/AST/table.h similarity index 100% rename from src/table.h rename to src/AST/table.h diff --git a/src/constraint.c b/src/Backend/constraint.c similarity index 100% rename from src/constraint.c rename to src/Backend/constraint.c diff --git a/src/constraint.h b/src/Backend/constraint.h similarity index 100% rename from src/constraint.h rename to src/Backend/constraint.h diff --git a/src/inc_solver.c b/src/Backend/inc_solver.c similarity index 100% rename from src/inc_solver.c rename to src/Backend/inc_solver.c diff --git a/src/inc_solver.h b/src/Backend/inc_solver.h similarity index 100% rename from src/inc_solver.h rename to src/Backend/inc_solver.h diff --git a/src/solver_interface.h b/src/Backend/solver_interface.h similarity index 100% rename from src/solver_interface.h rename to src/Backend/solver_interface.h diff --git a/src/hashset.h b/src/Collections/hashset.h similarity index 100% rename from src/hashset.h rename to src/Collections/hashset.h diff --git a/src/hashtable.h b/src/Collections/hashtable.h similarity index 100% rename from src/hashtable.h rename to src/Collections/hashtable.h diff --git a/src/structs.c b/src/Collections/structs.c similarity index 100% rename from src/structs.c rename to src/Collections/structs.c diff --git a/src/structs.h b/src/Collections/structs.h similarity index 100% rename from src/structs.h rename to src/Collections/structs.h diff --git a/src/vector.h b/src/Collections/vector.h similarity index 100% rename from src/vector.h rename to src/Collections/vector.h diff --git a/src/Makefile b/src/Makefile index a5408be..1358986 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,13 +4,11 @@ PHONY += directories MKDIR_P = mkdir -p OBJ_DIR = bin -C_SOURCES := set.c mutableset.c element.c function.c order.c table.c predicate.c boolean.c csolver.c structs.c constraint.c inc_solver.c - -TABBING_H := boolean.h classlist.h common.h config.h constraint.h csolver.h element.h function.h inc_solver.h mutableset.h mymemory.h ops.h order.h predicate.h set.h solver_interface.h structs.h table.h +C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o) -CPPFLAGS += -Iinclude -I. +CFLAGS += -IAST -ICollections -IBackend -I. LDFLAGS := -ldl -lrt -rdynamic SHARED := -shared @@ -28,8 +26,11 @@ directories: ${OBJ_DIR} ${OBJ_DIR}: ${MKDIR_P} ${OBJ_DIR} + ${MKDIR_P} ${OBJ_DIR}/AST + ${MKDIR_P} ${OBJ_DIR}/Collections + ${MKDIR_P} ${OBJ_DIR}/Backend -debug: CPPFLAGS += -DCONFIG_DEBUG +debug: CFLAGS += -DCONFIG_DEBUG debug: all PHONY += docs @@ -37,16 +38,10 @@ docs: *.c *.cc *.h doxygen $(LIB_SO): $(OBJECTS) - $(CXX) -g $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS) + $(CC) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS) ${OBJ_DIR}/%.o: %.c - $(CC) -fPIC -c $< -o $@ $(CPPFLAGS) -Wno-unused-variable - -${OBJ_DIR}/%.o: %.cc - $(CXX) -MMD -MF $@.d -o $@ -fPIC -c $< $(CPPFLAGS) - -%.pdf: %.dot - dot -Tpdf $< -o $@ + $(CC) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable -include $(OBJECTS:%=$OBJ_DIR/.%.d) @@ -65,7 +60,7 @@ tags: tabbing: uncrustify -c C.cfg --no-backup *.c - uncrustify -c C.cfg --no-backup $(TABBING_H) + uncrustify -c C.cfg --no-backup *.h */*.h .PHONY: $(PHONY) -- 2.34.1