constraints will be replaced by cg_coverage*/3

Salvador Abreu
1 parent 8515b5f5
Showing 1 changed file with 14 additions and 4 deletions Show diff stats
fz/paccs/output.pl
@@ -17,10 +17,12 @@ cg_emit(PS, VS, CS, G, ST) --&gt;
 % == DCGs for code generation =================================================
+
 % -- predicates ---------------------------------------------------------------
 cg_preds(_PS, _ST) --> [].
+
 % -- variables ----------------------------------------------------------------
 cg_vars(OP,  [V|Vs], ST) --> cg_var(OP, V, ST), cg_vars(OP, Vs, ST).
@@ -71,12 +73,19 @@ cg_constant_list([C|Cs], PFX) --&gt;
 cg_constant(lit(N,int)) --> { format_to_codes(S, "~w", [N]) }, S.
+
 % -- constraints --------------------------------------------------------------
-cg_constrs([C|Cs], ST) --> cg_constr(C, ST), cg_constrs(Cs, ST).
-cg_constrs([], _) --> [].
+cg_constrs([], _) --> {!}, [].
+cg_constrs(CS, ST) --> cg_coverage(CS, CR, ST), cg_constrs(CR, ST).
+
+% ++ cg_coverage(CI, CO, ST) [DCG]  - - - - - - - - - - - - - - - - - - - - - -
+%
+% emit an instruction which partly covers CI, leaving CO untreated
+
+cg_coverage([_C|CS], CS, _ST) --> [].	% FIXME: temporary
-cg_constr(_C, _ST) --> [].	% FIXME: temporary
+% cg_coverage(CI, CO, ST) --> [].
 % -- goal ---------------------------------------------------------------------
@@ -84,7 +93,8 @@ cg_goal(solve(satisfy,_), VS, ST) --&gt; % FIXME: add minimize and maximize
     "\n",
     "  if (fd_solve()) {\n",
     cg_var_print(VS, ST, "    "),
-    "  }\n".
+    "  }\n",
+    "  fd_end();\n".
 cg_var_print([], _, _) --> [].
 cg_var_print([var(N,_,_,A)|Vs], ST, PFX) -->