CVS: sml-dist/src/compiler/Elaborator/modules instantiate.sml, 1.4, 1.4.8.1 sigmatch.sml, 1.6, 1.6.8.1
David MacQueen <[email protected]>
| Newsgroups | gmane.comp.lang.sml.smlnj.commits |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/modules
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24436/src/compiler/Elaborator/modules
Modified Files:
Tag: primop-branch-2
instantiate.sml sigmatch.sml
Log Message:
update of InlInfo
Index: instantiate.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/modules/instantiate.sml,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -C2 -d -r1.4 -r1.4.8.1
*** instantiate.sml 15 Sep 2003 22:17:10 -0000 1.4
--- instantiate.sml 19 Jun 2006 22:29:00 -0000 1.4.8.1
***************
*** 49,53 ****
val tvi_exn : { depth: DebIndex.depth, num: int, kind: tkind } -> exn
- val ii2ty : II.ii -> Types.ty option
end
--- 49,52 ----
***************
*** 1867,1868 ****
--- 1866,1870 ----
end (* structure Instantiate *)
+ (* [dbm, 6/16/06] Eliminated ii2ty from INSTANTIATE_PARAM. Eventually want
+ to eliminate the parameterization completely. *)
+
Index: sigmatch.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/modules/sigmatch.sml,v
retrieving revision 1.6
retrieving revision 1.6.8.1
diff -C2 -d -r1.6 -r1.6.8.1
*** sigmatch.sml 15 Sep 2003 22:17:10 -0000 1.6
--- sigmatch.sml 19 Jun 2006 22:29:00 -0000 1.6.8.1
***************
*** 187,191 ****
*)
val insttys =
! case INS.Param.ii2ty dinfo of
SOME st =>
(let val (actinst', insttys') = TU.instantiatePoly st
--- 187,191 ----
*)
val insttys =
! case InlInfo.primopTy dinfo of
SOME st =>
(let val (actinst', insttys') = TU.instantiatePoly st
***************
*** 199,203 ****
val instbtvs = map TU.tyvarType insttys0
! (* should I use stys here instead, why insttys0 ? *)
in (insttys, instbtvs, specinst, res)
--- 199,203 ----
val instbtvs = map TU.tyvarType insttys0
! (* should I use stys here instead?, why insttys0? *)
in (insttys, instbtvs, specinst, res)
***************
*** 232,236 ****
*)
val insttys =
! case INS.Param.ii2ty dinfo of
SOME st =>
(let val (actinst', insttys') = TU.instantiatePoly st
--- 232,236 ----
*)
val insttys =
! case InlInfo.primopTy dinfo of
SOME st =>
(let val (actinst', insttys') = TU.instantiatePoly st