diff -r a474900d5bd2 -r 255c853ea2f0 test/Tools/isac/Knowledge/rateq.sml --- a/test/Tools/isac/Knowledge/rateq.sml Thu Dec 22 11:12:18 2016 +0100 +++ b/test/Tools/isac/Knowledge/rateq.sml Thu Dec 22 11:36:20 2016 +0100 @@ -92,7 +92,7 @@ val (p''',_,f,nxt''',_,pt''') = me nxt p [1] pt; f2str f = "[x = 1 / 5]"; case nxt of ("Check_elementwise", Check_elementwise "Assumptions") => () | _ => ((*not checked before*)); -"~~~~~ fun me, args:"; val (((_,tac):tac'_), (p:pos'), _, (pt:ptree)) = (nxt, p, c, pt); +"~~~~~ fun me, args:"; val (((_,tac):tac'_), (p:pos'), _, (pt:ctree)) = (nxt, p, c, pt); val (pt, p) = case locatetac tac (pt,p) of ("ok", (_, _, ptp)) => ptp | _ => error "--- solve (1/x = 5.. locatetac"; "~~~~~ fun step, args:"; val (ip as (_,p_), (ptp as (pt,p), tacis)) = (p, ((pt, e_pos'), [])) @@ -103,7 +103,7 @@ "~~~~~ fun nxt_solve_, args:"; val (ptp as (pt, pos as (p, p_))) = (pt, ip); val thy' = get_obj g_domID pt (par_pblobj pt p); val (srls, is, sc) = from_pblobj_or_detail' thy' (p,p_) pt; (*is: which ctxt?*) -"~~~~~ fun next_tac, args:"; val (thy, (ptp as (pt, pos as (p, _)):ptree * pos'), +"~~~~~ fun next_tac, args:"; val (thy, (ptp as (pt, pos as (p, _)):ctree * pos'), (sc as Prog (h $ body)), (ScrState (E,l,a,v,s,b), ctxt)) = ((thy',srls), (pt,pos), sc, is); "~~~~~ fun nstep_up, args:"; val (thy, ptp, (Prog sc), E, l, ay, a, v) = @@ -279,7 +279,7 @@ test --- 'trace_script' from outside 'fun me '--- *) val (pt''', p''') = (pt, p); -"~~~~~ fun me, args:"; val (((_,tac):tac'_), (p:pos'), _, (pt:ptree)) = (nxt, p, c, pt); +"~~~~~ fun me, args:"; val (((_,tac):tac'_), (p:pos'), _, (pt:ctree)) = (nxt, p, c, pt); val (pt, p) = case locatetac tac (pt,p) of ("ok", (_, _, ptp)) => ptp | _ => error "error in test setup"; "~~~~~ step, args:"; val (((ip as (_,p_)):pos'), ((ptp as (pt,p), tacis):calcstate)) = @@ -292,7 +292,7 @@ e_metID = get_obj g_metID pt (par_pblobj pt p); (* = false*) val thy' = get_obj g_domID pt (par_pblobj pt p); val (srls, is, sc) = from_pblobj_or_detail' thy' (p,p_) pt; -"~~~~~ fun next_tac, args:"; val (thy, (ptp as (pt, pos as (p, _)):ptree * pos'), +"~~~~~ fun next_tac, args:"; val (thy, (ptp as (pt, pos as (p, _)):ctree * pos'), (sc as Prog (h $ body)), (ScrState (E,l,a,v,s,b), ctxt)) = ((thy',srls), (pt,pos), sc, is); l = []; (* = false*) "~~~~~ and nstep_up, args:"; val (thy, ptp, (Prog sc), E, l, ay, a, v) =