X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2FAST%2Fops.h;h=8b082025348ffaeab34916512eb55368068473d9;hb=117241b1cd873bad6f955819112cafed8aa29616;hp=e5ccdeb6aead885246081c05eb08cbd291a21099;hpb=1d6dbb6b9bfc8a2ebfbb29f9bcda4b4127909b00;p=satune.git

diff --git a/src/AST/ops.h b/src/AST/ops.h
index e5ccdeb..8b08202 100644
--- a/src/AST/ops.h
+++ b/src/AST/ops.h
@@ -1,44 +1,29 @@
 #ifndef OPS_H
 #define OPS_H
-enum LogicOp {L_AND, L_OR, L_NOT, L_XOR, L_IMPLIES};
+enum LogicOp {SATC_AND, SATC_OR, SATC_NOT, SATC_XOR, SATC_IFF, SATC_IMPLIES};
 typedef enum LogicOp LogicOp;
 
-enum ArithOp {ADD, SUB};
+enum ArithOp {SATC_ADD, SATC_SUB};
 typedef enum ArithOp ArithOp;
 
-enum CompOp {EQUALS};
+enum CompOp {SATC_EQUALS, SATC_LT, SATC_GT, SATC_LTE, SATC_GTE};
 typedef enum CompOp CompOp;
 
-enum OrderType {PARTIAL, TOTAL};
+enum OrderType {SATC_PARTIAL, SATC_TOTAL};
 typedef enum OrderType OrderType;
 
 /**
- *    FLAGFORCESOVERFLOW forces the operation to overflow if the boolean flag is true
- *  OVERFLOWSETSFLAG -- sets the flag if the operation overflows
- *  FLAGIFFOVERFLOW -- flag is set iff the operation overflows
- *  IGNORE -- doesn't constrain output if the result cannot be represented
- *  WRAPAROUND -- wraps around like stand integer arithmetic
- *  NOOVERFLOW -- client has ensured that overflow is impossible
+ *    SATC_FLAGFORCESOVERFLOW forces the operation to overflow if the boolean flag is true
+ *  SATC_OVERFLOWSETSFLAG -- sets the flag if the operation overflows
+ *  SATC_FLAGIFFOVERFLOW -- flag is set iff the operation overflows
+ *  SATC_IGNORE -- doesn't constrain output if the result cannot be represented
+ *  SATC_WRAPAROUND -- wraps around like stand integer arithmetic
+ *  SATC_NOOVERFLOW -- client has ensured that overflow is impossible
  */
-enum OverFlowBehavior {IGNORE, WRAPAROUND, FLAGFORCESOVERFLOW, OVERFLOWSETSFLAG, FLAGIFFOVERFLOW, NOOVERFLOW};
+enum OverFlowBehavior {SATC_IGNORE, SATC_WRAPAROUND, SATC_FLAGFORCESOVERFLOW, SATC_OVERFLOWSETSFLAG, SATC_FLAGIFFOVERFLOW, SATC_NOOVERFLOW};
 typedef enum OverFlowBehavior OverFlowBehavior;
 
-enum UndefinedBehavior {IGNOREBEHAVIOR, FLAGFORCEUNDEFINED, UNDEFINEDSETSFLAG, FLAGIFFUNDEFINED};
+enum UndefinedBehavior {SATC_IGNOREBEHAVIOR, SATC_FLAGFORCEUNDEFINED, SATC_UNDEFINEDSETSFLAG, SATC_FLAGIFFUNDEFINED};
 typedef enum UndefinedBehavior UndefinedBehavior;
 
-enum BooleanType {ORDERCONST, BOOLEANVAR, LOGICOP, PREDICATEOP, TABLEPREDICATEOP};
-typedef enum BooleanType BooleanType;
-
-enum FunctionType {TABLEFUNC, OPERATORFUNC};
-typedef enum FunctionType FunctionType;
-
-enum PredicateType {TABLEPRED, OPERATORPRED};
-typedef enum PredicateType PredicateType;
-
-enum ElementType {ELEMSET, ELEMFUNCRETURN};
-typedef enum ElementType ElementType;
-
-enum StructType {_BOOLEAN, _ELEMENT};
-typedef enum StructType StructType;
-
 #endif