Mercurial > urweb
diff src/expl_rename.sml @ 1991:7db8356caef5
Tweaked parameter renaming for functors, so now demos and the original bug-triggering application work
author | Adam Chlipala <adam@chlipala.net> |
---|---|
date | Thu, 20 Feb 2014 15:50:33 -0500 |
parents | 7bd2ecf96bb0 |
children | 403f0cc65b9c |
line wrap: on
line diff
--- a/src/expl_rename.sml Thu Feb 20 10:48:17 2014 -0500 +++ b/src/expl_rename.sml Thu Feb 20 15:50:33 2014 -0500 @@ -422,6 +422,20 @@ val (st, n) = St.bind (st, FormalId) val (ds, st) = ListUtil.foldlMapConcat dupDecl st ds + + (* Revenge of the functor parameter renamer! + * See comment in elaborate.sml for the start of the saga. + * We need to alpha-rename the argument to allow sufficient shadowing in the body. *) + + fun mungeName m = + if List.exists (fn (DStr (x, _, _, _), _) => x = m + | _ => false) ds then + mungeName ("?" ^ m) + else + m + + val FormalName = mungeName FormalName + val ds = (DStr (FormalName, n, (SgnConst [], loc), (StrVar FormalId, loc)), loc) :: ds in (St.next st, (StrConst ds, loc))