1.1 --- a/test/Tools/isac/Minisubpbl/700-interSteps.sml	Thu Nov 21 15:31:32 2019 +0100
     1.2 +++ b/test/Tools/isac/Minisubpbl/700-interSteps.sml	Mon Nov 25 16:39:52 2019 +0100
     1.3 @@ -151,8 +151,8 @@
     1.4    = (xxx, (ist |> path_down [R]), e);
     1.5  
     1.6    val (a', Program.Tac stac) =
     1.7 -  (*case*) handle_leaf "next  " th sr (get_subst ist) t (*of*);
     1.8 -"~~~~~ fun handle_leaf , args:"; val (call, thy, srls, (E, (a, v)), t)
     1.9 +  (*case*) interpret_leaf "next  " th sr (get_subst ist) t (*of*);
    1.10 +"~~~~~ fun interpret_leaf , args:"; val (call, thy, srls, (E, (a, v)), t)
    1.11    = ("next  ", th, sr, (get_subst ist), t);
    1.12  
    1.13  (*+*)val [(Free ("t_t", Tt_t), Const ("HOL.eq", _) $ (Const ("Groups.plus_class.plus", _) $ Free ("-1", _) $ Free ("x", _)) $ Free ("0", _)),
    1.14 @@ -164,11 +164,11 @@
    1.15  
    1.16  (*+*)val SOME (Const ("empty", Ta)) = a;
    1.17  (*+*)val Type ("'a", []) = Ta;
    1.18 -(*+*)if term2str v = "x = 0 + -1 * -1" then () else error "handle_leaf changed";
    1.19 +(*+*)if term2str v = "x = 0 + -1 * -1" then () else error "interpret_leaf changed";
    1.20  (*+*)val Type ("Real.real", []) = Tv;
    1.21  
    1.22 -    (*case*) Prog_Tac.subst_stacexpr E a v t (*of*);
    1.23 -"~~~~~ fun subst_stacexpr , args:"; val (E, a, v, (t as (*2*)(Const ("Prog_Tac.Rewrite'_Inst", _) $ _ $ _)))
    1.24 +    (*case*) Prog_Tac.eval_leaf E a v t (*of*);
    1.25 +"~~~~~ fun eval_leaf , args:"; val (E, a, v, (t as (*2*)(Const ("Prog_Tac.Rewrite'_Inst", _) $ _ $ _)))
    1.26    = (E, a, v, t);
    1.27  
    1.28  (*+*)val [(Free ("t_t", Tt_t), Const ("HOL.eq", _) $ (Const ("Groups.plus_class.plus", _) $ Free ("-1", _) $ Free ("x", _)) $ Free ("0", _)),
    1.29 @@ -185,12 +185,12 @@
    1.30  
    1.31      val SOME a' = (*case*) a (*of*);
    1.32  
    1.33 -"~~~~~ from subst_stacexpr to handle_leaf return val:"; val (a', Program.Tac stac) =
    1.34 +"~~~~~ from eval_leaf to interpret_leaf return val:"; val (a', Program.Tac stac) =
    1.35    ((a, Program.Tac (subst_atomic E (t $ a'))));
    1.36 -  val stac' = Rewrite.eval_listexpr_ (Celem.assoc_thy thy) srls (subst_atomic (update_opt E (a,v)) stac)
    1.37 +  val stac' = Rewrite.eval_prog_expr (Celem.assoc_thy thy) srls (subst_atomic (update_opt E (a,v)) stac)
    1.38    (*------------------------------------------- HERE IS A SECOND subst_atomic ?!?*)
    1.39  ;
    1.40 -"~~~~~ from handle_leaf to scan_dn2 return val:"; val (a', Program.Tac stac) = (a', Program.Tac stac);
    1.41 +"~~~~~ from interpret_leaf to scan_dn2 return val:"; val (a', Program.Tac stac) = (a', Program.Tac stac);
    1.42    val (m,m') = (stac2tac_ : ctree -> theory -> term -> input * T) pt (Celem.assoc_thy th) stac;
    1.43    case m of
    1.44  (**)Rewrite_Inst ([_(*"(''bdv'', x)"*)], ("risolate_bdv_add", _)) => ();