Ticket #32: tracePrintSuppress.patch

Source/CommandLine.cobra

@@ -147 +147 @@
             'description': 'Includes unit tests for classes and members in the output assembly.',
         },
         {
+            'name': 'include-traces',
+            'type': 'bool',
+            'default': 'yes',
+            'description': 'Includes tracing code in the output assembly.',
+        },
+        {
             'name': 'keep-intermediate-files',
             'synonyms': ['kif'],
             'type': 'bool',
@@ -595 +601 @@
             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 Dictionary<of String, Object>) as dynamic?

Source/CobraLang.cobra

@@ -92 +92 @@
                 _dest.writeLine(source.oneLiner(.separator, .willOutputDirectoryNames))
                 if .willAutoFlush
                     _dest.flush
-
+                    
+        def tracePrint(source as SourceSite, nameValues as vari Object)
+            require nameValues.length % 2 == 0
+            if .isActive
+                _dest.write(.prefix)
+                sep = ' ' # .separator
+                i = 0
+                while i < nameValues.length-1
+                    name = nameValues[i] to String
+                    if nameValues[i+1] inherits String # emit strings as is
+                        value = nameValues[i+1]
+                        _dest.write('[value][sep]')
+                    else
+                        value = CobraImp._techStringMaker.makeString(nameValues[i+1])
+                        _dest.write('[name]=[value][sep]')
+                    i += 2
+                _dest.writeLine
+                if .willAutoFlush
+                    _dest.flush
+                    
     class Visitor
         is abstract
         """

Source/CobraParser.cobra

@@ -1990 +1990 @@
             on 'EOL'
                 .expect('EOL')
                 return if(_isTraceOn, TraceLocationStmt(token, _curCodePart), nil)
+            on 'PRINT'
+                .expect('PRINT', 'EOL')
+                if _isTraceOn
+                    return TracePrintExprsStmt(token, _curCodePart, .commaSepExprs('EOL'))
+                else
+                    .commaSepExprs('EOL')
+                    return nil
             else
                 if _isTraceOn
                     return TraceExprsStmt(token, _curCodePart, .commaSepExprs('EOL'))

Source/Statements.cobra

@@ -1220 +1220 @@
     def init(token as IToken, codePart as AbstractMethod)
         base.init(token)
         _codePart = codePart
+        
+    def includeTraces as bool   
+        return .compiler.options.boolValue('include-traces')
 
-
 class TraceLocationStmt
     inherits TraceStmt
 
@@ -1230 +1232 @@
 
     def writeSharpDef(sw as SharpWriter)
         base.writeSharpDef(sw)
-        sw.write('CobraCore.Tracer.Trace([.sharpSourceSite]);\n')
+        if .includeTraces
+            sw.write('CobraCore.Tracer.Trace([.sharpSourceSite]);\n')
 
 
 class TraceAllStmt
@@ -1241 +1244 @@
 
     def writeSharpDef(sw as SharpWriter)
         base.writeSharpDef(sw)
+        if not .includeTraces
+            return
         sw.write('CobraCore.Tracer.Trace([.sharpSourceSite], "this", [_codePart.sharpThis]')
         for param in _codePart.params
             sw.write(', "[param.name]", [param.sharpName]')
@@ -1268 +1273 @@
 
     def writeSharpDef(sw as SharpWriter)
         base.writeSharpDef(sw)
+        if not .includeTraces
+            return
         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')
+        
 
+class TracePrintExprsStmt
+    inherits TraceExprsStmt
 
+    def init(token as IToken, codePart as AbstractMethod, exprs as List<of Expr>)
+        base.init(token, codePart, exprs)
+
+    def writeSharpDef(sw as SharpWriter) is override
+        if not .includeTraces
+            return
+        sw.write('CobraCore.Tracer.TracePrint([.sharpSourceSite]')
+        sep = ', '
+        for expr in _exprs
+            sw.write('[sep][Utils.sharpStringLiteralFor(expr.toCobraSource)][sep]')
+            expr.writeSharpDef(sw, false)
+        sw.write(');\n')
+
+
 class TryStmt
     inherits Stmt
 

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

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

Tests/700-command-line/601-include-traces.cobra

@@ +1 @@
+# .args. -include-traces:no
+
+class Program
+
+    def main is shared
+        x=1
+        trace 
+        trace all
+        trace x
+        trace off
+        trace 'hello'
+        trace on
+        trace print 'hello2'

Tests/110-basics-two/900-trace.cobra

@@ -27 +27 @@
         trace
         trace on
         trace
-
+        trace print x
+        trace print x,y
+        trace print 'x is [x]', y
+        
         output = tracer.destination.toString.replace('\r', '')
         lines = output.split(c'\n')
         .check(lines[0], 'prefix: at FILE:15 | in Test.testTrace')
@@ -39 +42 @@
         .check(lines[6], 'prefix: i=3 | at FILE:23 | in Test.testTrace')
         .check(lines[7], 'prefix: this=Test | x=2 | y=2 | tracer=Cobra.Lang.Tracer | i=3 | output=nil | lines=nil | at FILE:24 | in Test.testTrace')
         .check(lines[8], 'prefix: at FILE:29 | in Test.testTrace')
+        .check(lines[9], 'prefix: x=2 ')
+        .check(lines[10],'prefix: x=2 y=2 ')
+        .check(lines[11],'prefix: x is 2 y=2 ')
 
     def check(actual as String, expected as String) is shared
         if CobraCore.isRunningOnMono
             expected = expected.replace('RuntimeType', 'MonoType')
         # fix filename in actual
         i = actual.indexOf(' at ')
-        i += 4
-        j = actual.indexOf(':', i)
-        actual = actual[:i] + 'FILE' + actual[j:]
+        if i >= 0
+            i += 4
+            j = actual.indexOf(':', i)
+            actual = actual[:i] + 'FILE' + actual[j:]
 
         assert actual == expected
 
@@ -56 +63 @@
         CobraCore.tracer.destination = StringWriter()
         trace
         output = CobraCore.tracer.destination.toString.trim
-        .check(output, 'prefix: at FILE:57 | in Test.testStaticTrace')
+        .check(output, 'prefix: at FILE:64 | in Test.testStaticTrace')
 
         # trace all in a shared method
         CobraCore.tracer.destination = StringWriter()
         output = 'o'
         trace all
         output = CobraCore.tracer.destination.toString.trim
-        .check(output, "prefix: this=Test (RuntimeType) | output='o' | at FILE:64 | in Test.testStaticTrace")
+        .check(output, "prefix: this=Test (RuntimeType) | output='o' | at FILE:71 | in Test.testStaticTrace")

Developer/IntermediateReleaseNotes.text

@@ -1 +1 @@
 Post 0.8
 
+* Add trace form trace print, emits trace lines without position info and 
+    strings are emitted as is ( no name=value form).
+ 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.
 
 * Add support for specifying unsigned integers as Hex literals