Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt

Conflicts:
	scripts/mk_project.py
	src/duality/duality.h
	src/duality/duality_solver.cpp
	src/duality/duality_wrapper.h
	src/interp/iz3hash.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>

src/smt/theory_fpa.cpp

@@ -0,0 +1,46 @@
+/*++
+Copyright (c) 2014 Microsoft Corporation
+
+Module Name:
+
+    theory_fpa.cpp
+
+Abstract:
+
+    Floating-Point Theory Plugin
+
+Author:
+
+    Christoph (cwinter) 2014-04-23
+
+Revision History:
+
+--*/
+#include"ast_smt2_pp.h"
+#include"theory_fpa.h"
+
+namespace smt {
+
+    bool theory_fpa::internalize_atom(app * atom, bool gate_ctx) {
+        TRACE("bv", tout << "internalizing atom: " << mk_ismt2_pp(atom, get_manager()) << "\n";);
+        SASSERT(atom->get_family_id() == get_family_id());
+        NOT_IMPLEMENTED_YET();
+        return true;
+    }
+
+    void theory_fpa::new_eq_eh(theory_var, theory_var) {
+        NOT_IMPLEMENTED_YET();
+    }
+
+    void theory_fpa::new_diseq_eh(theory_var, theory_var) {
+        NOT_IMPLEMENTED_YET();
+    }
+
+    void theory_fpa::push_scope_eh() {
+        NOT_IMPLEMENTED_YET();
+    }
+
+    void theory_fpa::pop_scope_eh(unsigned num_scopes) {
+        NOT_IMPLEMENTED_YET();
+    }
+};

src/smt/theory_fpa.h

@@ -0,0 +1,45 @@
+/*++
+Copyright (c) 2014 Microsoft Corporation
+
+Module Name:
+
+    theory_fpa.h
+
+Abstract:
+
+    Floating-Point Theory Plugin
+
+Author:
+
+    Christoph (cwinter) 2014-04-23
+
+Revision History:
+
+--*/
+#ifndef _THEORY_FPA_H_
+#define _THEORY_FPA_H_
+
+#include"smt_theory.h"
+#include"fpa2bv_converter.h"
+
+namespace smt {
+    class theory_fpa : public theory {
+        fpa2bv_converter m_converter;
+
+        virtual final_check_status final_check_eh() { return FC_DONE; }
+        virtual bool internalize_atom(app*, bool);
+        virtual bool internalize_term(app*) { return internalize_atom(0, false); }
+        virtual void new_eq_eh(theory_var, theory_var);
+        virtual void new_diseq_eh(theory_var, theory_var);
+        virtual void push_scope_eh();
+        virtual void pop_scope_eh(unsigned num_scopes);
+        virtual theory* mk_fresh(context*) { return alloc(theory_fpa, get_manager()); }
+        virtual char const * get_name() const { return "fpa"; }
+    public:
+        theory_fpa(ast_manager& m) : theory(m.mk_family_id("fpa")), m_converter(m) {}
+    };
+
+};
+
+#endif /* _THEORY_FPA_H_ */
+