Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into...

[satune.git] / src / Encoders / functionencoding.c

diff --git a/src/Encoders/functionencoding.c b/src/Encoders/functionencoding.c
index 282912d2d09e6df861fbea1e5468921babcfd589..74cfb7685abc3d017b41d7e7d7edb6920525a55e 100644 (file)
--- a/src/Encoders/functionencoding.c
+++ b/src/Encoders/functionencoding.c
@@ -1,19 +1,18 @@
 #include "functionencoding.h"
 
-FunctionEncoding * allocFunctionEncoding(FunctionEncodingType type, Element *function) {
-       FunctionEncoding * This=(FunctionEncoding *)ourmalloc(sizeof(FunctionEncoding));
+void initFunctionEncoding(FunctionEncoding *This, Element *function) {
        This->op.function=function;
-       This->type=type;
-       return This;
+       This->type=FUNC_UNASSIGNED;
 }
 
-FunctionEncoding * allocPredicateEncoding(FunctionEncodingType type, Boolean *predicate) {
-       FunctionEncoding * This=(FunctionEncoding *)ourmalloc(sizeof(FunctionEncoding));
+void initPredicateEncoding(FunctionEncoding *This,  Boolean *predicate) {
        This->op.predicate=predicate;
-       This->type=type;
-       return This;
+       This->type=FUNC_UNASSIGNED;
 }
 
 void deleteFunctionEncoding(FunctionEncoding *This) {
-       ourfree(This);
+}
+
+void setFunctionEncodingType(FunctionEncoding* encoding, FunctionEncodingType type){
+       encoding->type=type;
 }