From c98d3942dea73b768bf92a05ba200b665b82fb7b Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky@uci.edu>
Date: Wed, 14 Jun 2017 20:34:17 -0700
Subject: [PATCH] Changes

---
 src/Makefile | 5 +++--
 src/set.c    | 2 +-
 src/vector.h | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index dae27b7..5694fe2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ PHONY += directories
 MKDIR_P = mkdir -p
 OBJ_DIR = bin
 
-CPP_SOURCES := set.cc mutableset.cc element.cc function.cc order.cc table.cc predicate.cc boolean.cc csolver.cc structs.c
+C_SOURCES := set.c mutableset.c element.c function.c order.c table.c predicate.c boolean.c csolver.c structs.c
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 
@@ -31,7 +31,7 @@ debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
 PHONY += docs
-docs: *.cc *.h
+docs: *.c *.cc *.h
 	doxygen
 
 $(LIB_SO): $(OBJECTS)
@@ -63,6 +63,7 @@ tags:
 
 tabbing:
 	uncrustify -c C.cfg --no-backup *.cc
+	uncrustify -c C.cfg --no-backup *.c
 	uncrustify -c C.cfg --no-backup *.h
 
 .PHONY: $(PHONY)
diff --git a/src/set.c b/src/set.c
index c92de33..ece4e86 100644
--- a/src/set.c
+++ b/src/set.c
@@ -7,7 +7,7 @@ Set * allocSet(VarType t, uint64_t* elements, uint num) {
 	tmp->isRange=false;
 	tmp->low=0;
 	tmp->high=0;
-	tmp->members=allocVectorArrayInt(elements, num);
+	tmp->members=allocVectorArrayInt(num, elements);
 	return tmp;
 }
 
diff --git a/src/vector.h b/src/vector.h
index 623c190..9beccb3 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -11,7 +11,7 @@
 	typedef struct Vector ## name Vector ## name;													\
 	Vector ## name * allocVector ## name(uint capacity);									\
 	Vector ## name * allocDefVector ## name();														\
-	Vector ## name * allocVectorArray ## name(type * array, uint capacity); \
+	Vector ## name * allocVectorArray ## name(uint capacity, type * array); \
 	void pushVector ## name(Vector ## name *vector, type item);						\
 	type getVector ## name(Vector ## name *vector, uint index);						\
 	void setVector ## name(Vector ## name *vector, uint index, type item); \
-- 
2.34.1