flexible support for source unit names based on mlb-file hashing - is…

…sue #97

src/Manager/IntModules.sml

@@ -26,6 +26,9 @@ functor IntModules(structure ManagerObjects : MANAGER_OBJECTS0
     type ElabEnv = ManagerObjects.ElabEnv
     type ElabBasis = ManagerObjects.ElabBasis
 
+    infix |>
+    fun x |> f = f x
+
     fun die s = Crash.impossible ("IntModules." ^ s)
     fun print_error_report report = Report.print' report (!Flags.log)
     fun log (s:string) : unit = TextIO.output (!Flags.log, s)
@@ -458,8 +461,16 @@ functor IntModules(structure ManagerObjects : MANAGER_OBJECTS0
 	      fun reuse_msg s = (print("[cannot reuse instance code for functor `"
 				       ^ FunId.pr_FunId funid ^ "' -- " ^ s ^ "]\n"); NONE)
 
+              (* remove prefix hash value from the absprjid string *)
+              val src_name =
+                  ModuleEnvironments.absprjid_to_string absprjid
+               |> Substring.full
+               |> Substring.splitl (fn c => c = #"-")
+               |> #2
+               |> Substring.string
+
 	      val _ = print("[compiling body of functor " ^ FunId.pr_FunId funid ^
-			    " (from project " ^ ModuleEnvironments.absprjid_to_string absprjid ^ ") begin]\n")
+			    " (from source " ^ src_name ^ ") begin]\n")
 (* 	      val _ = out_functor_application (FunId.pr_FunId funid)  (* for statistics *) *)
 
 	      val _ = chat "[recreating functor body begin...]"

src/Manager/manager.mlb

@@ -19,30 +19,29 @@ in
      MODCODE_MINI.sml
   end
 
-  local open Basics 
-  in INT_MODULES.sml 
+  local open Basics
+  in INT_MODULES.sml
      MANAGER.sig
   end
 
   local open Pickle CompilerObjects
-  in local open Tools 
-     in ../Compiler/COMPILE_BASIS.sml 
+  in local open Tools
+     in ../Compiler/COMPILE_BASIS.sml
      end
      local open SyntaxObjects Basics
      in EXECUTION.sml
      end
   end
 
-  ../Common/MD5.sml
+  ../Common/md5.mlb
 
   local open Pickle Tools Basics CompilerObjects
-  in local open SyntaxObjects Environment 
+  in local open SyntaxObjects Environment
      in ManagerObjects0.sml
 	ManagerObjects.sml
         local open Edlib in IntModules.sml end
-     end     
+     end
      Scriptlet.sml
      local open Edlib SyntaxObjects MlbMake in Manager.sml end
   end
 end
-

src/Tools/MlbMake/MLB_PLUGIN.sml

@@ -15,7 +15,6 @@ signature MLB_PLUGIN =
 	        -> {mlbfile: string,
 	            target: string,
 	            lnkFiles: string list,
-	            lnkFilesScripts: string list,
 	            flags: string}
 	        -> unit
 

src/Tools/MlbMake/MLB_PROJECT.sml

@@ -1,9 +1,9 @@
 signature MLB_PROJECT =
 sig
-  structure MS : 
+  structure MS :
     sig
-      structure Bid : 
-        sig 
+      structure Bid :
+        sig
           eqtype bid and longbid
           val bid : string -> bid
           val longbid : bid list -> longbid
@@ -12,37 +12,36 @@ sig
           val pp_longbid : longbid -> string
         end
 
-      type atbdec = string (* path.{sml,sig} *) 
+      type atbdec = string (* path.{sml,sig} *)
 
       datatype bexp = BASbexp of bdec
                     | LETbexp of bdec * bexp
                     | LONGBIDbexp of Bid.longbid
-                                     
+
            and bdec = SEQbdec of bdec * bdec
-	            | EMPTYbdec 
+	            | EMPTYbdec
                     | LOCALbdec of bdec * bdec
                     | BASISbdec of Bid.bid * bexp
                     | OPENbdec of Bid.longbid list
 	            | ATBDECbdec of atbdec
-		    | MLBFILEbdec of string * string option  (* path.mlb <scriptpath p> *)		          
-		    | SCRIPTSbdec of atbdec list
+		    | MLBFILEbdec of string
 	            | ANNbdec of string * bdec
     end
 
     (* scriptpath p is optional in MLBFILEbdec; only useful in the context of
      * SMLserver as SCRIPTSbdec. *)
-    
-  val parse : string -> MS.bdec 
-  (* [parse mlbfile] parses a basis file mlbfile. Prints an 
+
+  val parse : string -> MS.bdec * string
+  (* [parse mlbfile] parses a basis file mlbfile. Also returns a hash. Prints an
    * error message and raises Fail on error. *)
 
-  val depDir : string ref  
-  (* The directory in which dependency files are stored; the 
-   * default is "PM" *)
+  val depDir : string ref
+  (* The directory in which dependency files are stored; the
+   * default is "MLB" *)
 
-  val dep : string -> unit   
-  (* [dep mlbfile] parses mlbfile (and the mlb-files it mentions, 
-   * recursively) and writes dependency information to disk in 
+  val dep : string -> unit
+  (* [dep mlbfile] parses mlbfile (and the mlb-files it mentions,
+   * recursively) and writes dependency information to disk in
    * .d-files. *)
 
   type BG
@@ -54,19 +53,17 @@ sig
       val compare : (atom * atom) -> order
     end
   type File
-  datatype SmlFile = Script of Atom.atom
-                   | NonScript of Atom.atom
+  type SmlFile = Atom.atom
   val project : File -> SmlFile
-  val fold : ((SmlFile * string * string list * 'a) -> 'a) -> 'a -> BG -> 'a
-  val done : File * BG -> (File * string * string list) list * BG
-  val initial : BG -> (File * string * string list) list
+  val fold : ((SmlFile * (string*string) * string list * 'a) -> 'a) -> 'a -> BG -> 'a
+  val done : File * BG -> (File * (string*string) * string list) list * BG
+  val initial : BG -> (File * (string*string) * string list) list
   (* The second components of the pairs being the hosting mlbfiles (the third
    * components contains annotations, that is, flags that the compiler should
    * apply during compilation of the source file). *)
 
 (*  val pp_bg : BG -> string *)
-  val sources : string -> BG 
+  val sources : string -> BG
   (* [sources mlbfile] returns the dependency graph of sources (.sml- and
    * .sig-files) mentioned in mlbfile *)
 end
-