meilleur parsing de la ligne de commande pour les scripts

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5579 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 9 insertions, 2 deletions

diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml
index 28276d54d6..4e098b7f55 100644
--- a/toplevel/topmain.ml
+++ b/toplevel/topmain.ml
@@ -31,8 +31,15 @@ let file_argument name =
   let ppf = Format.err_formatter in
   if Filename.check_suffix name ".cmo" || Filename.check_suffix name ".cma"
   then preload_objects := name :: !preload_objects
-  else exit
-      (if prepare ppf && Toploop.run_script ppf name Sys.argv then 0 else 2)
+  else
+    begin
+      let newargs = Array.sub Sys.argv !Arg.current
+                              (Array.length Sys.argv - !Arg.current)
+      in
+      if prepare ppf && Toploop.run_script ppf name newargs
+      then exit 0
+      else exit 2
+    end
 
 let main () =
   Arg.parse [