Ticket #141: ticket141-turbo-plus1.patch

Source/CommandLine.cobra

@@ -63 +63 @@
                     return not CobraCore.isRunningOnMono
         return false
 
+    def hasBoolTrue(name as String) as bool
+        """
+        Contains key of name and value is boolean true 
+        """
+        return .containsKey(name) and (this[name] to bool) 
+        
     def unpack
         _name = this['name'] to String
         try
@@ -445 +451 @@
         },
         {
             'name': 'turbo',
-            'description': 'Maximum run-time performance. This is a convenience for -contracts:none -include-asserts:no -include-nil-checks:no -include-tests:no -include-traces:no -optimize',
+            'description': 'Build to maximize run-time performance. This is a convenience for -contracts:none -include-asserts:no -include-nil-checks:no -include-tests:no -include-traces:no -optimize',
             'type': 'bool',
+            'composite': true,
         },
         {
             'name': 'verbosity',
@@ -792 +799 @@
         for spec in CommandLineOptionSpecs().specsList
             if spec.containsKey('type') and spec['type']=='main' # CC: spec.get('main', '')
                 continue
-            if spec.containsKey('developer-only') and spec['developer-only'] to bool and not Utils.isDevMachine
+            if spec.hasBoolTrue('developer-only')and not Utils.isDevMachine
                 continue
             if spec.isOptionSpecRestrictionViolated
                 continue
@@ -1039 +1046 @@
                         continue
                         
                     value = _processToValue(name, valueStr, spec, mainOptions)
-                    if value == 'args-list'
-                        value = args[argn:]
-                    if value is nil
-                        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 [spec.choices.join(", ", " and ")].'
-                        _error(errMsg)
-                    valueDict[name] = value to !
-                    didSpecify[name] = true
+                    if value == 'args-list', value = args[argn:] # remainder of argslist
+                    if value is nil 
+                        _emitArgsParseError(name, valueStr, spec)
+                    _setArgComposite(name, value to !, spec, valueDict, didSpecify)     
                     if spec.type == 'args-list'
                         break   # absorbed remainder of args
                 else # not isOption
@@ -1062 +1063 @@
             _addInDefaults(valueDict)       
 
             # TODO: make the option names case-insensitive
-
             if mainOptions.count > 1
                 _error('Cannot have these main options at the same time: [mainOptions.join(", ")]')
 
@@ -1157 +1157 @@
         if valueDict.containsKey(name)
             (valueDict[name] to System.Collections.IList).add(value)
         else
-            valueDict[name] = [value to String]
-            didSpecify[name] = true
+            _setArg(name, [value to String], valueDict, didSpecify)
 
+    def _setArg(name as String, value as dynamic, 
+                valueDict as Dictionary<of String, Object>,
+                didSpecify as Dictionary<of String, bool>)
+        valueDict[name]  = value
+        didSpecify[name] = true
+        
     def _fixDebug(valueStr as String) as String?
         if valueStr == 'pdbonly' or valueStr == 'full'
             return valueStr
@@ -1189 +1194 @@
                 value = _interpretValue(valueStr, spec)
         return value
 
+    def _emitArgsParseError(name as String, valueStr as String, spec as OptionSpec)
+        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 [spec.choices.join(", ", " and ")].'
+        _error(errMsg)
+        
+    def _setArgComposite(name as String, value, spec as OptionSpec, 
+            valueDict as Dictionary<of String, Object>,
+            didSpecify as Dictionary<of String, bool>)
+        if spec.hasBoolTrue('composite')
+            branch name  
+                on 'turbo'
+                    _setArg('contracts',          'none', valueDict, didSpecify)
+                    _setArg('include-asserts',    false,  valueDict, didSpecify)
+                    _setArg('include-nil-checks', false,  valueDict, didSpecify)
+                    _setArg('include-tests',      false,  valueDict, didSpecify)
+                    _setArg('include-traces',     false,  valueDict, didSpecify)
+                    _setArg('optimize',           true,   valueDict, didSpecify)
+                else
+                    _error('Unknown composite arg "[name]"')
+        else
+            _setArg(name, value to !, valueDict, didSpecify)
+        
     def _handleSynonyms(valueDict as Dictionary<of String, Object>)
         for syn in _synList
             if valueDict.containsKey(syn)
@@ -1271 +1300 @@
             options['compile'] = true
         if options.getDefault('debug', '') not in ['', '0', '-'] and not options.isSpecified('debugging-tips')
             options['debugging-tips'] = false
-        if options.boolValue('turbo')
-            options['contracts'] = 'none'
-            options['include-asserts'] = false
-            options['include-nil-checks'] = false
-            options['include-tests'] = false
-            options['include-traces'] = false
-            options['optimize'] = true
-            
+
     def _interpretValue(valueStr as String, spec as OptionSpec) as dynamic?
         value as dynamic?
         branch spec.type

Tests/700-command-line/603-turbo-plus.cobra

@@ +1 @@
+# test -turbo with suboptions overidden, 
+# test that options are LtoR order dependant
+
+use System.Diagnostics
+
+class Test
+
+    def main is shared
+        Test().runOverride
+        Test().runTurboAfter
+
+    def runOverride
+        sub = '603a-sub.cobra'
+        ite  = '-include-tests:yes'
+        itr  = '-include-traces:yes'
+        ia   = '-include-asserts:yes'
+
+        output = .runCobraExe('-turbo [sub]')
+        try
+            assert '** Test' not in output
+            assert 'trace:' not in output
+            assert 'AssertException' not in output
+            assert 'OKThxBai' in output
+        success
+            print '-turbo OK'
+
+        output = .runCobraExe('-turbo [ite] [sub]')
+        try
+            assert '** Test' in output
+            assert 'trace:' not in output
+            assert 'AssertException' not in output
+            assert 'OKThxBai' in output
+        success
+            print '-turbo [ite] OK'
+            
+        output = .runCobraExe('-turbo [itr] [sub]')
+        try
+            assert '** Test' not in output
+            assert 'trace: a=99;'  in output
+            assert 'AssertException' not in output
+            assert 'OKThxBai' in output
+        success
+            print '-turbo [itr] OK'
+        
+        output = .runCobraExe('-turbo [ia] [sub]')
+        try
+            assert '** Test' not in output
+            assert 'trace:'  not in output
+            assert 'AssertException thrown' in output
+            assert 'OKThxBai' in output
+        success
+            print '-turbo [ia] OK'
+        
+        output = .runCobraExe('-turbo [ia] [itr] [ite] [sub]')
+        try
+            assert '** Test' in output
+            assert 'trace:'  in output
+            assert 'AssertException thrown' in output
+            assert 'OKThxBai' in output
+        success
+            print '-turbo [ia] [itr] [ite]  OK'
+        
+    def runTurboAfter
+        sub = '603a-sub.cobra'
+        ite  = '-include-tests:yes'
+        itr  = '-include-traces:yes'
+        ia   = '-include-asserts:yes'
+
+        output = .runCobraExe('[ia] [itr] [ite] -turbo [sub]')
+        try
+            assert '** Test' not in output
+            assert 'trace:'  not in output
+            assert 'AssertException thrown' not in output
+            assert 'OKThxBai' in output
+        success
+            print '[ia] [itr] [ite] -turbo OK'
+        
+        output = .runCobraExe('[ia] [itr] [ite] -turbo [ia] [sub]')
+        try
+            assert '** Test' not in output
+            assert 'trace:'  not in output
+            assert 'AssertException thrown' in output
+            assert 'OKThxBai' in output
+        success
+            print '[ia] [itr] [ite] -turbo [ia] OK'
+            
+        output = .runCobraExe('[ia] [itr] [ite] -turbo [ia] [itr] [sub]')
+        try
+            assert '** Test' not in output
+            assert 'trace:'  in output
+            assert 'AssertException thrown' in output
+            assert 'OKThxBai' in output
+        success
+            print '[ia] [itr] [ite] -turbo [ia] [itr] OK'
+        
+            
+    def runCobraExe(args as String) as String
+        p as System.Diagnostics.Process?
+        return CobraCore.runCobraExe(args, out p)

Tests/700-command-line/603a-sub.cobra

@@ +1 @@
+# .skip.
+# executed by 603-turbo-plus
+class Test
+    def main is shared
+        test
+            print '** Test'
+        body
+            a = 99
+            trace a
+            print 'OKThxBai'
+            try
+                assert a == 100
+            catch AssertException   
+                print 'AssertException thrown'

Developer/IntermediateReleaseNotes.text

@@ -404 +404 @@
 * Fixed: Numeric for expression broken for `get` expressions with types other than `int`  ticket:158
 
 * Fixed: Operators `?` and `?=` give error if left hand expression is not nilable.  ticket:117
+
+* Fixed: Cannot effectively put more options after -turbo. ticket:141