diff -r 2423f0fbdd08 -r 56dc790071cb src/Tools/isac/Frontend/states.sml --- a/src/Tools/isac/Frontend/states.sml Wed Dec 21 11:27:22 2016 +0100 +++ b/src/Tools/isac/Frontend/states.sml Thu Dec 22 10:25:49 2016 +0100 @@ -143,7 +143,7 @@ (calcID * (* the id unique for a calculation *) (Chead.calcstate * (* the interpreter state *) (iterID * (* 1 sets the 'active formula': a calc. can have several visitors*) - pos' (* for iterator of a user *) + Ctree.pos' (* for iterator of a user *) (* TODO iterID * pos' should go to java-frontend *) ) list)) list); @@ -184,7 +184,7 @@ *) (* add users to a calcstate *) fun get_iterID (cI:calcID) - (p:(calcID * (Chead.calcstate * (iterID * pos') list)) list) = + (p:(calcID * (Chead.calcstate * (iterID * Ctree.pos') list)) list) = case assoc (p, cI) of NONE => error ("get_iterID: no iterID " ^ (string_of_int cI)) | SOME (_, us) => (new_key us 1):iterID; @@ -310,7 +310,7 @@ fun upd_ipos (uI:iterID) (pI:calcID) (ip:pos') = let val (_, calc) = get_state uI pI in states:= overwrite2 ((!states), ((uI, pI), (ip, calc))) end;*) -fun upd_ipos (cI:calcID) (uI:iterID) (ip:pos') = Synchronized.change states +fun upd_ipos (cI:calcID) (uI:iterID) (ip: Ctree.pos') = Synchronized.change states (fn s => case assoc (s, cI) of NONE => error ("upd_ipos: calctree " ^ (string_of_int cI) ^ " not existent") @@ -350,7 +350,7 @@ | SOME (cs, us) => let val new_uI = new_key us 1 - in (new_uI:iterID, overwrite2 (s, ((cI, new_uI), e_pos'))) end); + in (new_uI:iterID, overwrite2 (s, ((cI, new_uI), Ctree.e_pos'))) end); (*///10.10. fun del_calc (uI:iterID) (pI:calcID) =