Ticket #12: cmdLnArgs-NEW-part1and2.patch

HowTo/600-AccessMySQL.cobra

@@ -1 +1 @@
 # .require. MySql.Data.dll
-# .args. -r:System.Data -r:MySql.Data
+# .args. -ref:System.Data -ref:MySql.Data
 """
 See also:
     docs/mysql on the Cobra web site
@@ -11 +11 @@
     http://dev.mysql.com/doc/refman/5.0/en/connector-net-installation-unix.html
 
 To run:
-    cobra -r:System.Data -r:MySql.Data AccessMySQL.cobra
+    cobra -ref:System.Data -ref:MySql.Data AccessMySQL.cobra
 
 Or just compile:
-    cobra -c -r:System.Data -r:MySql.Data AccessMySQL.cobra
+    cobra -c -ref:System.Data -ref:MySql.Data AccessMySQL.cobra
 and then run:
     mono mysql.exe
 
-You can probably leave out the "-r:<library>" and rely of `use` to locate these.
+You can probably leave out the "-ref:<library>" and rely of `use` to locate these.
 
 Mac OS X:
     For installation, MySQL docs say "Copy the MySql.Data.dll file to your Mono project installation folder."

Source/Compiler.cobra

@@ -482 +482 @@
         
             
     def runProcess as Process
+        return .runProcess(nil, nil)
+        
+    def runProcess(exeName as String?, argList as List<of String>?) as Process
         """
         Returns a new Process with startInfo.fileName and p.startInfo.arguments set appropriately
-        for the produced executable and the current options.
+        for the produced executable and the current options and any provided argslist.
         """
-        # TODO: support args to the program with a - or -- separator
         p = Process()
+        baseExeFileName = exeName ? .baseExeFileName
+        fullExeFileName = exeName ? .fullExeFileName
         branch .platform
             on PlatformEnum.Microsoft
-                p.startInfo.fileName = .baseExeFileName
+                p.startInfo.fileName = baseExeFileName
             on PlatformEnum.Novell
                 p.startInfo.fileName = 'mono'
                 args = ''
                 # mono also needs --debug when running
                 if .options.getDefault('debug', '') not in ['', '-']
                     args += '--debug '
-                args += '"[.fullExeFileName]"'
+                args += '"[fullExeFileName]"'
                 p.startInfo.arguments = args
             else
                 throw FallThroughException(.platform)
+                                
+        if argList and argList.count 
+            args = p.startInfo.arguments ? '' 
+            args += Utils.join(' ', argList) 
+            p.startInfo.arguments = args                
         return p
 
     ##
@@ -751 +760 @@
                 print ' |', line
             return refs
 
-        parts = output.replace('-r:', '\0').split(c'\0')
+        parts = output.replace('-ref:', '\0').split(c'\0')
         for part in parts
             if part.trim <> '', refs.add(part.trim)
         

Source/CommandLine.cobra

@@ -8 +8 @@
 class CommandLine
     """
     The main options that control the command line's behavior are:
-        run
+        run-exe
         test
         compile
         testify
@@ -16 +16 @@
 
     "testify" is private to the implementor of Cobra.
 
-    "run" is the default if none are specified and at least one path is provided.
+    "run-exe" is the default if none are specified and at least one path is provided.
 
     If no arguments are passed at all, "help" becomes the default.
 
@@ -199 +199 @@
         },
         {
             'name': 'reference',
-            'synonyms': ['r'], # TODO: lose 'r' ->'Ref', 'R', something else
+            'synonyms': ['ref'], 
             'isAccumulator': true,
             'description': 'Add a DLL reference.',
             'args': 'Some.dll',
@@ -218 +218 @@
 #           'args': ':Qualified.Type.Name',
 #       },
         {
-            'name': 'run',  # TODO: Synonym 'r' after change 'reference' switch
+            'name': 'run-exe',      # run-prog?? this is a switch only   
+            'synonyms': ['r'], 
             'description': 'Runs the Cobra program. This is the default behavior if specify any Cobra source files.',
             'type': 'main',
         },
+        {                
+            'name': 'run-args', 
+            'synonyms': ['-'],  # '--' 
+            'description': 'Remaining args are to be passed to executable.', 
+            'eg':          '-- arg1 arg2 argThree', 
+            'type': 'args-list', 
+        },
+        {                
+            'name': 'run', 
+#           'synonyms': ['X'],
+            'description': 'First arg following is executable to run,  remainder are to be passed to executable.', 
+            'eg':          '-run progname arg1 arg2 argThree', 
+            'type': 'args-list', 
+        },
         {
             'name': 'sharp-compiler',
             'description': 'Specify the path to the backend C# compiler.',
@@ -357 +372 @@
                     print '    [path]'
             if options.boolValue('testify')
                 .doTestify(paths)
-            else if options.boolValue('run')
+            else if options.boolValue('run-exe')  # was 'run'
                 .doRun(paths)
             else if options.boolValue('test')
                 .doTest(paths)
@@ -485 +500 @@
         if .options.boolValue('compile')  # maybe changed by compiler directive
             return
 
-        p = c.runProcess
+        exeFileName as String? = nil
+        runArgs = .options.getDefaultLOStr('run-args')
+        exeArgs = .options.getDefaultLOStr('run')
+        if exeArgs.count
+            exeFileName = exeArgs[0]
+            runArgs = exeArgs[1:]
+        p = c.runProcess(exeFileName, runArgs)
         if _verbosity >= 1
             print 'Running: [p.startInfo.fileName] [p.startInfo.arguments]'
             print .verboseLineSeparator
@@ -635 +656 @@
             valueStr = 'no-value'
             fileList = List<of String>()
             mainOptions = List<of String>()
+            argn = 0
             for arg in args
-                if not arg.trim.length
-                    continue
-                    
+                argn += 1  # ofset next arg after current
+                if not arg.trim.length, continue
+
                 isOption = arg.startsWith(optionPrefix)
                 if isOption
                     name = _getOptionParts(arg, optionPrefix, out valueStr)
@@ -649 +671 @@
                         continue
                         
                     value = _processToValue(name, valueStr, spec, mainOptions)
+                    if value == 'args-list'
+                        value = args[argn:]
                     if value is nil
                         _error('Cannot process value "[valueStr]" for option "[name]".')
                     valueDict[name] = value to !
                     didSpecify[name] = true
+                    if spec['type'] to String == 'args-list'
+                        break   # absorbed remainder of args
                 else # not isOption
                     if _optsOnly
                         _error("Filenames are not allowed here, All the args provided must be '-' prefixed options")
@@ -691 +717 @@
         """
         while arg.startsWith(optionPrefix)
             arg = arg[1:]
+        if not arg.length # '--'
+            arg = 'run-args'
         return arg
                 
     def splitOpt(arg as String) as IList<of String>
@@ -799 +827 @@
             on 'main'
                 mainOptions.add(name)
                 value = true
+            on 'args-list'  # remainder of args are for execution of exe file 
+                value = 'args-list'
             else
                 value = _interpretValue(valueStr, spec)
         return value
@@ -953 +983 @@
         print '  cobra <options> <command> <path(s)>'
         print '    * commands that operate on path(s) are:'
         print '      -compile ... Compile only. Also, -c'
-        print '      -run ....... Run the program (compile if necessary).'
+        print '      -run-exe ... Run the program (compile if necessary). Also -r (Default)'
         print '      -test ...... Run the unit tests of a library.'
         print '      -document .. Document the program (partial compilation). Also, -doc'
         print ''

Tests/720-libraries/100-winforms/100-winforms.cobra

@@ -1 +1 @@
 # .compile-only.
-# .args. -c -t:winexe -r:System.Windows.Forms
+# .args. -c -t:winexe -ref:System.Windows.Forms
 
 use System.Windows.Forms
 

Tests/320-misc-two/520-indexer-with-non-standard-name.cobra

@@ -1 @@
-# .args. -r:System.Xml
+# .args. -ref:System.Xml
 
 # XmlNodeList has an ItemOf property instead of Item.
 # This test shows that Cobra is reading the DefaultMemberAttribute of the class.

Tests/700-command-line/705-run-args.cobra

@@ +1 @@
+# Test compile+run execution specifying args to run compiled prog with 
+class Test 
+    def main is shared 
+        p as System.Diagnostics.Process? 
+        cobraPath = CobraCore.findCobraExe 
+        assert cobraPath 
+        if cobraPath 
+            cmdln = "702-echo -- argA argB argC" 
+            output = CobraCore.runCobraExe(cobraPath, cmdln, out p) 
+            #print output 
+            assert 'Unhandled Exception' not in output 
+            assert 'argA argB argC' in output 
+            assert p.exitCode == 0 
+            
+            cmdln = "702-echo -run-args x1arg1 x1argB x1argC" 
+            output = CobraCore.runCobraExe(cobraPath, cmdln, out p) 
+            #print output 
+            assert 'Unhandled Exception' not in output 
+            assert 'x1arg1 x1argB x1argC' in output 
+            assert p.exitCode == 0 
+        
+            cmdln = "-r 702-echo -run-args x2arg1 x2argB x2argC" 
+            output = CobraCore.runCobraExe(cobraPath, cmdln, out p) 
+            #print output 
+            assert 'Unhandled Exception' not in output 
+            assert 'x2arg1 x2argB x2argC' in output 
+            assert p.exitCode == 0 

Tests/700-command-line/812-lib-option.cobra

@@ -1 +1 @@
 # was .args. -lib:libdir -r:foolib -c
-%% args -lib:libdir -r:foolib -c
+%% args -lib:libdir -ref:foolib -c
 
 class Test
 

Tests/700-command-line/300-args-reference-gac-lib.cobra

@@ -1 @@
-# .args. -r:System.Xml
+# .args. -ref:System.Xml
 
 use System.Xml
 

Tests/700-command-line/706-run.cobra

@@ +1 @@
+# Test execution specifying cmdln args giving exe and args after compile 
+class ExecWithArgs 
+    def main is shared 
+        p as System.Diagnostics.Process? 
+        cobraPath = CobraCore.findCobraExe 
+        assert cobraPath 
+
+        # implicit run-and-execute with args
+        cmdln = "702-echo -run 702-echo argA argB argC" 
+        output = CobraCore.runCobraExe(cobraPath, cmdln, out p) 
+        #print output 
+        assert 'Unhandled Exception' not in output 
+        assert 'argA argB argC' in output 
+        assert p.exitCode == 0 
+
+        # implicit run-and-execute 'run-exe' no args
+        cmdln1 = "702-echo  -run 110-hello" 
+        output = CobraCore.runCobraExe(cobraPath, cmdln1, out p) 
+        #print output 
+        assert 'Unhandled Exception' not in output 
+        assert 'Hello' in output 
+        assert p.exitCode == 0 
+
+        # explicit run-and-execute 'run-exe' using (new) synonym
+        cmdln1 = "-r 702-echo  -run 110-hello AnyOldArgs AnyOldargs anyAnyOldArgs" 
+        output = CobraCore.runCobraExe(cobraPath, cmdln1, out p) 
+        #print output 
+        assert 'Unhandled Exception' not in output 
+        assert 'Hello' in output 
+        assert 'AnyOld' not in output 
+        assert p.exitCode == 0 
+            
+        # explicit'run-exe' cmd
+        cmdln1 = "-run-exe 702-echo -run 110-hello AnyNewArgs" 
+        output = CobraCore.runCobraExe(cobraPath, cmdln1, out p) 
+        #print output 
+        assert 'Unhandled Exception' not in output 
+        assert 'Hello' in output 
+        assert 'AnyNewArgs' not in output 
+        assert p.exitCode == 0 
+            

Tests/700-command-line/402-fooprog.cobra

@@ -1 @@
-# .args. -embed-run-time:no -r:400-foolib.dll
+# .args. -embed-run-time:no -ref:400-foolib.dll
 
 class Program
 

Tests/700-command-line/404-fooprog.cobra

@@ -1 @@
-# .args. -embed-run-time:no -r:400-foolib
+# .args. -embed-run-time:no -ref:400-foolib
 
 # same as other fooprog, but the -r arg does not include the ".dll" extension -- both ways should work
 

Tests/700-command-line/512-lib-option.cobra

@@ -1 +1 @@
 # .compile-only.
-# .args. -lib:libdir -r:foolib -c
+# .args. -lib:libdir -ref:foolib -c
 
 class Test
 

Tests/700-command-line/410-use-lowernames-dll.cobra

@@ -1 @@
-# .args. -r:lowernames.dll
+# .args. -ref:lowernames.dll
 
 class Program
 

Tests/700-command-line/702-echo.cobra

@@ +1 @@
+# .skip.
+class Echo
+    def main is shared
+        args = CobraCore.commandLineArgs
+        sep=''
+        for a in args[1:]
+            print '[sep][a]' stop
+            sep=' '
+        print 

Developer/IntermediateReleaseNotes.text

@@ -1 +1 @@
 Post 0.8
 
+* Modified commandline options and added two new capabilities:
+ previous -run becomes -run-exe (run executable).  -r becomes synonym for -run-exe rather  
+ than for -reference. -reference synonym becomes -ref. 
+ Support -run-args (synonym --) option for specifying args to pass to compiled executable and
+ -run (no synonym) option to specify executable file and optional args to pass to it to execute after compilation.  
+
 * Added support for "multi-arg assignment" which allows you to assign to a number of variables from contents of a list in one statement
 .code
     a,b,c = ['val1', 'val2', 'val3']
 
-
 * Added support for a new compiler directive 'args' that takes command line options and applies them to the compilation environment from that point on.
 .code
     %% args -target:lib -embed-run-time:no