1.1 --- a/src/Tools/isac/Interpret/ctree.sml	Mon May 21 16:56:01 2012 +0200
     1.2 +++ b/src/Tools/isac/Interpret/ctree.sml	Tue May 22 07:00:53 2012 +0200
     1.3 @@ -968,7 +968,7 @@
     1.4    | gpt_cell (Nd (PrfObj {cell = c,...},_)) = c;
     1.5  
     1.6  (* get the formula preceeding the current position in a calculation *)
     1.7 -fun get_pred_formula (pt, pos as (p, p_)) = 
     1.8 +fun get_curr_formula (pt, pos as (p, p_)) = 
     1.9  	  case p_ of
    1.10  	    Frm => get_obj g_form pt p
    1.11  			  | Res => (fst o (get_obj g_result pt)) p

     2.1 --- a/src/Tools/isac/Interpret/inform.sml	Mon May 21 16:56:01 2012 +0200
     2.2 +++ b/src/Tools/isac/Interpret/inform.sml	Tue May 22 07:00:53 2012 +0200
     2.3 @@ -682,7 +682,7 @@
     2.4  	  SOME f_in =>
     2.5  	    let
     2.6  	      val f_in = term_of f_in
     2.7 -	      val f_succ = get_pred_formula (pt, pos);
     2.8 +	      val f_succ = get_curr_formula (pt, pos);
     2.9  			in
    2.10  			  if f_succ = f_in
    2.11  			  then ("same-formula", cs) (* ctree not cut with replaceFormula *)
    2.12 @@ -693,7 +693,7 @@
    2.13  			        let
    2.14  			          val pos_pred = lev_back' pos
    2.15  			          (* f_pred ---"step pos cs"---> f_succ in appendFormula *)
    2.16 -			          val f_pred = get_pred_formula (pt, pos_pred)
    2.17 +			          val f_pred = get_curr_formula (pt, pos_pred)
    2.18  			          val msg_calcstate' = compare_step ([], [], (pt, pos_pred)) f_in (*<<=====*)
    2.19  			          (*last step re-calc in compare_step TODO before WN09*)
    2.20  			        in
    2.21 @@ -733,7 +733,7 @@
    2.22  
    2.23  fun find_fillpatterns (pt, pos as (p, _): pos') errpatID =
    2.24    let 
    2.25 -    val f_curr = get_pred_formula (pt, pos); (* = "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))"*)
    2.26 +    val f_curr = get_curr_formula (pt, pos); (* = "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))"*)
    2.27      val pp = par_pblobj pt p
    2.28  			    val {errpats, scr = Script prog, ...} = get_met (get_obj g_metID pt pp)
    2.29      val ScrState (env, _, _, _, _, _) = get_istate pt pos

     3.1 --- a/test/Tools/isac/Interpret/inform.sml	Mon May 21 16:56:01 2012 +0200
     3.2 +++ b/test/Tools/isac/Interpret/inform.sml	Tue May 22 07:00:53 2012 +0200
     3.3 @@ -1004,6 +1004,6 @@
     3.4  case some |> filter is_some |> map the of
     3.5    ("fill-d_d-arg",
     3.6    "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4)) =\nd_d x (x ^^^ 2) + cos (x ^^^ 4) * d_d x ?_dummy_1")
     3.7 -    :: _ => ()
     3.8 +   :: _ => ()
     3.9  | _ => error "get_fillpats changed"
    3.10