src/Tools/isac/Frontend/states.sml
changeset 59276 56dc790071cb
parent 59265 ee68ccda7977
child 59279 255c853ea2f0
     1.1 --- a/src/Tools/isac/Frontend/states.sml	Wed Dec 21 11:27:22 2016 +0100
     1.2 +++ b/src/Tools/isac/Frontend/states.sml	Thu Dec 22 10:25:49 2016 +0100
     1.3 @@ -143,7 +143,7 @@
     1.4    (calcID *            (* the id unique for a calculation                               *)
     1.5      (Chead.calcstate * (* the interpreter state                                         *) 
     1.6        (iterID *        (* 1 sets the 'active formula': a calc. can have several visitors*)
     1.7 -        pos'           (* for iterator of a user                                        *)
     1.8 +        Ctree.pos'     (* for iterator of a user                                        *)
     1.9        (* TODO iterID * pos' should go to java-frontend                                  *)
    1.10    ) list)) list);
    1.11  
    1.12 @@ -184,7 +184,7 @@
    1.13  *)
    1.14  (* add users to a calcstate *)
    1.15  fun get_iterID (cI:calcID) 
    1.16 -	       (p:(calcID * (Chead.calcstate * (iterID * pos') list)) list) = 
    1.17 +	       (p:(calcID * (Chead.calcstate * (iterID * Ctree.pos') list)) list) = 
    1.18    case assoc (p, cI) of
    1.19      NONE => error ("get_iterID: no iterID " ^ (string_of_int cI))
    1.20    | SOME (_, us) => (new_key us 1):iterID;
    1.21 @@ -310,7 +310,7 @@
    1.22  fun upd_ipos (uI:iterID) (pI:calcID) (ip:pos') =
    1.23     let val (_, calc) = get_state uI pI 
    1.24     in states:= overwrite2 ((!states), ((uI, pI), (ip, calc))) end;*)
    1.25 -fun upd_ipos (cI:calcID) (uI:iterID) (ip:pos') = Synchronized.change states
    1.26 +fun upd_ipos (cI:calcID) (uI:iterID) (ip: Ctree.pos') = Synchronized.change states
    1.27          (fn s => case assoc (s, cI) of 
    1.28  	          NONE =>
    1.29  	            error ("upd_ipos: calctree " ^ (string_of_int cI) ^ " not existent")
    1.30 @@ -350,7 +350,7 @@
    1.31            | SOME (cs, us) =>
    1.32  	            let
    1.33                  val new_uI = new_key us 1
    1.34 -	            in (new_uI:iterID, overwrite2 (s, ((cI, new_uI), e_pos'))) end);
    1.35 +	            in (new_uI:iterID, overwrite2 (s, ((cI, new_uI), Ctree.e_pos'))) end);
    1.36  
    1.37  (*///10.10.
    1.38  fun del_calc (uI:iterID) (pI:calcID) =