Ticket #182: timeitBug.patch

Source/CommandLine.cobra

@@ -738 +738 @@
         if .options.boolValue('compile')  # maybe changed by compiler directive
             return
 
+        sw = System.Diagnostics.Stopwatch()
+        sw.start
+    
         exeFileName as String? = nil
         runArgs = .options.getStringList('run-args')
         # TODO: what's this?
@@ -759 +762 @@
             if 'elevation' in exc.message
                 print 'If you are on Windows Vista, using an admin or power user account may avoid this problem.'
             Environment.exit(1)
-
+        sw.stop
+        CobraMain.runTime = sw.elapsed
+        
     def doHelp
         .doAbout
         print ''

Source/cobra.cobra

@@ -3 +3 @@
     shared
 
         pro willTimeIt from var as bool
+        pro runTime from var as TimeSpan
         pro linesCompiled from var as int
         pro nodesCompiled from var as int
         pro tokensCompiled from var as int
@@ -17 +18 @@
             finally
                 sw.stop
                 if _willTimeIt
-                    print 'timeit = [sw.elapsed]'
-                    if sw.elapsed.totalSeconds < 2
-                        print 'timeit = [sw.elapsedMilliseconds] ms'
+                    elapsed = sw.elapsed
+                    print 'timeit = [elapsed]'
+                    if .linesCompiled + .nodesCompiled + .tokensCompiled
+                        elapsed = elapsed.subtract(.runTime)
+                        .printCompileTimes(elapsed)
 
-                    secs = sw.elapsedMilliseconds / 1_000.0
-                    lps = .linesCompiled / secs
-                    print '[.linesCompiled] lines compiled = [lps:F2] lines/sec'
-                    nps = .nodesCompiled / secs
-                    print '[.nodesCompiled] nodes compiled = [nps:F2] nodes/sec'
-                    tps = .tokensCompiled / secs
-                    print '[.tokensCompiled] tokens compiled = [tps:F2] tokens/sec'
+        def printCompileTimes(elapsed as TimeSpan)
+            print 'ccOnly = [elapsed]'
+            if elapsed.totalSeconds < 2
+                print 'timeit = [elapsed.milliseconds] ms'
 
+            secs = elapsed.totalMilliseconds / 1_000
+            if .linesCompiled
+                lps = .linesCompiled / secs
+                print '[.linesCompiled] lines compiled = [lps:F2] lines/sec'
+            if .nodesCompiled
+                nps = .nodesCompiled / secs
+                print '[.nodesCompiled] nodes compiled = [nps:F2] nodes/sec'
+            if .tokensCompiled
+                tps = .tokensCompiled / secs
+                print '[.tokensCompiled] tokens compiled = [tps:F2] tokens/sec'
+
         def printEx(ex as Exception)
             print
             if true

Tests/700-command-line/113-timeit.cobra

@@ +1 @@
+class Timeit
+
+    def main is shared
+        Timeit().runTest
+
+    def runTest
+        sub = '110-hello.cobra'
+
+        output = .runCobraExe('[sub]')
+        try
+            assert 'timeit =' not in output
+            assert 'Hello' in output
+        success
+            print 'No timeit OK'
+            
+        output = .runCobraExe('-timeit [sub]')
+        try
+            assert 'timeit =' in output
+            assert 'ccOnly =' in output
+            assert 'lines compiled' in output
+            assert 'nodes compiled' in output
+            assert 'tokens compiled' in output
+            assert 'Hello' in output
+        success
+            print '-timeit OK'
+            
+    def runCobraExe(args as String) as String
+        p as System.Diagnostics.Process?
+        return CobraCore.runCobraExe(args, out p)
+