Mercurial > urweb
changeset 1704:21ecf340f05c
Fix defunctorization of modules containing datatype definitions
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Thu, 29 Mar 2012 09:55:04 -0400 |
| parents | 6f2f74cc4ead |
| children | d29d39d93820 |
| files | src/corify.sml tests/dtfunctor.ur |
| diffstat | 2 files changed, 32 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/corify.sml Fri Mar 16 08:42:51 2012 -0400 +++ b/src/corify.sml Thu Mar 29 09:55:04 2012 -0400 @@ -1,4 +1,4 @@ -(* Copyright (c) 2008-2010, Adam Chlipala +(* Copyright (c) 2008-2012, Adam Chlipala * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -91,7 +91,8 @@ val lookupConById : t -> int -> int option val lookupConByName : t -> string -> core_con - val bindConstructor : t -> string -> int -> L'.patCon -> t + val bindConstructor : t -> string -> int -> t * int + val bindConstructorAs : t -> string -> int -> L'.patCon -> t val lookupConstructorByNameOpt : t -> string -> L'.patCon option val lookupConstructorByName : t -> string -> L'.patCon val lookupConstructorById : t -> int -> L'.patCon @@ -100,7 +101,7 @@ ENormal of int | EFfi of string * L'.con val bindVal : t -> string -> int -> t * int - val bindConstructorVal : t -> string -> int -> t + val bindConstructorVal : t -> string -> int -> int -> t val lookupValById : t -> int -> int option val lookupValByName : t -> string -> core_val @@ -241,7 +242,7 @@ n') end -fun bindConstructorVal {basis, cons, constructors, vals, strs, funs, current, nested} s n = +fun bindConstructorVal {basis, cons, constructors, vals, strs, funs, current, nested} s n n' = let val current = case current of @@ -250,14 +251,14 @@ FNormal {name = name, cons = cons, constructors = constructors, - vals = SM.insert (vals, s, n), + vals = SM.insert (vals, s, n'), strs = strs, funs = funs} in {basis = basis, cons = cons, constructors = constructors, - vals = IM.insert (vals, n, n), + vals = IM.insert (vals, n, n'), strs = strs, funs = funs, current = current, @@ -278,7 +279,7 @@ NONE => raise Fail ("Corify.St.lookupValByName " ^ String.concatWith "." (rev name) ^ "." ^ x) | SOME n => ENormal n -fun bindConstructor {basis, cons, constructors, vals, strs, funs, current, nested} s n n' = +fun bindConstructorAs {basis, cons, constructors, vals, strs, funs, current, nested} s n c' = let val current = case current of @@ -286,14 +287,14 @@ | FNormal {name, cons, constructors, vals, strs, funs} => FNormal {name = name, cons = cons, - constructors = SM.insert (constructors, s, n'), + constructors = SM.insert (constructors, s, c'), vals = vals, strs = strs, funs = funs} in {basis = basis, cons = cons, - constructors = IM.insert (constructors, n, n'), + constructors = IM.insert (constructors, n, c'), vals = vals, strs = strs, funs = funs, @@ -301,6 +302,14 @@ nested = nested} end +fun bindConstructor st s n = + let + val n' = alloc () + val c' = L'.PConVar n' + in + (bindConstructorAs st s n c', n') + end + fun lookupConstructorById ({constructors, ...} : t) n = case IM.find (constructors, n) of NONE => raise Fail "Corify.St.lookupConstructorById" @@ -642,11 +651,11 @@ val (xncs, st) = ListUtil.foldlMap (fn ((x, n, co), st) => let - val st = St.bindConstructor st x n (L'.PConVar n) - val st = St.bindConstructorVal st x n + val (st, n') = St.bindConstructor st x n + val st = St.bindConstructorVal st x n n' val co = Option.map (corifyCon st) co in - ((x, n, co), st) + ((x, n', co), st) end) st xncs val dk = ElabUtil.classifyDatatype xncs @@ -695,7 +704,7 @@ val (xncs, st) = ListUtil.foldlMap (fn ((x, n, co), st) => let val n' = St.lookupConstructorByName inner x - val st = St.bindConstructor st x n n' + val st = St.bindConstructorAs st x n n' val (st, n) = St.bindVal st x n val co = Option.map (corifyCon st) co in @@ -884,7 +893,7 @@ (SM.insert (cmap, x', wrapT tf), d) end - val st = St.bindConstructor st x' n pc + val st = St.bindConstructorAs st x' n pc val conmap = SM.insert (conmap, x', (x, xs, to, dk))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/dtfunctor.ur Thu Mar 29 09:55:04 2012 -0400 @@ -0,0 +1,9 @@ +functor Make(M : sig end) = struct + datatype t = A | B +end + +structure A = Make(struct end) +structure B = Make(struct end) + +fun main (x : A.t) (y : B.t) : transaction page = + return <xml/>