From: lianah Date: Tue, 30 Apr 2013 19:52:40 +0000 (-0400) Subject: updated the author name X-Git-Tag: cvc5-1.0.0~7295 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a6cbb4dd9f8c8e5d53f0d4b77e177bfa4cc2fb92;p=cvc5.git updated the author name --- diff --git a/src/theory/bv/theory_bv_rewrite_rules_normalization.h b/src/theory/bv/theory_bv_rewrite_rules_normalization.h index 035bd4469..2da4dfa6a 100644 --- a/src/theory/bv/theory_bv_rewrite_rules_normalization.h +++ b/src/theory/bv/theory_bv_rewrite_rules_normalization.h @@ -1120,7 +1120,7 @@ template<> inline Node RewriteRule::apply(TNode node) { Debug("bv-rewrite") << "RewriteRule(" << node << ")" << std::endl; // get the constant - bool found_constant = false; + bool found_constant CVC4_UNUSED = false ; TNode constant; std::vector other_children; for (unsigned i = 0; i < node.getNumChildren(); ++i) { diff --git a/src/theory/bv/theory_bv_rewriter.cpp b/src/theory/bv/theory_bv_rewriter.cpp index 44c498947..0775cb1f8 100644 --- a/src/theory/bv/theory_bv_rewriter.cpp +++ b/src/theory/bv/theory_bv_rewriter.cpp @@ -177,10 +177,10 @@ RewriteResponse TheoryBVRewriter::RewriteExtract(TNode node, bool preregister) { return RewriteResponse(REWRITE_AGAIN_FULL, resultNode); } - // if (RewriteRule::applies(node)) { - // resultNode = RewriteRule::run(node); - // return RewriteResponse(REWRITE_AGAIN_FULL, resultNode); - // } + if (RewriteRule::applies(node)) { + resultNode = RewriteRule::run(node); + return RewriteResponse(REWRITE_AGAIN_FULL, resultNode); + } if (RewriteRule::applies(node)) { resultNode = RewriteRule::run(node); @@ -228,8 +228,8 @@ RewriteResponse TheoryBVRewriter::RewriteAnd(TNode node, bool preregister){ resultNode = LinearRewriteStrategy < RewriteRule, - RewriteRule//, - // RewriteRule + RewriteRule, + RewriteRule >::apply(node); if (resultNode.getKind() != node.getKind()) { @@ -244,8 +244,8 @@ RewriteResponse TheoryBVRewriter::RewriteOr(TNode node, bool preregister){ resultNode = LinearRewriteStrategy < RewriteRule, - RewriteRule//, - // RewriteRule + RewriteRule, + RewriteRule >::apply(node); if (resultNode.getKind() != node.getKind()) { @@ -261,8 +261,8 @@ RewriteResponse TheoryBVRewriter::RewriteXor(TNode node, bool preregister) { resultNode = LinearRewriteStrategy < RewriteRule, // flatten the expression RewriteRule, // simplify duplicates and constants - RewriteRule//, // checks if the constant part is zero and eliminates it - // RewriteRule + RewriteRule, // checks if the constant part is zero and eliminates it + RewriteRule >::apply(node); // this simplification introduces new terms and might require further