From: bdemsky Date: Mon, 11 Sep 2017 21:28:25 +0000 (-0700) Subject: Remove unimplemented enum X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=533b3ebef5176bdabe3e6dea4d384a5d1640dbad;p=satune.git Remove unimplemented enum --- diff --git a/src/AST/astops.h b/src/AST/astops.h index e3c5963..8ddbdd1 100644 --- a/src/AST/astops.h +++ b/src/AST/astops.h @@ -17,7 +17,7 @@ enum BooleanValue {BV_UNDEFINED=0, BV_MUSTBETRUE=1, BV_MUSTBEFALSE=2, BV_UNSAT=3 typedef enum BooleanValue BooleanValue; enum ElementEncodingType { - ELEM_UNASSIGNED, ONEHOT, UNARY, BINARYINDEX, ONEHOTBINARY, BINARYVAL + ELEM_UNASSIGNED, ONEHOT, UNARY, BINARYINDEX, BINARYVAL }; typedef enum ElementEncodingType ElementEncodingType; diff --git a/src/ASTAnalyses/Encoding/encodinggraph.cc b/src/ASTAnalyses/Encoding/encodinggraph.cc index f01958b..b2cac1a 100644 --- a/src/ASTAnalyses/Encoding/encodinggraph.cc +++ b/src/ASTAnalyses/Encoding/encodinggraph.cc @@ -112,8 +112,6 @@ VarType EncodingNode::getType() { return s->getType(); } -//ELEM_UNASSIGNED, ONEHOT, UNARY, BINARYINDEX, ONEHOTBINARY, BINARYVAL - static TunableDesc NodeEncodingType(ELEM_UNASSIGNED, BINARYVAL, ELEM_UNASSIGNED); EncodingNode * EncodingGraph::createNode(Element *e) { diff --git a/src/Backend/satelemencoder.cc b/src/Backend/satelemencoder.cc index ed761e3..7dcb5de 100644 --- a/src/Backend/satelemencoder.cc +++ b/src/Backend/satelemencoder.cc @@ -13,9 +13,6 @@ Edge SATEncoder::getElementValueConstraint(Element *elem, uint64_t value) { return getElementValueUnaryConstraint(elem, value); case BINARYINDEX: return getElementValueBinaryIndexConstraint(elem, value); - case ONEHOTBINARY: - ASSERT(0); - break; case BINARYVAL: return getElementValueBinaryValueConstraint(elem, value); break; @@ -138,8 +135,6 @@ void SATEncoder::generateElementEncoding(Element *element) { case UNARY: generateUnaryEncodingVars(encoding); return; - case ONEHOTBINARY: - return; case BINARYVAL: generateBinaryValueEncodingVars(encoding); return; diff --git a/src/Translator/sattranslator.cc b/src/Translator/sattranslator.cc index bdcd196..792d58b 100644 --- a/src/Translator/sattranslator.cc +++ b/src/Translator/sattranslator.cc @@ -67,8 +67,6 @@ uint64_t getElementValueSATTranslator(CSolver *This, Element *element) { return getElementValueUnarySATTranslator(This, elemEnc); case BINARYINDEX: return getElementValueBinaryIndexSATTranslator(This, elemEnc); - case ONEHOTBINARY: - ASSERT(0); break; case BINARYVAL: ASSERT(0);