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/SMLNJ/src/compiler/TopLevel/bootstrap/boot.sml
ViewVC logotype

Diff of /sml/branches/SMLNJ/src/compiler/TopLevel/bootstrap/boot.sml

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

revision 166, Sat Nov 7 20:11:41 1998 UTC revision 167, Sat Nov 7 20:11:41 1998 UTC
# Line 8  Line 8 
8      val bootEnv: unit -> Environment.environment      val bootEnv: unit -> Environment.environment
9  end  end
10    
11  functor BootEnvF (structure VC: VISCOMP  functor BootEnvF (structure BF: BINFILE
12                      val architecture: string
13                    val setRetargetPervStatEnv: CMStaticEnv.staticEnv -> unit                    val setRetargetPervStatEnv: CMStaticEnv.staticEnv -> unit
14                    val cmbmake: string -> unit) :> BOOTENV = struct                    val cmbmake: string -> unit) :> BOOTENV = struct
15    
16      exception BootFailure      exception BootFailure
17    
18      structure Env = Environment      structure Env = Environment
     structure BF = VC.Binfile  
19      structure CMS = CMStaticEnv      structure CMS = CMStaticEnv
20      structure SE = StaticEnv      structure SE = StaticEnv
21      structure DynE = DynamicEnv      structure DynE = DynamicEnv
# Line 107  Line 107 
107          fun (st1, sy1) // (st2, sy2) =          fun (st1, sy1) // (st2, sy2) =
108              (CMS.atop (st1, st2), Env.layerSymbolic (sy1, sy2))              (CMS.atop (st1, st2), Env.layerSymbolic (sy1, sy2))
109    
110          (* magic file names *)          local
111          val assembly_sig = "assembly.sig.bin"              fun pb x =
112          val dummy_sml = "dummy.sml.bin"                  OS.Path.toString { isAbs = false, vol = "",
113          val core_sml = "core.sml.bin"                                     arcs = ["PervEnv", "Boot", x] }
114            in
115                (* magic file names -- live in PervEnv/Boot *)
116                val assembly_sig = pb "assembly.sig.bin"
117                val dummy_sml = pb "dummy.sml.bin"
118                val core_sml = pb "core.sml.bin"
119            end
120    
121          val emptysym = Env.symbolicPart Env.emptyEnv          val emptysym = Env.symbolicPart Env.emptyEnv
122    
# Line 250  Line 256 
256    
257          val (bootdir, newbindir, ereq) =          val (bootdir, newbindir, ereq) =
258              bootArgs (SMLofNJ.getAllArgs (),              bootArgs (SMLofNJ.getAllArgs (),
259                        "bin." ^ VC.architecture, NONE, NORMAL)                        "bin." ^ architecture, NONE, NORMAL)
260          val bootdir = OS.Path.mkCanonical bootdir          val bootdir = OS.Path.mkCanonical bootdir
261          val newbindir = Option.map OS.Path.mkCanonical newbindir          val newbindir = Option.map OS.Path.mkCanonical newbindir
262    

Legend:
Removed from v.166  
changed lines
  Added in v.167

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