1.1 --- a/src/Tools/isac/Specify/i-model.sml Wed Nov 29 07:51:28 2023 +0100
1.2 +++ b/src/Tools/isac/Specify/i-model.sml Thu Nov 30 08:11:50 2023 +0100
1.3 @@ -178,18 +178,18 @@
1.4 "Sup_TEST " ^ UnparseC.term ctxt (Input_Descript.join (d, ts))
1.5
1.6 fun descr_vals_to_string ctxt (descr, values) =
1.7 - UnparseC.term ctxt (descr $ Model_Def.dest_values values)
1.8 + UnparseC.term ctxt (descr $ Model_Def.values_to_present values)
1.9
1.10 (*prepare for presentation to user; thus Syn_TEST does NOT raise an exn*)
1.11 fun feedb_args_to_string ctxt (Cor_TEST (descr, values)) =
1.12 - UnparseC.term ctxt (descr $ Model_Def.dest_values values)
1.13 + UnparseC.term ctxt (descr $ Model_Def.values_to_present values)
1.14 | feedb_args_to_string _ (Syn_TEST str) = str
1.15 | feedb_args_to_string ctxt (Inc_TEST (descr, [])) =
1.16 UnparseC.term ctxt descr ^ Model_Pattern.empty_for descr
1.17 | feedb_args_to_string ctxt (Inc_TEST (descr, values)) =
1.18 - UnparseC.term ctxt (descr $ Model_Def.dest_values values)
1.19 + UnparseC.term ctxt (descr $ Model_Def.values_to_present values)
1.20 | feedb_args_to_string ctxt (Sup_TEST (descr, values)) =
1.21 - UnparseC.term ctxt (descr $ Model_Def.dest_values values)
1.22 + UnparseC.term ctxt (descr $ Model_Def.values_to_present values)
1.23
1.24 fun single_to_string ctxt (i, is, b, s, itm_) =
1.25 "(" ^ string_of_int i ^ " ," ^ ints2str' is ^ " ," ^ bool2str b ^ " ," ^
1.26 @@ -279,7 +279,7 @@
1.27 | values_TEST' (Sup_TEST (_, ts)) = ts
1.28
1.29 fun descr_pairs_to_string ctxt equal_descr_pairs =
1.30 -(map (fn (a, b) => pair (Model_Pattern.pat2str ctxt a) (single_to_string_TEST ctxt b)
1.31 +(map (fn (a, b) => pair (Model_Pattern.single_to_string ctxt a) (single_to_string_TEST ctxt b)
1.32 |> pair2str) equal_descr_pairs)
1.33 |> strs2str'
1.34
1.35 @@ -495,8 +495,8 @@
1.36 val ts = already_input @ [hd miss]
1.37 in
1.38 if length all_values = length ts
1.39 - then SOME (i, vnts, bool, m_field, (Cor_TEST (descr, [Model_Def.dest_values ts]), pos))
1.40 - else SOME (i, vnts, bool, m_field, (Inc_TEST (descr, [Model_Def.dest_values ts]), pos))
1.41 + then SOME (i, vnts, bool, m_field, (Cor_TEST (descr, [Model_Def.values_to_present ts]), pos))
1.42 + else SOME (i, vnts, bool, m_field, (Inc_TEST (descr, [Model_Def.values_to_present ts]), pos))
1.43 end
1.44 else SOME (i, vnts, bool, m_field, (Cor_TEST (descr, all_values(*only 1 term*)), pos))
1.45 end