nits, add local functions

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/sat/smt/synth_solver.cpp

@@ -12,7 +12,7 @@ Author:
 
 --*/
 
-
+#include "ast/synth_decl_plugin.h"
 #include "sat/smt/synth_solver.h"
 #include "sat/smt/euf_solver.h"
 
@@ -30,44 +30,54 @@ namespace synth {
 
     }
 
-    void solver::synthesize(app* e) {
+    bool solver::synthesize(app* e) {
+
+        if (e->get_num_args() == 0)
+            return false;
+        
     	auto * n = expr2enode(e->get_arg(0));
 	expr_ref_vector repr(m);
 	euf::enode_vector todo;
+        auto has_rep = [&](euf::enode* n) { return !!repr.get(n->get_root_id(), nullptr); };
+        auto get_rep = [&](euf::enode* n) { return repr.get(n->get_root_id(), nullptr); };
 	for (unsigned i = 1; i < e->get_num_args(); ++i) {
 	    expr * arg = e->get_arg(i);
 	    auto * narg = expr2enode(arg);
 	    todo.push_back(narg);
 	    repr.setx(narg->get_root_id(), arg);
 	}
-	for (unsigned i = 0; i < todo.size() && !repr.get(n->get_root_id(), nullptr); ++i) {
+	for (unsigned i = 0; i < todo.size() && !has_rep(n); ++i) {
 	    auto * nn = todo[i];
 	    for (auto * p : euf::enode_parents(nn)) {
-		if (repr.get(p->get_root_id(), nullptr)) continue;
+		if (has_rep(p))
-		if (all_of(euf::enode_args(p), [&](auto * ch) { return repr.get(ch->get_root_id(), nullptr); })) {
+                    continue;
-		    ptr_buffer<expr> args;
+                if (all_of(euf::enode_args(p), [&](auto * ch) { return has_rep(ch); })) {
-		    for (auto * ch : euf::enode_args(p)) args.push_back(repr.get(ch->get_root_id()));
+                    ptr_buffer<expr> args;
-		    app * papp = m.mk_app(p->get_decl(), args);
+		    for (auto * ch : euf::enode_args(p))
+                        args.push_back(get_rep(ch));
+                    app * papp = m.mk_app(p->get_decl(), args);
 		    repr.setx(p->get_root_id(), papp);
 		    todo.push_back(p);
 		}
 	    }
 	}
-	expr * sol = repr.get(n->get_root_id(), nullptr);
+	expr * sol = get_rep(n);
-	if (sol != nullptr) {
+        if (!sol)
-	    sat::literal lit = eq_internalize(n->get_expr(), sol);
+            return false;
-	    add_unit(~lit);
+
-	    IF_VERBOSE(0, verbose_stream() << mk_pp(sol, m) << "\n");
+        sat::literal lit = eq_internalize(n->get_expr(), sol);
-	}
+        add_unit(~lit);
+        IF_VERBOSE(0, verbose_stream() << mk_pp(sol, m) << "\n");
+	return true;
     }
 
     // block current model using realizer by E-graph (and arithmetic)
     // 
     sat::check_result solver::check() {
-	for (app* e : m_synth) {
+	for (app* e : m_synth) 
-	    synthesize(e);
+	    if (synthesize(e))
-	}
+               sat::check_result::CR_CONTINUE; 
-        return sat::check_result::CR_CONTINUE;
+        return sat::check_result::CR_DONE;
     }
 
     // nothing particular to do
@@ -103,10 +113,12 @@ namespace synth {
     // recognize synthesis objectives here and above
     void solver::internalize(expr* e) {
 	SASSERT(is_app(e));
-	sat::bool_var bv =ctx.get_si().add_bool_var(e);
+	sat::bool_var bv = ctx.get_si().add_bool_var(e);
 	sat::literal lit(bv, false);
 	ctx.attach_lit(lit, e);
-	ctx.push_vec(m_synth, to_app(e));
+        synth::util util(m);
+        if (util.is_synthesiz3(e)) 
+            ctx.push_vec(m_synth, to_app(e));
     }
 
     // display current state (eg. current set of realizers)

src/sat/smt/synth_solver.h

@@ -44,7 +44,7 @@ namespace synth {
         euf::th_solver* clone(euf::solver& ctx) override;
 
     private:
-	void synthesize(app* e);
+	bool synthesize(app* e);
 
     	ptr_vector<app> m_synth;