1.1 --- a/test/Tools/isac/Interpret/inform.sml	Tue Jun 25 10:46:20 2019 +0200
     1.2 +++ b/test/Tools/isac/Interpret/inform.sml	Tue Jun 25 12:48:24 2019 +0200
     1.3 @@ -24,7 +24,7 @@
     1.4  "CAS-command:";
     1.5  "--------- CAS-command on ([],Pbl) -------------------------------";
     1.6  "--------- CAS-command on ([],Pbl) FE-interface ------------------";
     1.7 -"--------- inform [rational,simplification] ----------------------";
     1.8 +"--------- locate_input_formula [rational,simplification] ----------------------";
     1.9  "--------- Take as 1st tac, start with <NEW> (CAS input) ---------";
    1.10  "--------- Take as 1st tac, start from exp -----------------------";
    1.11  "--------- init_form, start with <NEW> (CAS input) ---------------";
    1.12 @@ -469,7 +469,7 @@
    1.13  val (p,_,f,nxt,_,pt) = 
    1.14      CalcTreeTEST [([], ("e_domID", ["e_pblID"], ["e_metID"]))];
    1.15  val ifo = "solve(x+1=2,x)";
    1.16 -val (_,(_,c,(pt,p))) = inform ([],[],(pt,p)) "solve(x+1=2,x)";
    1.17 +val (_,(_,c,(pt,p))) = locate_input_formula ([],[],(pt,p)) "solve(x+1=2,x)";
    1.18  show_pt pt;
    1.19  val nxt = ("Apply_Method",Apply_Method ["Test","squ-equ-test-subpbl1"]);
    1.20  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.21 @@ -492,9 +492,9 @@
    1.22  else error "inform.sml: diff.behav. CAScmd ([],Pbl) FE-interface";
    1.23  DEconstrCalcTree 1;
    1.24  
    1.25 -"--------- inform [rational,simplification] ----------------------";
    1.26 -"--------- inform [rational,simplification] ----------------------";
    1.27 -"--------- inform [rational,simplification] ----------------------";
    1.28 +"--------- locate_input_formula [rational,simplification] ----------------------";
    1.29 +"--------- locate_input_formula [rational,simplification] ----------------------";
    1.30 +"--------- locate_input_formula [rational,simplification] ----------------------";
    1.31  reset_states ();
    1.32  CalcTree [(["Term (a * x / (b * x) + c * x / (d * x) + e / f)", "normalform N"],
    1.33  	("Rational", ["rational", "simplification"], ["simplification", "of_rationals"]))];
    1.34 @@ -1021,7 +1021,7 @@
    1.35     (([1], Res), d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))), <<=== input follos: "...+ cos(4.x^3)"
    1.36     (([2], Res), d_d x (x ^^^ 2) + cos (x ^^^ 4) * d_d x (x ^^^ 4))] *)
    1.37  
    1.38 -"~~~~~ fun inform, args:"; val ((cs as (_, _, ptp as (pt, pos as (p, p_))): calcstate'), istr) =
    1.39 +"~~~~~ fun locate_input_formula , args:"; val ((cs as (_, _, ptp as (pt, pos as (p, p_))): calcstate'), istr) =
    1.40    (cs', (encode ifo));
    1.41  val 	SOME f_in = parse (assoc_thy "Isac") istr
    1.42  val f_in = Thm.term_of f_in
    1.43 @@ -1044,15 +1044,15 @@
    1.44  			                   SOME errpatID => ("error pattern #" ^ errpatID ^ "#", calcstate')
    1.45  			                 | NONE => msg_calcstate';
    1.46  
    1.47 -"~~~~~ from inform return val:"; val () = ();
    1.48 +"~~~~~ from locate_input_formula return val:"; val () = ();
    1.49  case check_error_patterns (f_pred, f_in) (prog, env) (errpats, nrls) of
    1.50  			  SOME errpatID => ()
    1.51  			| NONE => error "check_error_patterns broken";
    1.52  
    1.53  "--- final check:";
    1.54 -case inform cs' (encode ifo) of
    1.55 +case locate_input_formula cs' (encode ifo) of
    1.56    ("error pattern #chain-rule-diff-both#", calcstate') => ()
    1.57 -| _ => error "inform with (positive) check_error_patterns broken"
    1.58 +| _ => error "locate_input_formula with (positive) check_error_patterns broken"
    1.59  
    1.60  "--------- build fun get_fillpats --------------------------------";
    1.61  "--------- build fun get_fillpats --------------------------------";