CVS: sml-dist/src/compiler/ElabData/modules moduleutil.sig, 1.2, 1.2.20.1 moduleutil.sml, 1.2, 1.2.20.1
David MacQueen <[email protected]> Tue, 20 Jun 2006 15:15:27 -0700
| Newsgroups | gmane.comp.lang.sml.smlnj.commits |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/smlnj/sml-dist/src/compiler/ElabData/modules
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6779/src/compiler/ElabData/modules
Modified Files:
Tag: primop-branch-2
moduleutil.sig moduleutil.sml
Log Message:
further primop changes
Index: moduleutil.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/modules/moduleutil.sig,v
retrieving revision 1.2
retrieving revision 1.2.20.1
diff -C2 -d -r1.2 -r1.2.20.1
*** moduleutil.sig 20 Aug 2001 19:34:03 -0000 1.2
--- moduleutil.sig 20 Jun 2006 22:15:23 -0000 1.2.20.1
***************
*** 17,25 ****
val getStr : Modules.elements * Modules.entityEnv
! * Symbol.symbol * Access.access * II.ii
-> Modules.Structure * EntPath.entVar
val getFct : Modules.elements * Modules.entityEnv
! * Symbol.symbol * Access.access * II.ii
-> Modules.Functor * EntPath.entVar
--- 17,25 ----
val getStr : Modules.elements * Modules.entityEnv
! * Symbol.symbol * Access.access * InlInfo.inl_info
-> Modules.Structure * EntPath.entVar
val getFct : Modules.elements * Modules.entityEnv
! * Symbol.symbol * Access.access * InlInfo.inl_info
-> Modules.Functor * EntPath.entVar
***************
*** 69,73 ****
(*** extract inl_info from a list of bindings *)
! val extractInfo : Bindings.binding -> II.ii
val getSigSymbols: Modules.Signature -> Symbol.symbol list
--- 69,73 ----
(*** extract inl_info from a list of bindings *)
! val extractInfo : Bindings.binding -> InlInfo.inl_info
val getSigSymbols: Modules.Signature -> Symbol.symbol list
Index: moduleutil.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/modules/moduleutil.sml,v
retrieving revision 1.2
retrieving revision 1.2.20.1
diff -C2 -d -r1.2 -r1.2.20.1
*** moduleutil.sml 20 Aug 2001 19:34:03 -0000 1.2
--- moduleutil.sml 20 Jun 2006 22:15:23 -0000 1.2.20.1
***************
*** 8,11 ****
--- 8,12 ----
structure SP = SymPath
structure IP = InvPath
+ structure II = InlInfo
structure CVP = ConvertPaths
structure EP = EntPath
***************
*** 79,83 ****
of STRent entity =>
(STR{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
! info = II.sel (dinfo, slot)},
entVar)
| _ => bug "getStr: bad entity")
--- 80,84 ----
of STRent entity =>
(STR{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
! info = II.selStrInfo (dinfo, slot)},
entVar)
| _ => bug "getStr: bad entity")
***************
*** 91,95 ****
of FCTent entity =>
(FCT{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
! info = II.sel (dinfo, slot)},
entVar)
| _ => bug "getFct: bad entity")
--- 92,96 ----
of FCTent entity =>
(FCT{sign = sign, rlzn = entity, access = A.selAcc(dacc,slot),
! info = II.selStrInfo (dinfo, slot)},
entVar)
| _ => bug "getFct: bad entity")
***************
*** 115,119 ****
rlzn = EE.lookStrEnt(entities,entVar),
access = A.selAcc(access, slot),
! info = II.sel (info, slot)})
| _ => NONE)
elements
--- 116,120 ----
rlzn = EE.lookStrEnt(entities,entVar),
access = A.selAcc(access, slot),
! info = II.selStrInfo (info, slot)})
| _ => NONE)
elements
***************
*** 175,179 ****
| strDefToStr(VARstrDef(sign,entPath), entEnv) =
STR{sign=sign,rlzn=EE.lookStrEP(entEnv,entPath),
! access=A.nullAcc, info=II.Null}
(*
--- 176,180 ----
| strDefToStr(VARstrDef(sign,entPath), entEnv) =
STR{sign=sign,rlzn=EE.lookStrEP(entEnv,entPath),
! access=A.nullAcc, info=II.nullInfo}
(*
***************
*** 183,189 ****
*)
datatype strInfo = SIGINFO of EP.entPath (* reverse order! *)
! | STRINFO of strEntity * A.access * II.ii
! val bogusInfo = STRINFO (bogusStrEntity, A.nullAcc, II.Null)
fun getStrElem (sym, sign as SIG {elements,...}, sInfo) =
--- 184,190 ----
*)
datatype strInfo = SIGINFO of EP.entPath (* reverse order! *)
! | STRINFO of strEntity * A.access * InlInfo.inl_info
! val bogusInfo = STRINFO (bogusStrEntity, A.nullAcc, II.nullInfo)
fun getStrElem (sym, sign as SIG {elements,...}, sInfo) =
***************
*** 195,199 ****
| STRINFO ({entities,...}, dacc, dinfo) =>
STRINFO(EE.lookStrEnt(entities,entVar),
! A.selAcc(dacc,slot), II.sel (dinfo, slot))
in (subsig, newInfo)
end)
--- 196,200 ----
| STRINFO ({entities,...}, dacc, dinfo) =>
STRINFO(EE.lookStrEnt(entities,entVar),
! A.selAcc(dacc,slot), II.selStrInfo (dinfo, slot))
in (subsig, newInfo)
end)
***************
*** 208,212 ****
FCT{sign=subfsig, rlzn=EE.lookFctEnt(entities,entVar),
access=A.selAcc(dacc, slot),
! info=II.sel (dinfo, slot)}
| _ => bug "mkFctVar - bad spec")
--- 209,213 ----
FCT{sign=subfsig, rlzn=EE.lookFctEnt(entities,entVar),
access=A.selAcc(dacc, slot),
! info=II.selStrInfo (dinfo, slot)}
| _ => bug "mkFctVar - bad spec")
***************
*** 232,236 ****
VALspec{spec,slot} =>
V.VAL(V.VALvar{access = A.selAcc(dacc,slot),
! info = II.sel (dinfo, slot),
path = sp,
typ = ref(transType entities spec)})
--- 233,237 ----
VALspec{spec,slot} =>
V.VAL(V.VALvar{access = A.selAcc(dacc,slot),
! info = II.selStrInfo (dinfo, slot),
path = sp,
typ = ref(transType entities spec)})
***************
*** 453,457 ****
| extractInfo(B.FCTbind (M.FCT { info, ... })) = info
| extractInfo(B.VALbind (V.VALvar {info, ...})) = info
! | extractInfo(B.CONbind _) = II.Null
| extractInfo _ = bug "unexpected binding in extractInfo"
--- 454,458 ----
| extractInfo(B.FCTbind (M.FCT { info, ... })) = info
| extractInfo(B.VALbind (V.VALvar {info, ...})) = info
! | extractInfo(B.CONbind _) = II.nullInfo
| extractInfo _ = bug "unexpected binding in extractInfo"