Ticket #12: cmdlnArgs.patch

Compiler.cobra

@@ -392 +392 @@
                 assert modules.count
                 _modules.addRange(modules)
             return modules
-
+            
+    # default invocation of runProcess - no explicit exeName and no argList
     def runProcess as Process
+        return .runProcess(nil, nil)
+    
+    # runProcess passing optional explicit exeName and argList
+    def runProcess(exeName as String?, argList as IList<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 arglist.
         """
-        # TODO: support args to the program with a - or -- separator
         p = Process()
+        if exeName
+            baseExeFileName = exeName
+            fullExeFileName = exeName 
+        else
+            baseExeFileName = .baseExeFileName
+            fullExeFileName = .fullExeFileName
         branch .platform
             on PlatformEnum.Microsoft
-                p.startInfo.fileName = .baseExeFileName
+                p.startInfo.fileName = baseExeFileName
             on PlatformEnum.Novell
+                # fixup fullExeFileName
+                if not '.' in fullExeFileName 
+                    fullExeFileName += '.exe'                   
                 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
+            args = p.startInfo.arguments ? ''
+#           for a in argList 
+#               args += ' [a]'
+            args += Utils.join(' ', argList)
+            p.startInfo.arguments = args
+        
         return p
 
     ##

CommandLine.cobra

@@ -195 +195 @@
         },
         {
             'name': 'reference',
-            'synonyms': ['r'],
+            'synonyms': ['r'], # TODO: lose 'r' ->'Ref', 'R', something else
             'isAccumulator': true,
             'description': 'Add a DLL reference.',
             'args': 'Some.dll',
@@ -214 +214 @@
 #           'args': ':Qualified.Type.Name',
 #       },
         {
-            'name': 'run',
+            'name': 'run',  # TODO: Synonym 'r' after change 'reference' switch
             'description': 'Runs the Cobra program. This is the default behavior if specify any Cobra source files.',
             'type': 'main',
         },
+#
+        {       
+            'name': 'exeArgs',  # TODO: -> 'run' after change 'run' to 'r'
+            'synonyms': ['X'],
+            'description': 'Remaining args are name of the file to run and args to pass to it.',
+            'eg':          '-X echo arg1 arg2 argThree',
+            'type': 'exeArgs',
+        },
+#
+#
+        {       
+            'name': 'runArgs',
+            'synonyms': ['-'],  #'--'
+            'description': 'Remaining args are to be passed to executable.',
+            'eg':          '-- arg1 arg2 argThree',
+            'type': 'runArgs',
+        },
+#           
         {
             'name': 'sharp-compiler',
             'description': 'Specify the path to the backend C# compiler.',
@@ -281 +299 @@
 
     var _options = Options()
     var _pathList as List<of String>?
+    var _runArgs  as IList<of String>?  # nil or args set for running exe
+    var _exeFileName as String?         # Name specified for exe to run
     var _htmlWriter as HtmlWriter?
 
     def init
@@ -395 +415 @@
         ensure
             options
             paths
-        body
+        body    # TODO: refactor to something more modular (i.e much < 200 lines long)
             optionPrefix = '-'
             valuePrefix = c':'
             if not args.count
@@ -432 +452 @@
             value = 'no-value' to dynamic
             mainOptions = List<of String>()
             didSpecify = Dictionary<of String, bool>()  # CC: could just be a Set
+            argn=0
             for arg in args
+                argn += 1   # next arg after current
                 if arg.trim.length == 0
                     continue
+                    
                 if arg.startsWith(optionPrefix)
                     isOption = true
                     while arg.startsWith(optionPrefix)
                         arg = arg[1:]
+                    if not arg.length  # '--'
+                        arg='runArgs'
                 else
                     isOption = false
                 if isOption
@@ -489 +514 @@
                             if spec['type'] == 'main'
                                 mainOptions.add(name)
                                 value = true
+                            else if spec['type'] == 'runArgs'
+                                # remainder of args are for execution of exe file
+                                _runArgs = args[argn:]
+                                break
+                            else if spec['type'] == 'exeArgs'
+                                # remainder of args are exe file and then args for it
+                                if args.count <= argn
+                                    .error("exeArgs option must have at least one arg following")
+                                _exeFileName = args[argn]
+                                _runArgs = args[argn+1:]
+                                break
                             else
                                 possible = .interpretValue(valueStr, spec)
                                 if possible is not nil
@@ -584 +620 @@
             options['include-nil-checks'] = false
             options['include-tests'] = false
             options['optimize'] = true
-
+            
     def interpretValue(valueStr as String, spec as Dictionary<of String, Object>) as dynamic?
         value as dynamic?
         branch spec['type'] to String
@@ -710 +746 @@
         if c.errors.count
             print 'Not running due to errors above.'
         else
-            p = c.runProcess
+            p = c.runProcess(_exeFileName, _runArgs)
             if _verbosity >= 1
                 print 'Running: [p.startInfo.fileName] [p.startInfo.arguments]'
                 print .verboseLineSeparator
@@ -821 +857 @@
                         first = false
                 else
                     print '        Example: -[spec["name"]]:[spec["example"]]'
+            if spec.containsKey('eg') #Verbatim example line
+                print '        e.g. [spec["eg"]]'
 
     def doAbout
         # CC: multiline string