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

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

diff --git a/src/Encoders/functionencoding.h b/src/Encoders/functionencoding.h
index 41d99761e6958309e66f946e1e428c2e89639cbb..a7b6364a67af95d71d617c8423475ff69c91a707 100644 (file)
--- a/src/Encoders/functionencoding.h
+++ b/src/Encoders/functionencoding.h
@@ -9,21 +9,24 @@ enum FunctionEncodingType {
 typedef enum FunctionEncodingType FunctionEncodingType;
 
 union ElementPredicate {
-       Element * function;
-       Boolean * predicate;
+       Element *function;
+       Boolean *predicate;
 };
 
 typedef union ElementPredicate ElementPredicate;
 
-struct FunctionEncoding {
+class FunctionEncoding {
+public:
        FunctionEncodingType type;
        bool isFunction;//true for function, false for predicate
        ElementPredicate op;
+       FunctionEncoding(Element *function);
+       FunctionEncoding(Boolean *predicate);
+       void setFunctionEncodingType(FunctionEncodingType type);
+       FunctionEncodingType getFunctionEncodingType() {return type;}
+       CMEMALLOC;
 };
 
-void initFunctionEncoding(FunctionEncoding *encoding, Element *function);
-void initPredicateEncoding(FunctionEncoding *encoding, Boolean *predicate);
-void setFunctionEncodingType(FunctionEncoding* encoding, FunctionEncodingType type);
-void deleteFunctionEncoding(FunctionEncoding *This);
+
 
 #endif