From: bdemsky Date: Mon, 21 Aug 2017 21:40:34 +0000 (-0700) Subject: edit X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=349cbf496921f9731497ed10ea1dc36e7fedcbff;p=satune.git edit --- diff --git a/src/AST/rewriter.c b/src/AST/rewriter.c index 7bbbf6d..5e24051 100644 --- a/src/AST/rewriter.c +++ b/src/AST/rewriter.c @@ -57,8 +57,8 @@ void replaceBooleanWithBoolean(CSolver * This, Boolean *oldb, Boolean *newb) { void handleXORTrue(BooleanLogic *bexpr, Boolean *child) { uint size = getSizeArrayBoolean(&bexpr->inputs); Boolean *b = getArrayBoolean(&bexpr->inputs, 0); - uint otherindex = (b == child) ? 1 : 0; - removeElementArrayBoolean(&bexpr->inputs, otherindex); + uint childindex = (b == child) ? 0 : 1; + removeElementArrayBoolean(&bexpr->inputs, childindex); bexpr->op = L_NOT; } diff --git a/src/Tuner/tunable.c b/src/Tuner/tunable.c index 6cd46f9..237b91c 100644 --- a/src/Tuner/tunable.c +++ b/src/Tuner/tunable.c @@ -8,9 +8,9 @@ void deleteTuner(Tuner *This) { ourfree(This); } -int getTunable(Tuner This, TunableParam param, TunableDesc * descriptor) { +int getTunable(Tuner *This, TunableParam param, TunableDesc * descriptor) { return descriptor->defaultValue; } -int getVarTunable(Tuner This, VarType vartype, TunableParam param, TunableDesc * descriptor) { +int getVarTunable(Tuner *This, VarType vartype, TunableParam param, TunableDesc * descriptor) { return descriptor->defaultValue; } diff --git a/src/Tuner/tunable.h b/src/Tuner/tunable.h index 6f091ab..45744b0 100644 --- a/src/Tuner/tunable.h +++ b/src/Tuner/tunable.h @@ -15,8 +15,8 @@ struct TunableDesc { Tuner * allocTuner(); void deleteTuner(Tuner *This); -int getTunable(Tuner This, TunableParam param, TunableDesc * descriptor); -int getVarTunable(Tuner This, VarType vartype, TunableParam param, TunableDesc * descriptor); +int getTunable(Tuner *This, TunableParam param, TunableDesc * descriptor); +int getVarTunable(Tuner *This, VarType vartype, TunableParam param, TunableDesc * descriptor); #define GETTUNABLE(This, param, descriptor) getTunable(This, param, descriptor); #define GETVARTUNABLE(This, vartype, param, descriptor) getTunable(This, param, descriptor);