Changeset 1699

Timestamp:

10/21/08 20:06:10 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Add compile option -include-traces default value yes to allow compile time suppression of any trace code.

credit:hopscc, Chuck
ticket:32

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/CommandLine.cobra (modified) (3 diffs)
• Source/SharpGenerator.cobra (modified) (3 diffs)
• Source/Statements.cobra (modified) (1 diff)
• Tests/700-command-line/601-include-traces.cobra (added)
• Tests/700-command-line/602-turbo.cobra (modified) (1 diff)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -73 +73 @@
      parenthesised expressions.
 
+* Add compile option -include-traces default value yes to allow compile time suppression of any trace code.
+ 
 * Added a new built-in doc tool accessible via "cobra -doc ...". The documentation is generated to local HTML files using your declarations, doc strings, contracts, etc.
 

cobra/trunk/Source/CommandLine.cobra

@@ -154 +154 @@
                 },
                 {
+                        'name': 'include-traces',
+                        'type': 'bool',
+                        'default': 'yes',
+                        'description': 'Includes trace statements in the output assembly.',
+                },
+                {
                         'name': 'keep-intermediate-files',
                         'synonyms': ['kif'],
@@ -278 +284 @@
                 {
                         'name': 'turbo',
-                        'description': 'Maximum run-time performance. This is a convenience for -contracts:none -include-asserts:no -include-nil-checks:no -include-tests:no -optimize',
+                        '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',
                         'type': 'bool',
                 },
@@ -937 +943 @@
                         options['include-nil-checks'] = false
                         options['include-tests'] = false
+                        options['include-traces'] = false
                         options['optimize'] = true
                         

cobra/trunk/Source/SharpGenerator.cobra

@@ -2657 +2657 @@
         def writeSharpDef(sw as SharpWriter)
                 base.writeSharpDef(sw)
-                sw.write('CobraCore.Tracer.Trace([.sharpSourceSite]);\n')
+                if .includeTraces
+                        sw.write('CobraCore.Tracer.Trace([.sharpSourceSite]);\n')
 
 
@@ -2665 +2666 @@
         def writeSharpDef(sw as SharpWriter)
                 base.writeSharpDef(sw)
-                sw.write('CobraCore.Tracer.Trace([.sharpSourceSite], "this", [_codePart.sharpThis]')
-                for param in _codePart.params
-                        sw.write(', "[param.name]", [param.sharpName]')
-                for local in _codePart.locals
-                        sw.write(', "[local.name]", [local.sharpName]')
-                sw.write(');\n')
+                if .includeTraces
+                        sw.write('CobraCore.Tracer.Trace([.sharpSourceSite], "this", [_codePart.sharpThis]')
+                        for param in _codePart.params
+                                sw.write(', "[param.name]", [param.sharpName]')
+                        for local in _codePart.locals
+                                sw.write(', "[local.name]", [local.sharpName]')
+                        sw.write(');\n')
 
 
@@ -2678 +2680 @@
         def writeSharpDef(sw as SharpWriter)
                 base.writeSharpDef(sw)
-                sw.write('CobraCore.Tracer.Trace([.sharpSourceSite]')
-                sep = ', '
-                for expr in _exprs
-                        sw.write('[sep][Utils.sharpStringLiteralFor(expr.toCobraSource)][sep]')
-                        expr.writeSharpDef(sw, false)
-                sw.write(');\n')
+                if .includeTraces
+                        sw.write('CobraCore.Tracer.Trace([.sharpSourceSite]')
+                        sep = ', '
+                        for expr in _exprs
+                                sw.write('[sep][Utils.sharpStringLiteralFor(expr.toCobraSource)][sep]')
+                                expr.writeSharpDef(sw, false)
+                        sw.write(');\n')
 
 

cobra/trunk/Source/Statements.cobra

@@ -950 +950 @@
                 _codePart = codePart
 
+        def includeTraces as bool       
+                return .compiler.options.boolValue('include-traces')
+
 
 class TraceLocationStmt

cobra/trunk/Tests/700-command-line/602-turbo.cobra

@@ -5 +5 @@
         def main is shared
                 assert false
+                trace 
+                x = 1
+                trace all
+                trace x