Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml/branches/primop-branch-2/src/compiler/ElabData/modules/moduleutil.sml
ViewVC logotype

Diff of /sml/branches/primop-branch-2/src/compiler/ElabData/modules/moduleutil.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1983, Tue Jul 18 14:15:36 2006 UTC revision 1984, Tue Jul 18 14:39:28 2006 UTC
# Line 195  Line 195 
195                     of SIGINFO ep => SIGINFO (entVar::ep)                     of SIGINFO ep => SIGINFO (entVar::ep)
196                      | STRINFO ({entities,...}, dacc, dinfo) =>                      | STRINFO ({entities,...}, dacc, dinfo) =>
197                        (print ("getStrElem " ^ (Int.toString slot) ^ "\n");                        (print ("getStrElem " ^ (Int.toString slot) ^ "\n");
198                           print ("dacc: " ^ A.prAcc dacc ^ "\n");
199                         PrimOpId.ppStrInfo dinfo;                         PrimOpId.ppStrInfo dinfo;
200                        STRINFO(EE.lookStrEnt(entities,entVar),                        STRINFO(EE.lookStrEnt(entities,entVar),
201                                A.selAcc(dacc,slot), POI.selStrPrimId (dinfo, slot)))                                A.selAcc(dacc,slot), POI.selStrPrimId (dinfo, slot)))
# Line 253  Line 254 
254    | mkVal _ = V.VAL(V.ERRORvar)    | mkVal _ = V.VAL(V.ERRORvar)
255    
256  fun mkStrBase (sym, sign, sInfo) =  fun mkStrBase (sym, sign, sInfo) =
257    let val (newsig, newInfo) = getStrElem (sym, sign, sInfo)    let val _ = print "### mkStrBase\n"
258          val (newsig, newInfo) = getStrElem (sym, sign, sInfo)
259     in case newsig     in case newsig
260         of ERRORsig => ERRORstr         of ERRORsig => ERRORstr
261          | _ =>          | _ =>
# Line 267  Line 269 
269  fun mkStr (sym, _, sign, sInfo) = mkStrBase (sym, sign, sInfo)  fun mkStr (sym, _, sign, sInfo) = mkStrBase (sym, sign, sInfo)
270    
271  fun mkStrDef (sym, _, sign, sInfo) =  fun mkStrDef (sym, _, sign, sInfo) =
272    let val (newsig, newInfo) = getStrElem (sym, sign, sInfo)    let val _ = print "### mkStrDef\n"
273          val (newsig, newInfo) = getStrElem (sym, sign, sInfo)
274     in case newsig     in case newsig
275          of ERRORsig => CONSTstrDef ERRORstr          of ERRORsig => CONSTstrDef ERRORstr
276           | _ =>           | _ =>
# Line 281  Line 284 
284  fun mkFct (sym, sp, sign, sInfo) = getFctElem (sym, sign, sInfo)  fun mkFct (sym, sp, sign, sInfo) = getFctElem (sym, sign, sInfo)
285    
286  fun getPath makeIt (str, SP.SPATH spath, fullsp) =  fun getPath makeIt (str, SP.SPATH spath, fullsp) =
287    let fun loop([sym], sign, sInfo) = makeIt (sym, fullsp, sign, sInfo)    let val _ = print "### getPath\n"
288          fun loop([sym], sign, sInfo) = makeIt (sym, fullsp, sign, sInfo)
289          | loop(sym::rest, sign, sInfo) =          | loop(sym::rest, sign, sInfo) =
290              let val (newsig, newsInfo) = getStrElem (sym, sign, sInfo)              let val (newsig, newsInfo) = getStrElem (sym, sign, sInfo)
291               in loop(rest, newsig, newsInfo)               in loop(rest, newsig, newsInfo)
# Line 443  Line 447 
447    | getBinding _ = bug "getBinding - bad arg"    | getBinding _ = bug "getBinding - bad arg"
448    
449  fun openStructure (env: SE.staticEnv, str) =  fun openStructure (env: SE.staticEnv, str) =
450    let fun look sym =    let val _ = print "### openStructure\n"
451          fun look sym =
452            getBinding (sym,str) handle Unbound _ => raise SE.Unbound            getBinding (sym,str) handle Unbound _ => raise SE.Unbound
453        val symbols = getStrSymbols str        val symbols = getStrSymbols str
454        val genSyms = (fn () => symbols)        val genSyms = (fn () => symbols)

Legend:
Removed from v.1983  
changed lines
  Added in v.1984

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0