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-3/compiler/Elaborator/modules/expandtycon.sml
ViewVC logotype

Diff of /sml/branches/primop-branch-3/compiler/Elaborator/modules/expandtycon.sml

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

revision 2570, Sat May 19 21:06:33 2007 UTC revision 2571, Sun May 20 15:12:54 2007 UTC
# Line 32  Line 32 
32  exception OUTER  exception OUTER
33    
34  (* ignoring FCTspec - won't find any types there *)  (* ignoring FCTspec - won't find any types there *)
35  fun lookEntVar(ev,(_,s as (M.TYCspec{entVar,...} | M.STRspec{entVar,...}))::rest) =  fun lookEntVar(ev,(_,s as (M.TYCspec{entVar,...} |
36                               M.STRspec{entVar,...}))::rest) =
37        if EP.eqEntVar(ev,entVar) then SOME s else lookEntVar(ev,rest)        if EP.eqEntVar(ev,entVar) then SOME s else lookEntVar(ev,rest)
38    | lookEntVar(ev,_::rest) = lookEntVar(ev,rest)    | lookEntVar(ev,_::rest) = lookEntVar(ev,rest)
39    | lookEntVar(ev,nil) = NONE    | lookEntVar(ev,nil) = NONE
# Line 48  Line 49 
49  fun expandTycon(tycon,context,entEnv) =  fun expandTycon(tycon,context,entEnv) =
50      let fun expandTycVar(ev,context as elements::outer) : T.tycon =      let fun expandTycVar(ev,context as elements::outer) : T.tycon =
51                (case lookEntVar(ev, elements)                (case lookEntVar(ev, elements)
52                   of SOME(M.TYCspec{spec,...}) =>                   of SOME(M.TYCspec{info=M.RegTycSpec{spec,...},...}) =>
53                       (case spec                       (case spec
54                          of T.GENtyc _ => spec                          of T.GENtyc _ => spec
55                           | T.DEFtyc{stamp,strict,path,tyfun} =>                           | T.DEFtyc{stamp,strict,path,tyfun} =>

Legend:
Removed from v.2570  
changed lines
  Added in v.2571

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