dastworx uses iz.options, close #275

dastworx/src/main.d

@@ -3,75 +3,56 @@ module dastworx;
 import
     core.memory;
 import
-    std.array, std.getopt, std.stdio, std.path, std.algorithm, std.functional;
+    std.array, std.getopt, std.stdio, std.path, std.algorithm, std.functional,
+    std.file, std.typecons;
 import
-    iz.memory;
+    iz.memory, iz.options;
 import
     dparse.lexer, dparse.parser, dparse.ast, dparse.rollback_allocator;
 import
     common, todos, symlist, imports, mainfun, halstead, ddoc_template;
 
 
-private __gshared int caretLine;
-private __gshared bool option1;
-private __gshared static Appender!(ubyte[]) source;
-private __gshared string[] files;
-
-// -o : deep visit the symbols
-alias deepSymList = option1;
-// -o : outputs /++ +/ ddoc instead of /** */
-alias plusComment = option1;
-
-static this()
-{
-    GC.disable;
-    source.reserve(1024^^2);
-}
-
 void main(string[] args)
 {
-    version(devel)
-    {
-        mixin(logCall);
-        File f = File(__FILE__, "r");
-        foreach(ref buffer; f.byChunk(4096))
-            source.put(buffer);
-        f.close;
-    }
-    else
-    {
-        // get the source to process.
-        // even when files are passed, the std input has to be closed by the IDE
     foreach(ref buffer; stdin.byChunk(4096))
-            source.put(buffer);
+        Launcher.source.put(buffer);
-        if (!source.data.length && args.length > 1)
+    handleArguments!(Yes.Throw, Launcher)(args[1..$]);
-        {
-            import std.file: exists;
-            files = args[1].splitter(pathSeparator).filter!exists.array;
-            version(devel) writeln(files);
-        }
-    }
-
-    // options for the work
-    getopt(args, std.getopt.config.passThrough,
-        "o", &option1,
-        "l", &caretLine
-    );
-
-    // launch directly a work
-    getopt(args, std.getopt.config.passThrough,
-        "i", &handleImportsOption,
-        "m", &handleMainfunOption,
-        "s", &handleSymListOption,
-        "t", &handleTodosOption,
-        "H", &handleHalsteadOption,
-        "K", &handleDdocTemplateOption,
-    );
 }
 
-/// Handles the "-s" option: create the symbol list in the output
+struct Launcher
-void handleSymListOption()
 {
+    static this()
+    {
+        GC.disable;
+        source.reserve(1024^^2);
+    }
+
+    __gshared @Argument("-l") int caretLine;
+    __gshared @Argument("-o") bool option1;
+
+    __gshared static Appender!(ubyte[]) source;
+    __gshared string[] files;
+
+    // -o : deep visit the symbols
+    alias deepSymList = option1;
+    // -o : outputs /++ +/ ddoc instead of /** */
+    alias plusComment = option1;
+
+    /// Writes the list of files to process
+    @Argument("-f")
+    static void setFiles(string value)
+    {
+        files = value
+            .splitter(pathSeparator)
+            .filter!exists
+            .array;
+    }
+
+    /// Writes the symbol list
+    @Argument("-s", "", ArgFlags(ArgFlag.stopper))
+    static void handleSymListOption()
+    {
         mixin(logCall);
 
         static struct ErrorHandler
@@ -93,19 +74,21 @@ void handleSymListOption()
             .getTokensForParser(config, &cache)
             .parseModule("", &alloc, &eh.handleErrors)
             .listSymbols(eh._errors.data, deepSymList);
-}
+    }
 
-/// Handles the "-t" option: create the list of todo comments in the output
+    /// Writes the list of todo comments
-void handleTodosOption()
+    @Argument("-t", "", ArgFlags(ArgFlag.stopper))
-{
+    static void handleTodosOption()
+    {
         mixin(logCall);
         if (files.length)
             getTodos(files);
-}
+    }
 
-/// Handles the "-i" option: create the import list in the output
+    /// Writes the import list
-void handleImportsOption()
+    @Argument("-i", "", ArgFlags(ArgFlag.stopper))
-{
+    static void handleImportsOption()
+    {
         mixin(logCall);
         if (files.length)
         {
@@ -122,11 +105,12 @@ void handleImportsOption()
                 .parseModule("", &alloc, toDelegate(&ignoreErrors))
                 .listImports();
         }
-}
+    }
 
-/// Handles the "-m" option: writes if a main() is present in the module
+    /// Writes if a main() is present in the module
-void handleMainfunOption()
+    @Argument("-m", "", ArgFlags(ArgFlag.stopper))
-{
+    static void handleMainfunOption()
+    {
         mixin(logCall);
 
         RollbackAllocator alloc;
@@ -137,11 +121,12 @@ void handleMainfunOption()
             .getTokensForParser(config, &cache)
             .parseModule("", &alloc, toDelegate(&ignoreErrors))
             .detectMainFun();
-}
+    }
 
-/// Handles the "-H" option: write the halstead metrics
+    /// Writes the halstead metrics
-void handleHalsteadOption()
+    @Argument("-H", "", ArgFlags(ArgFlag.stopper))
-{
+    static void handleHalsteadOption()
+    {
         mixin(logCall);
 
         RollbackAllocator alloc;
@@ -152,11 +137,12 @@ void handleHalsteadOption()
             .getTokensForParser(config, &cache)
             .parseModule("", &alloc, toDelegate(&ignoreErrors))
             .performHalsteadMetrics;
-}
+    }
 
-/// Handles the "-D" option: write the ddoc template for a given declaration
+    /// Writes the ddoc template for a given declaration
-void handleDdocTemplateOption()
+    @Argument("-K", "", ArgFlags(ArgFlag.stopper))
-{
+    static void handleDdocTemplateOption()
+    {
         mixin(logCall);
 
         RollbackAllocator alloc;
@@ -167,16 +153,6 @@ void handleDdocTemplateOption()
             .getTokensForParser(config, &cache)
             .parseModule("", &alloc, toDelegate(&ignoreErrors))
             .getDdocTemplate(caretLine, plusComment);
-}
+    }
-
-version(devel)
-{
-    version(none) import std.compiler;
-    version(all) import std.uri;
-    version(WatchOS) import std.math;
-    mixin(q{import std.c.time;});
-    // TODO: something
-    // NOTE: there was a bug here...
-    // FIXME-cmain-aMrFreeze-p8: there's an infinite recursion whith the option -x
 }
 

etc/iz

@@ -1 +1 @@
-Subproject commit 52288791debfe9b5ebf8691f91178dd525a38661
+Subproject commit 4124a206ed9c88037f2394887e74b260d05acca4

src/ce_dastworx.pas

@@ -75,7 +75,7 @@ begin
   prc := TProcess.Create(nil);
   try
     prc.Executable := str;
-    prc.Parameters.Add(files);
+    prc.Parameters.Add('-f' + files);
     prc.Parameters.Add('-i');
     prc.Options := [poUsePipes {$IFDEF WINDOWS}, poNewConsole{$ENDIF}];
     prc.ShowWindow := swoHIDE;
@@ -138,10 +138,10 @@ begin
   prc := TProcess.Create(nil);
   try
     prc.Executable := str;
-    prc.Parameters.Add('-K');
     prc.Parameters.Add('-l' + caretLine.ToString);
     if plusComment then
       prc.Parameters.Add('-o');
+    prc.Parameters.Add('-K');
     prc.Options := [poUsePipes {$IFDEF WINDOWS}, poNewConsole{$ENDIF}];
     prc.ShowWindow := swoHIDE;
     prc.Execute;

src/ce_todolist.pas

@@ -456,7 +456,7 @@ begin
     end;
   end
   else str := fDoc.fileName;
-  fToolProc.Parameters.Add(str);
+  fToolProc.Parameters.Add('-f' + str);
   fToolProc.Parameters.Add('-t');
   //
   fToolProc.Execute;