Changeset 1722

Timestamp:

11/02/08 17:47:21 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Command line: Tell the user what the possible choices are when a 'bool' or 'menu' option cannot be parsed.

Location:

cobra/trunk/Source

Files:

• CommandLine.cobra (modified) (10 diffs)
• Utils.cobra (modified) (1 diff)

cobra/trunk/Source/CommandLine.cobra

@@ -23 +23 @@
         var _hasDefault = false
         var _default = ''
+        var _choices = List<of String>()
 
         get isUnpacked from var
@@ -32 +33 @@
         get type as String
                 require .isUnpacked
+                ensure result in ['accumulator', 'args-list', 'bool', 'int', 'main', 'menu', 'string']
                 return _type
 
@@ -45 +47 @@
                 """
                 Check .hasDefault before using this property for anything useful.
+                """
+
+        get choices from var
+                """
+                The choices for options that are type 'menu'.
                 """
                         
@@ -66 +73 @@
                         else
                                 this['type'] = 'string'
+                assert _type in ['accumulator', 'args-list', 'bool', 'int','main', 'menu', 'string']
                 if .containsKey('synonyms')
                         for syn in this['synonyms']
@@ -74 +82 @@
                         _isAccumulator = this['isAccumulator'] to bool
                 if .containsKey('default')
-                        _default = this['default'] to String
+                        _default = this['default']
                         _hasDefault = true
+                if .containsKey('choices')
+                        for choice in this['choices']
+                                _choices.add(choice)
                 _isUnpacked = true
+                assert .type=='menu' implies .choices.count > 0
+                assert .choices.count <> 0 implies .type == 'menu'
 
 
@@ -433 +446 @@
 
         def parseArgs(args as IList<of String>, options as out OptionValues?, paths as out List<of String>?)
-                _argParser.parseArgs(args, out options, out paths)
+                try
+                        _argParser.parseArgs(args, out options, out paths)
+                catch ape as ArgParseException
+                        options = nil
+                        paths = nil
+                        .error(ape.message)
                 _verbosity = _argParser.verbosity
                 CobraMain.willTimeIt = _argParser.willTimeIt
@@ -804 +822 @@
         
 
+class ArgParseException
+        inherits Exception
+
+        def init(msg as String)
+                base.init(msg)
+
+
 class ArgParser
         """
@@ -907 +932 @@
                                                 value = args[argn:]
                                         if value is nil
-                                                _error('Cannot process value "[valueStr]" for option "[name]".')
+                                                errMsg = 'Cannot parse value "[valueStr]" for option "[name]".'
+                                                branch spec.type
+                                                        on 'bool', errMsg += ' Possible values include yes, no, y, n, true, false, t, f, 1, 0, + and -.'
+                                                        on 'menu', errMsg += ' Possible values are [Utils.join(", ", " and ", spec.choices)].'
+                                                _error(errMsg)
                                         valueDict[name] = value to !
                                         didSpecify[name] = true
@@ -1148 +1177 @@
                                 if valueStr.length==0
                                         value = nil
-                                if not (spec['choices'] to System.Collections.IList).contains(valueStr)
+                                if not valueStr in spec.choices
                                         value = nil
                                 else
@@ -1163 +1192 @@
                 
         def _error(msg as String)
-                if msg.length
-                        print 'cobra: error: [msg]'
-                        print 'Run Cobra without options to get full usage information.'
-                Environment.exit(1)
+                throw ArgParseException(msg)
 
 

cobra/trunk/Source/Utils.cobra

@@ -166 +166 @@
                                         sb.append(part.toString)
                                         s = sep
+                                return sb.toString
+
+                # CC: make join an extension method of String which already has a join() except that it only works on arrays of strings
+                def join(sep as String, lastSep as String, parts as System.Collections.IEnumerable) as String
+                        test
+                                assert Utils.join(', ', ' and ', ['a', 'b'])=='a and b'
+                                assert Utils.join(', ', ' and ', ['a', 'b', 'c'])=='a, b and c'
+                                assert Utils.join(', ', ' and ', ['a', 'b', 'c', 'd'])=='a, b, c and d'
+                        body
+                                sb = StringBuilder()
+                                s = ''
+                                partsList = []
+                                for part in parts, partsList.add(part)
+                                count = partsList.count
+                                for i in count
+                                        sb.append(s)
+                                        sb.append(partsList[i].toString)
+                                        s = if(i==count-2, lastSep, sep)
                                 return sb.toString