renaming

[satune.git] / src / AST / rewriter.cc

diff --git a/src/AST/rewriter.cc b/src/AST/rewriter.cc
index f32fc91b0e945d74ea94f4e8df5e250ce94e17fe..bfc321cf7b76f62e7fc159e6a39045c1edad3398 100644 (file)
--- a/src/AST/rewriter.cc
+++ b/src/AST/rewriter.cc
@@ -12,19 +12,19 @@ void CSolver::replaceBooleanWithTrue(Boolean *bexpr) {
                Boolean *parent = bexpr->parents.get(i);
                BooleanLogic *logicop = (BooleanLogic *) parent;
                switch (logicop->op) {
-               case L_AND:
+               case SATC_AND:
                        handleANDTrue(logicop, bexpr);
                        break;
-               case L_OR:
+               case SATC_OR:
                        replaceBooleanWithTrue(parent);
                        break;
-               case L_NOT:
+               case SATC_NOT:
                        replaceBooleanWithFalse(parent);
                        break;
-               case L_XOR:
+               case SATC_XOR:
                        handleXORTrue(logicop, bexpr);
                        break;
-               case L_IMPLIES:
+               case SATC_IMPLIES:
                        handleIMPLIESTrue(logicop, bexpr);
                        break;
                }
@@ -59,7 +59,7 @@ void handleXORTrue(BooleanLogic *bexpr, Boolean *child) {
        Boolean *b = bexpr->inputs.get(0);
        uint childindex = (b == child) ? 0 : 1;
        bexpr->inputs.remove(childindex);
-       bexpr->op = L_NOT;
+       bexpr->op = SATC_NOT;
 }
 
 void CSolver::handleXORFalse(BooleanLogic *bexpr, Boolean *child) {
@@ -90,7 +90,7 @@ void CSolver::handleIMPLIESFalse(BooleanLogic *bexpr, Boolean *child) {
        } else {
                //Make into negation of first term
                bexpr->inputs.get(1);
-               bexpr->op = L_NOT;
+               bexpr->op = SATC_NOT;
        }
 }
 
@@ -144,19 +144,19 @@ void CSolver::replaceBooleanWithFalse(Boolean *bexpr) {
                Boolean *parent = bexpr->parents.get(i);
                BooleanLogic *logicop = (BooleanLogic *) parent;
                switch (logicop->op) {
-               case L_AND:
+               case SATC_AND:
                        replaceBooleanWithFalse(parent);
                        break;
-               case L_OR:
+               case SATC_OR:
                        handleORFalse(logicop, bexpr);
                        break;
-               case L_NOT:
+               case SATC_NOT:
                        replaceBooleanWithTrue(parent);
                        break;
-               case L_XOR:
+               case SATC_XOR:
                        handleXORFalse(logicop, bexpr);
                        break;
-               case L_IMPLIES:
+               case SATC_IMPLIES:
                        handleIMPLIESFalse(logicop, bexpr);
                        break;
                }