[r2003-10-10 21:04:17 by cvscast] Beppe: bugfix

Original author: cvscast
Date: 2003-10-10 21:04:17+00:00

driver/librarian.ml

@@ -150,7 +150,12 @@ let rec load id =
     if !during_compile then depends := id :: !depends;
 (*    Printf.eprintf "load %s: start\n" (object_filename id);
     flush stderr; *)
-    let ic = open_in (object_filename id "") in
+    let filename =  Encodings.Utf8.to_string (C.value id) in
+    let ic = 
+      if Filename.check_suffix filename ".cdo" then open_in filename
+      else try  
+             open_in (object_filename id "") 
+           with  Sys_error _ -> open_in (filename) in 
     let (dig, depend, raw) = input_value ic in
     close_in ic;
     let depend = Serialize.Get.run deserialize_dep depend in

driver/run.ml

@@ -99,7 +99,7 @@ let mode =
     | true,  [], false, _, []       ->
 	err "Only one CDuce program can be compiled at a time"
     | true,  _, false, _, []        ->
-	err "Please specify only one output file"
+	err "Please specify just one output file"
     | true,  _, false, _, _        ->
 	err "No argument can be passed to programs at compile time"
     | false, _, true,  [x], args   -> `Run (x,args)