1.1 --- a/src/Tools/isac/Interpret/script.sml Thu Mar 08 14:33:34 2012 +0100
1.2 +++ b/src/Tools/isac/Interpret/script.sml Sat Mar 10 09:41:09 2012 +0100
1.3 @@ -1068,22 +1068,17 @@
1.4
1.5 | ass_up (ysa as (y,ctxt,s,Script sc,d)) (is as (E,l,a,v,S,b),ss)
1.6 (Const ("Script.Seq",_) $ _ ) = (*2*: comes from e1, goes to e2*)
1.7 - (* val ((ysa as (y,s,Script sc,d)), (is as (E,l,a,v,S,b),ss),
1.8 - (Const ("Script.Seq",_) $ _ )) =
1.9 - (ys, ((E,up,a,v,S,b),ss), (go up sc));
1.10 - *)
1.11 - let val up = drop_last l;
1.12 - val Const ("Script.Seq",_) $ _ $ e2 = go up sc
1.13 - (*val _= tracing("### ass_up Seq$e: is=")
1.14 - val _= tracing(istate2str (ScrState is))*)
1.15 - in case assy (y,ctxt,s,d,Aundef) ((E, up@[R], a,v,S,b),ss) e2 of
1.16 - NasNap (v,E) => astep_up ysa ((E,up,a,v,S,b),ss)
1.17 - | NasApp iss => astep_up ysa iss
1.18 - | ay => ay end
1.19 + let
1.20 + val up = drop_last l;
1.21 + val Const ("Script.Seq",_) $ _ $ e2 = go up sc
1.22 + (*val _= tracing("### ass_up Seq$e: is=")
1.23 + val _= tracing(istate2str (ScrState is))*)
1.24 + in
1.25 + case assy (y,ctxt,s,d,Aundef) ((E, up@[R], a,v,S,b),ss) e2 of
1.26 + NasNap (v,E) => astep_up ysa ((E,up,a,v,S,b),ss)
1.27 + | NasApp iss => astep_up ysa iss
1.28 + | ay => ay end
1.29
1.30 - (* val (ysa, iss, (Const ("Script.Try",_) $ e $ _)) =
1.31 - (ys, ((E,up,a,v,S,b),ss), (go up sc));
1.32 - *)
1.33 | ass_up ysa iss (Const ("Script.Try",_) $ e $ _) =
1.34 astep_up ysa iss
1.35