Changeset 936

Timestamp:

02/23/09 12:39:02 (3 years ago)

Author:

andrei

Message:

Added --shebang, --eval, and --loop options

Files:

• trunk/tools/rdmd.d (modified) (10 diffs)

trunk/tools/rdmd.d

@@ -30 +30 @@
-private string exe, compiler = "dmd";
-
+// For --eval
+immutable string importWorld = "
+import std.stdio, std.algorithm, std.array, std.atomics, std.base64, 
+    std.bigint, std.bind, /*std.bitarray,*/ std.bitmanip, std.boxer, 
+    std.compiler, std.complex, std.contracts, std.conv, std.cpuid, std.cstream,
+    std.ctype, std.date, std.dateparse, std.demangle, std.encoding, std.file, 
+    std.format, std.functional, std.getopt, std.intrinsic, std.iterator, 
+    /*std.loader,*/ std.math, std.md5, std.metastrings, std.mmfile, 
+    std.numeric, std.openrj, std.outbuffer, std.path, std.perf, std.process, 
+    std.random, std.range, std.regex, std.regexp, std.signals, std.socket, 
+    std.socketstream, std.stdint, std.stdio, std.stdiobase, std.stream, 
+    std.string, std.syserror, std.system, std.traits, std.typecons, 
+    std.typetuple, std.uni, std.uri, std.utf, std.variant, std.xml, std.zip,
+    std.zlib;";
+
-int main(string[] args)
-{
-    //writeln("Invoked with: ", map!(q{a ~ ", "})(args));
+    if (args.length > 1 && std.string.startsWith(args[1], "--shebang "))
+    {
+        // multiple options wrapped in one
+        auto a = args[1]["--shebang ".length .. $];
+        args = args[0 .. 1] ~ split(a) ~ args[2 .. $];
+    }
-    
-    // Parse the #! line of the root module
-    // Not used yet; not sure whether it's a good idea
-    // completeFlagsFromShebang(root, args);
-
-    // Continue parsing the command line; now get rdmd's own arguments
-    // parse the -o option
@@ -52 +69 @@
-            // add a trailing path separator to clarify it's a dir
-            exe = std.path.join(value[1 .. $], "");
-exe.endsWith(
+std.string.endsWith(exe, 
-        }
-        else if (value[0] == '-')
@@ -77 +94 @@
-
-    // set by functions called in getopt if program should exit
-
+
+
-    getopt(args,
-            std.getopt.config.caseSensitive,
@@ -88 +106 @@
-            "help", (string) { writeln(helpString); bailout = true; },
-            "man", (string) { man; bailout = true; },
+            "eval", &eval,
+            "loop", &loop,
-            "o", &dashOh,
-            "compiler", &compiler);
@@ -93 +113 @@
-    if (dryRun) chatty = true; // dry-run implies chatty
-
+    if (eval)
+    {
+        // Just evaluate this program!
+        if (loop)
+        {
+            return .eval(importWorld ~ "void main(string[] args) { "
+                ~ "foreach (line; stdin.byLine()) { " ~ eval ~ "; } }");
+        }
+        else
+        {
+            return .eval(importWorld ~ "void main(string[] args) { "
+                    ~ eval ~ "; }");
+        }
+    }
+    
-    // Parse the program line - first find the program to run
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    const
@@ -125 +163 @@
-    {
-        // user-specified exe name
-
+std.string.
-        {
-            // user specified a directory, complete it to a file
@@ -151 +189 @@
-{
-    // Heuristics: if source starts with "std.", it's in a library
-
+
+
-        || source == "object" || source == "gcstats";
-    // another crude heuristic: if a module's path is absolute, it's
@@ -209 +248 @@
-        in string[] compilerFlags)
-{
-invariant
+auto
-        ~" -of"~shellQuote(fullExe)
-        ~" -od"~shellQuote(objDir)
-
-
+
+
+
+
-    invariant result = run(todo);
-    if (result) 
@@ -225 +266 @@
-    rmdirRecurse(objDir);
-    return 0;
-}
-
-void completeFlagsFromShebang(string root, ref string[] args)
-{
-    auto f = File(root);
-    auto sheBang = f.readln;
-    auto cmd = std.regexp.split(strip(sheBang), r"\s+");
-    if (cmd.length <= 1 || !cmd[0].startsWith("#!")) return;
-    invariant prog = cmd[0][2 .. $];
-
-    // Allowed shebangs:
-    // #!/path/to/rdmd --stuff
-    // or
-    // #!/usr/bin/env rdmd --stuff
-    // or
-    // #!/bin/env rdmd --stuff
-    if (basename(prog) != "rdmd")
-    {
-        if (prog != "/bin/env" && prog != "/usr/bin/env" || cmd[1] != "rdmd")
-            return;
-        // Discard the "[/usr]/bin/env" thing
-        cmd = cmd[1 .. $];
-    }
-    // Ok, found a command with maybe some parms. Put those in front so
-    // they are overridden by the true command-line arguments
-    args = args[0] ~ cmd[1 .. $] ~ args[1 .. $];
-}
-
@@ -326 +341 @@
-                      (implies --chatty)
-  --force           force a rebuild even if apparently not necessary
+  --eval=code       evaluate program a la perl -e
+  --loop            assume \"foreach (line; stdin.byLine()) { ... }\" for eval
-  --help            this message
-  --man             open web browser on manual page
+  --shebang         rdmd is in a shebang line (put as first argument)
-";
-}
+
+int eval(string todo)
+{
+    auto progname = tmpDir~"/eval.d";
+    std.file.write(progname, todo);
+    scope(exit) std.file.remove(progname);
+    run("dmd -run " ~ progname);
+    return 0;
+}