Changes

diff --git a/src/Makefile b/src/Makefile
index dae27b77f1d0c7cb0255e3714c695eabf504af99..5694fe2f52e6dfb51bccb35fc4c981c5c8fefdc6 100644 (file)
--- 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 c92de333d41be63ed10d72aa4de861827f25f17f..ece4e8653fcd4acd7c958a9e8215355a883bf89b 100644 (file)
--- 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 623c190f47edb807ae45884e8757809540b84182..9beccb387a3dda11a59e1da8c27031b3983a19fb 100644 (file)
--- 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); \