comparison src/expl_env.sml @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents 403f0cc65b9c
children
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
344 pushENamed env x n t 344 pushENamed env x n t
345 end 345 end
346 | DTask _ => env 346 | DTask _ => env
347 | DPolicy _ => env 347 | DPolicy _ => env
348 | DOnError _ => env 348 | DOnError _ => env
349 | DFfi (x, n, _, t) => pushENamed env x n t
349 350
350 fun sgiBinds env (sgi, loc) = 351 fun sgiBinds env (sgi, loc) =
351 case sgi of 352 case sgi of
352 SgiConAbs (x, n, k) => pushCNamed env x n k NONE 353 SgiConAbs (x, n, k) => pushCNamed env x n k NONE
353 | SgiCon (x, n, k, c) => pushCNamed env x n k (SOME c) 354 | SgiCon (x, n, k, c) => pushCNamed env x n k (SOME c)