diff options
author | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
commit | 2ba8bb701ce289ba60afec01b653b0930cc59298 (patch) | |
tree | 46df365b7b41ce662a0f94de5b11c3ed20829851 /src/theory/fp | |
parent | 42b665f2a00643c81b42932fab1441987628c5a5 (diff) |
Adding listeners to Options.
- Options
-- Added the new option attribute :notify. One can get a notify() call on the Listener after a the option's value is updated. This is the new preferred way to achieve dynamic dispatch for options.
-- Removed SmtOptionsHandler and pushed its functionality into OptionsHandler and Listeners.
-- Added functions to Options for registering listeners of the notify calls.
-- Changed a number of options to use the new listener infrastructure.
-- Fixed a number of warnings in options.
-- Added the ArgumentExtender class to better capture how arguments are inserted while parsing options and ease memory management. Previously this was the "preemptGetopt" procedure.
-- Moved options/options_handler_interface.{cpp,h} to options/options_handler.{cpp,h}.
- Theories
-- Reimplemented alternative theories to use a datastructure stored on TheoryEngine instead of on Options.
- Ostream Handling:
-- Added new functionality that generalized how ostreams are opened, options/open_stream.h.
-- Simplified the memory management for different ostreams, smt/managed_ostreams.h.
-- Had the SmtEnginePrivate manage the memory for the ostreams set by options.
-- Simplified how the setting of ostreams are updated, smt/update_ostream.h.
- Configuration and Tags:
-- Configuration can now be used during predicates and handlers for options.
-- Moved configuration.{cpp,h,i} and configuration_private.h from util/ into base/.
-- Moved {Debug,Trace}_tags.* from being generated in options/ into base/.
- cvc4_private.h
-- Upgraded #warning's in cvc4_private.h and cvc4_private_library.h to #error's.
-- Added public first-order (non-templatized) member functions for options get and set the value of options outside of libcvc4. Fixed all of the use locations.
-- Made lib/lib/clock_gettime.h a cvc4_private_library.h header.
- Antlr
-- Fixed antlr and cvc4 macro definition conflicts that caused warnings.
- SmtGlobals
-- Refactored replayStream and replayLog out of SmtGlobals.
-- Renamed SmtGlobals to LemmaChannels and moved the implementation into smt_util/lemma_channels.{h,cpp}.
Diffstat (limited to 'src/theory/fp')
-rw-r--r-- | src/theory/fp/theory_fp.cpp | 54 | ||||
-rw-r--r-- | src/theory/fp/theory_fp.h | 3 |
2 files changed, 32 insertions, 25 deletions
diff --git a/src/theory/fp/theory_fp.cpp b/src/theory/fp/theory_fp.cpp index 9a8d77844..18bf993ad 100644 --- a/src/theory/fp/theory_fp.cpp +++ b/src/theory/fp/theory_fp.cpp @@ -7,44 +7,52 @@ namespace theory { namespace fp { namespace removeToFPGeneric { - + Node removeToFPGeneric (TNode node) { Assert(node.getKind() == kind::FLOATINGPOINT_TO_FP_GENERIC); - - FloatingPointToFPGeneric info = node.getOperator().getConst<FloatingPointToFPGeneric>(); - + + FloatingPointToFPGeneric info = + node.getOperator().getConst<FloatingPointToFPGeneric>(); + size_t children = node.getNumChildren(); - + Node op; - + if (children == 1) { - op = NodeManager::currentNM()->mkConst(FloatingPointToFPIEEEBitVector(info.t.exponent(), - info.t.significand())); + op = NodeManager::currentNM()->mkConst( + FloatingPointToFPIEEEBitVector(info.t.exponent(), + info.t.significand())); return NodeManager::currentNM()->mkNode(op, node[0]); - + } else { Assert(children == 2); Assert(node[0].getType().isRoundingMode()); - + TypeNode t = node[1].getType(); - + if (t.isFloatingPoint()) { - op = NodeManager::currentNM()->mkConst(FloatingPointToFPFloatingPoint(info.t.exponent(), - info.t.significand())); + op = NodeManager::currentNM()->mkConst( + FloatingPointToFPFloatingPoint(info.t.exponent(), + info.t.significand())); } else if (t.isReal()) { - op = NodeManager::currentNM()->mkConst(FloatingPointToFPReal(info.t.exponent(), - info.t.significand())); + op = NodeManager::currentNM()->mkConst( + FloatingPointToFPReal(info.t.exponent(), + info.t.significand())); } else if (t.isBitVector()) { - op = NodeManager::currentNM()->mkConst(FloatingPointToFPSignedBitVector(info.t.exponent(), - info.t.significand())); - + op = NodeManager::currentNM()->mkConst( + FloatingPointToFPSignedBitVector(info.t.exponent(), + info.t.significand())); + } else { - throw TypeCheckingExceptionPrivate(node, "cannot rewrite to_fp generic due to incorrect type of second argument"); + throw TypeCheckingExceptionPrivate( + node, + "cannot rewrite to_fp generic due to incorrect type of second " + "argument"); } - + return NodeManager::currentNM()->mkNode(op, node[0], node[1]); } - + Unreachable("to_fp generic not rewritten"); } } @@ -53,8 +61,8 @@ namespace removeToFPGeneric { /** Constructs a new instance of TheoryFp w.r.t. the provided contexts. */ TheoryFp::TheoryFp(context::Context* c, context::UserContext* u, OutputChannel& out, Valuation valuation, - const LogicInfo& logicInfo, SmtGlobals* globals) - : Theory(THEORY_FP, c, u, out, valuation, logicInfo, globals) + const LogicInfo& logicInfo) + : Theory(THEORY_FP, c, u, out, valuation, logicInfo) {}/* TheoryFp::TheoryFp() */ diff --git a/src/theory/fp/theory_fp.h b/src/theory/fp/theory_fp.h index fe3c377af..ac2c68ac4 100644 --- a/src/theory/fp/theory_fp.h +++ b/src/theory/fp/theory_fp.h @@ -17,8 +17,7 @@ public: context::UserContext* u, OutputChannel& out, Valuation valuation, - const LogicInfo& logicInfo, - SmtGlobals* globals); + const LogicInfo& logicInfo); Node expandDefinition(LogicRequest &, Node node); |