X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2FAlloyEnc%2Fsignature.cc;h=ad7d2e700fe9b81bbf2f3268c5340e07718c66bf;hb=51799c65144abda2e95b5bab5a0af868b3378714;hp=7201dc2a9a996155bb68b573314b2111ece598ed;hpb=829b44197d915859a76704b501ebe14105b7585e;p=satune.git diff --git a/src/AlloyEnc/signature.cc b/src/AlloyEnc/signature.cc index 7201dc2..ad7d2e7 100644 --- a/src/AlloyEnc/signature.cc +++ b/src/AlloyEnc/signature.cc @@ -5,15 +5,20 @@ bool BooleanSig::encodeAbs = true; bool SetSig::encodeAbs = true; bool ElementSig::encodeAbs = true; -BooleanSig::BooleanSig(uint id): - Signature(id), - value(-1) +ValuedSignature::ValuedSignature(uint id): + Signature(id), + value(-1) { } -bool BooleanSig::getValue(){ +int ValuedSignature::getValue(){ ASSERT(value != -1); - return (bool) value; + return value; +} + +BooleanSig::BooleanSig(uint id): + ValuedSignature(id) +{ } string BooleanSig::toString() const{ @@ -50,9 +55,8 @@ string BooleanSig::getAbsSignature() const{ } ElementSig::ElementSig(uint id, SetSig *_ssig): - Signature(id), - ssig(_ssig), - value(0) + ValuedSignature(id), + ssig(_ssig) { }