Changeset 5158

Timestamp:

07/03/05 18:07:32 (4 years ago)

Author:

iblech

svk:copy_cache_prev:

6965

Message:

* Made "pugs -MFoo file.p6" work (previously, file.p6 wasn't executed).
* Added a test for this to t/pugsrun/10-dash-uppercase-m.t.

Files:

• src/Main.hs (modified) (1 diff)
• src/Pugs/Run/Args.hs (modified) (1 diff)
• t/pugsrun/10-dash-uppercase-m.p6 (added)
• t/pugsrun/10-dash-uppercase-m.t (modified) (1 diff)

src/Main.hs

@@ -85 +85 @@
 
 run (("-e"):prog:args)          = do doRun "-e" args prog
+-- -E is like -e, but not accessible as a normal parameter and used only
+-- internally:
+--   "-e foo bar.p6" executes "foo" with @*ARGS[0] eq "bar.p6",
+--   "-E foo bar.p6" executes "foo" and then bar.p6.
+run (("-E"):prog:rest)          = run ("-e":prog:[]) >> run rest
 run ("-":args)                  = do doRun "-" args =<< readStdin
 run (file:args)                 = readFile file >>= doRun file args

src/Pugs/Run/Args.hs

@@ -156 +156 @@
                                    isDashE (_) = False
 
-joinDashE ((Opt "-M" mod):args) = joinDashE ((Opt "-e" ("use " ++ mod ++ ";\n")):args)
+-- -E is like -e, but not accessible as a normal parameter and used only
+-- internally:
+--   "-e foo bar.p6" executes "foo" with @*ARGS[0] eq "bar.p6",
+--   "-E foo bar.p6" executes "foo" and then bar.p6.
+joinDashE ((Opt "-M" mod):args) = joinDashE ((Opt "-E" (";use " ++ mod ++ ";\n")):args)
 
 joinDashE ((Opt "-e" a):(Opt "-e" b):args) =

t/pugsrun/10-dash-uppercase-m.t

@@ -18 +18 @@
 my @tests = (
   "-I$dir -MDummy -e load_test",
-  "-e load_test -MDummy -I$dir"
+  "-e load_test -MDummy -I$dir",
+  "-I$dir -MDummy $dir/10-dash-uppercase-m.p6"
 );