diff -r fa8d902b60bc -r 2ab0d1523731 test/Tools/isac/Interpret/error-pattern.sml --- a/test/Tools/isac/Interpret/error-pattern.sml Wed Feb 03 15:21:12 2021 +0100 +++ b/test/Tools/isac/Interpret/error-pattern.sml Wed Feb 03 16:39:44 2021 +0100 @@ -47,9 +47,9 @@ "--------- appendFormula: on Res + equ_nrls ----------------------"; "--------- appendFormula: on Res + equ_nrls ----------------------"; "--------- appendFormula: on Res + equ_nrls ----------------------"; - val Prog sc = (#scr o Method.from_store) ["Test", "squ-equ-test-subpbl1"]; + val Prog sc = (#scr o MethodC.from_store) ["Test", "squ-equ-test-subpbl1"]; (writeln o UnparseC.term) sc; - val Prog sc = (#scr o Method.from_store) ["Test", "solve_linear"]; + val Prog sc = (#scr o MethodC.from_store) ["Test", "solve_linear"]; (writeln o UnparseC.term) sc; reset_states (); @@ -984,7 +984,7 @@ val (res, inf) = (str2term "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))", str2term "d_d x (x ^^^ 2) + cos (4 * x ^^^ 3)"); -val {errpats, nrls = rls, scr = Prog prog, ...} = Method.from_store ["diff", "differentiate_on_R"] +val {errpats, nrls = rls, scr = Prog prog, ...} = MethodC.from_store ["diff", "differentiate_on_R"] val env = [(str2term "v_v", str2term "x")]; val errpats = @@ -1032,16 +1032,16 @@ (*if*) f_pred = f_in; (*else*) val NONE = (*case*) CAS_Cmd.input f_in (*of*); (*old* )val (_, _, metID) = get_obj g_spec pt (par_pblobj pt p) - (*old*)val {scr = prog, ...} = Method.from_store metID + (*old*)val {scr = prog, ...} = MethodC.from_store metID (*old*)val istate = get_istate_LI pt pos (*old*)val ctxt = get_ctxt pt pos ( *old*) val LI.Not_Derivable = (*case*) LI.locate_input_term (pt, pos) f_in (*of*); val pp = Ctree.par_pblobj pt p - val (errpats, nrls, prog) = case Method.from_store (Ctree.get_obj Ctree.g_metID pt pp) of + val (errpats, nrls, prog) = case MethodC.from_store (Ctree.get_obj Ctree.g_metID pt pp) of {errpats, nrls, scr = Rule.Prog prog, ...} => (errpats, nrls, prog) - | _ => error "inform: uncovered case of Method.from_store" + | _ => error "inform: uncovered case of MethodC.from_store" ; (*+*)if Error_Pattern.s_to_string errpats = "[(\"chain-rule-diff-both\",\n[\"d_d ?bdv (sin ?u) = cos (d_d ?bdv ?u)\", \"d_d ?bdv (cos ?u) = - sin (d_d ?bdv ?u)\", \"d_d ?bdv (?u ^^^ ?n) = ?n * ?u ^^^ (?n - 1)\", \"d_d ?bdv (LogExp.ln ?u) = 1 / ?u\", \"d_d ?bdv (LogExp.ln ?u) = 1 / d_d ?bdv ?u\"],\n[\"d_d ?bdv (sin ?u) = cos ?u * d_d ?bdv ?u\", \"d_d ?bdv (cos ?u) = - sin ?u * d_d ?bdv ?u\", \"d_d ?bdv (?u ^^^ ?n) = ?n * ?u ^^^ (?n - 1) * d_d ?bdv ?u\", \"d_d ?bdv (LogExp.ln ?u) = d_d ?bdv ?u / ?u\", \"d_d ?bdv (E_ ^^^ ?u) = E_ ^^^ ?u * d_d ?x ?u\"]]" (*+*)then () else error "inform with (positive) Error_Pattern.check_for broken 3"; @@ -1084,9 +1084,9 @@ "~~~~~ fun find_fill_patterns , args:"; val ((pt, pos as (p, _)), errpatID) = ((pt, pos), errpatID); val f_curr = Ctree.get_curr_formula (pt, pos); val pp = Ctree.par_pblobj pt p - val (errpats, prog) = case Method.from_store (Ctree.get_obj Ctree.g_metID pt pp) of + val (errpats, prog) = case MethodC.from_store (Ctree.get_obj Ctree.g_metID pt pp) of {errpats, scr = Rule.Prog prog, ...} => (errpats, prog) - | _ => error "find_fill_patterns: uncovered case of Method.from_store" + | _ => error "find_fill_patterns: uncovered case of MethodC.from_store" val {env, ...} = Ctree.get_istate_LI pt pos |> Istate.the_pstate val subst = Subst.for_bdv prog env val errpatthms = errpats