Merge pull request #38 from noricor/magic

Pure virtual function definitions and overrides are no longer counted as magic numbers

metrixpp/ext/std/code/magic.ini

@@ -6,10 +6,10 @@
 ;    
 
 [Plugin]
-version: 1.2
+version: 1.3
 package: std.code
 module:  magic
 class:   Plugin
 depends: None
 actions: collect
-enabled: True
+enabled: True

metrixpp/ext/std/code/magic.py

@@ -28,16 +28,23 @@ class Plugin(api.Plugin,
     
     def initialize(self):
         pattern_to_search_java = re.compile(
-            r'''((const(\s+[_$a-zA-Z][_$a-zA-Z0-9]*)+\s*[=]\s*)[-+]?[0-9]+\b)|(\b[0-9]+\b)''')
-        pattern_to_search_cpp_cs = re.compile(
-            r'''((const(\s+[_a-zA-Z][_a-zA-Z0-9]*)+\s*[=]\s*)[-+]?[0-9]+\b)|(\b[0-9]+\b)''')
+            r'''((const(\s+[_$a-zA-Z][_$a-zA-Z0-9]*)+\s*[=]\s*)[-+]?[0-9]+\b)'''
+            r'''|(\b[0-9]+\b)''')
+        pattern_to_search_cpp = re.compile(
+            r'''((const(\s+[_a-zA-Z][_a-zA-Z0-9]*)+\s*[=]\s*)[-+]?[0-9]+\b)'''
+            r'''|(virtual\s+.*\s*[=]\s*[0]\s*[,;])'''
+            r'''|(override\s+[=]\s*[0]\s*[,;])'''
+            r'''|(\b[0-9]+\b)''')
+        pattern_to_search_cs = re.compile(
+            r'''((const(\s+[_a-zA-Z][_a-zA-Z0-9]*)+\s*[=]\s*)[-+]?[0-9]+\b)'''
+            r'''|(\b[0-9]+\b)''')
         self.declare_metric(self.is_active_numbers,
                             self.Field('numbers', int,
                                 non_zero=True),
                             {
                              'std.code.java': (pattern_to_search_java, self.NumbersCounter),
-                             'std.code.cpp': (pattern_to_search_cpp_cs, self.NumbersCounter),
-                             'std.code.cs': (pattern_to_search_cpp_cs, self.NumbersCounter),
+                             'std.code.cpp': (pattern_to_search_cpp, self.NumbersCounter),
+                             'std.code.cs': (pattern_to_search_cs, self.NumbersCounter),
                             },
                             marker_type_mask=api.Marker.T.CODE,
                             region_type_mask=api.Region.T.ANY)
@@ -51,6 +58,8 @@ class Plugin(api.Plugin,
     class NumbersCounter(api.MetricPluginMixin.IterIncrementCounter):
         def increment(self, match):
             if (match.group(0).startswith('const') or
+                match.group(0).startswith('virtual') or
+                match.group(0).startswith('override') or
                 (self.plugin.is_active_numbers_simplier == True and
                  match.group(0) in ['0', '1', '-1', '+1'])):
                 return 0

metrixpp/tests/general/test_basic/sources/simple.cpp

@@ -64,6 +64,9 @@ class A
 		return 1;
 	}
 
+    virtual int pure_virtual_method() = 0;
+    int pure_virtual_overrider() override = 0;
+
 	int m_me88er = 10;
 };
 

metrixpp/tests/general/test_basic/test_std_code_magic_view_nest_per_file_stdout.gold.txt

@@ -1,22 +1,22 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
+	Offsets        : 0-788
+	Line numbers   : 1-74
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
+    	Offsets        : 2-787
+    	Line numbers   : 3-73
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
+        	Offsets        : 94-783
+        	Line numbers   : 9-71
         	Modified       : None
         	std.code.magic:numbers: 1
 

metrixpp/tests/general/test_basic/test_std_code_magic_view_nozeros_nest_per_file_stdout.gold.txt

@@ -1,22 +1,22 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
+	Offsets        : 0-788
+	Line numbers   : 1-74
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
+    	Offsets        : 2-787
+    	Line numbers   : 3-73
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
+        	Offsets        : 94-783
+        	Line numbers   : 9-71
         	Modified       : None
         	std.code.magic:numbers: 1
 

metrixpp/tests/general/test_basic/test_std_complexity_maxindent_view_nest_per_file_stdout.gold.txt

@@ -1,22 +1,22 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
+	Offsets        : 0-788
+	Line numbers   : 1-74
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
+    	Offsets        : 2-787
+    	Line numbers   : 3-73
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
+        	Offsets        : 94-783
+        	Line numbers   : 9-71
         	Modified       : None
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region

metrixpp/tests/general/test_basic/test_std_filelines_metrics_view_nest_per_file_stdout.gold.txt

@@ -1,22 +1,22 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
+	Offsets        : 0-788
+	Line numbers   : 1-74
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
+    	Offsets        : 2-787
+    	Line numbers   : 3-73
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
+        	Offsets        : 94-783
+        	Line numbers   : 9-71
         	Modified       : None
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region
@@ -76,19 +76,19 @@
             	Modified       : None
 
 ./simple.cpp:0: info: Metrics per file
-	std.code.filelines:code: 53
+	std.code.filelines:code: 55
 	std.code.filelines:comments: 5
 	std.code.filelines:preprocessor: 1
-	std.code.filelines:total: 58
+	std.code.filelines:total: 60
 
 ./simple.cpp:: info: Overall metrics for 'std.code.filelines:code' metric
-	Average        : 53.0
-	Minimum        : 53
-	Maximum        : 53
-	Total          : 53.0
+	Average        : 55.0
+	Minimum        : 55
+	Maximum        : 55
+	Total          : 55.0
 	Distribution   : 1 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
-	            53 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	            55 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.filelines:comments' metric
 	Average        : 5.0
@@ -109,12 +109,12 @@
 	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.filelines:total' metric
-	Average        : 58.0
-	Minimum        : 58
-	Maximum        : 58
-	Total          : 58.0
+	Average        : 60.0
+	Minimum        : 60
+	Maximum        : 60
+	Total          : 60.0
 	Distribution   : 1 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
-	            58 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	            60 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 

metrixpp/tests/general/test_basic/test_std_filelines_metrics_view_txt_stdout.gold.txt

@@ -1,12 +1,12 @@
 ./:: info: Overall metrics for 'std.code.filelines:code' metric
-	Average        : 37.0
+	Average        : 38.0
 	Minimum        : 21
-	Maximum        : 53
-	Total          : 74.0
+	Maximum        : 55
+	Total          : 76.0
 	Distribution   : 2 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
 	            21 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	            53 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	            55 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.filelines:comments' metric
 	Average        : 5.0
@@ -28,14 +28,14 @@
 	             1 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.filelines:total' metric
-	Average        : 41.5
+	Average        : 42.5
 	Minimum        : 25
-	Maximum        : 58
-	Total          : 83.0
+	Maximum        : 60
+	Total          : 85.0
 	Distribution   : 2 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
 	            25 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	            58 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	            60 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Directory content:
 	File           : file_deleted_in_new_sources.cpp

metrixpp/tests/general/test_basic/test_std_general_metrics_view_nest_per_file_stdout.gold.txt

@@ -1,22 +1,22 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
+	Offsets        : 0-788
+	Line numbers   : 1-74
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
+    	Offsets        : 2-787
+    	Line numbers   : 3-73
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
+        	Offsets        : 94-783
+        	Line numbers   : 9-71
         	Modified       : None
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region
@@ -77,7 +77,7 @@
 
 ./simple.cpp:0: info: Metrics per file
 	std.general:proctime: 0.01
-	std.general:size: 697
+	std.general:size: 788
 
 ./simple.cpp:: info: Overall metrics for 'std.general:procerrors' metric
 	Average        : None
@@ -97,12 +97,12 @@
 	        0.0100 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.general:size' metric
-	Average        : 697.0
-	Minimum        : 697
-	Maximum        : 697
-	Total          : 697.0
+	Average        : 788.0
+	Minimum        : 788
+	Maximum        : 788
+	Total          : 788.0
 	Distribution   : 1 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
-	           697 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	           788 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 

metrixpp/tests/general/test_basic/test_std_general_metrics_view_txt_stdout.gold.txt

@@ -16,14 +16,14 @@
 	        0.0100 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.general:size' metric
-	Average        : 488.0
+	Average        : 533.5
 	Minimum        : 279
-	Maximum        : 697
-	Total          : 976.0
+	Maximum        : 788
+	Total          : 1067.0
 	Distribution   : 2 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
 	           279 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	           697 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	           788 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Directory content:
 	File           : file_deleted_in_new_sources.cpp

metrixpp/tests/general/test_basic/test_std_lines_metrics_view_nest_per_file_stdout.gold.txt

@@ -1,8 +1,8 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
+	Offsets        : 0-788
+	Line numbers   : 1-74
 	Modified       : None
 	std.code.lines:code: 0
 	std.code.lines:comments: 0
@@ -12,8 +12,8 @@
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
+    	Offsets        : 2-787
+    	Line numbers   : 3-73
     	Modified       : None
     	std.code.lines:code: 4
     	std.code.lines:comments: 1
@@ -23,13 +23,13 @@
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
+        	Offsets        : 94-783
+        	Line numbers   : 9-71
         	Modified       : None
-        	std.code.lines:code: 4
+        	std.code.lines:code: 6
         	std.code.lines:comments: 0
         	std.code.lines:preprocessor: 0
-        	std.code.lines:total: 4
+        	std.code.lines:total: 6
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region
             	Region name    : A
@@ -120,16 +120,17 @@
             	std.code.lines:total: 7
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.09090909
+	Average        : 5.27272727
 	Minimum        : 0
 	Maximum        : 11
-	Total          : 56.0
+	Total          : 58.0
 	Distribution   : 11 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1	|||||||||
 	             3 : 0.182 : 0.273 :  2	||||||||||||||||||
-	             4 : 0.182 : 0.455 :  2	||||||||||||||||||
-	             5 : 0.182 : 0.636 :  2	||||||||||||||||||
+	             4 : 0.091 : 0.364 :  1	|||||||||
+	             5 : 0.182 : 0.545 :  2	||||||||||||||||||
+	             6 : 0.091 : 0.636 :  1	|||||||||
 	             7 : 0.273 : 0.909 :  3	|||||||||||||||||||||||||||
 	            11 : 0.091 : 1.000 :  1	|||||||||
 
@@ -155,17 +156,16 @@
 	             1 : 0.091 : 1.000 :  1	|||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.54545455
+	Average        : 5.72727273
 	Minimum        : 0
 	Maximum        : 12
-	Total          : 61.0
+	Total          : 63.0
 	Distribution   : 11 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1	|||||||||
 	             3 : 0.182 : 0.273 :  2	||||||||||||||||||
-	             4 : 0.091 : 0.364 :  1	|||||||||
-	             5 : 0.182 : 0.545 :  2	||||||||||||||||||
-	             6 : 0.091 : 0.636 :  1	|||||||||
+	             5 : 0.182 : 0.455 :  2	||||||||||||||||||
+	             6 : 0.182 : 0.636 :  2	||||||||||||||||||
 	             7 : 0.091 : 0.727 :  1	|||||||||
 	             8 : 0.182 : 0.909 :  2	||||||||||||||||||
 	            12 : 0.091 : 1.000 :  1	|||||||||

metrixpp/tests/general/test_basic/test_std_lines_metrics_view_txt_stdout.gold.txt

@@ -1,14 +1,15 @@
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 4.875
+	Average        : 5.0
 	Minimum        : 0
 	Maximum        : 11
-	Total          : 78.0
+	Total          : 80.0
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
 	             3 : 0.188 : 0.312 :  3	||||||||||||||||||
-	             4 : 0.188 : 0.500 :  3	||||||||||||||||||
-	             5 : 0.125 : 0.625 :  2	||||||||||||
+	             4 : 0.125 : 0.438 :  2	||||||||||||
+	             5 : 0.125 : 0.562 :  2	||||||||||||
+	             6 : 0.062 : 0.625 :  1	||||||
 	             7 : 0.250 : 0.875 :  4	|||||||||||||||||||||||||
 	             8 : 0.062 : 0.938 :  1	||||||
 	            11 : 0.062 : 1.000 :  1	||||||
@@ -36,17 +37,16 @@
 	             1 : 0.062 : 1.000 :  1	||||||
 
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.4375
+	Average        : 5.5625
 	Minimum        : 0
 	Maximum        : 12
-	Total          : 87.0
+	Total          : 89.0
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
 	             3 : 0.188 : 0.312 :  3	||||||||||||||||||
-	             4 : 0.062 : 0.375 :  1	||||||
-	             5 : 0.125 : 0.500 :  2	||||||||||||
-	             6 : 0.062 : 0.562 :  1	||||||
+	             5 : 0.125 : 0.438 :  2	||||||||||||
+	             6 : 0.125 : 0.562 :  2	||||||||||||
 	             7 : 0.188 : 0.750 :  3	||||||||||||||||||
 	             8 : 0.125 : 0.875 :  2	||||||||||||
 	             9 : 0.062 : 0.938 :  1	||||||

metrixpp/tests/general/test_basic/test_std_maintindex_view_txt_stdout.gold.txt

@@ -10,16 +10,17 @@
 	             3 : 0.125 : 1.000 : 1	||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 4.875
+	Average        : 5.0
 	Minimum        : 0
 	Maximum        : 11
-	Total          : 78.0
+	Total          : 80.0
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
 	             3 : 0.188 : 0.312 :  3	||||||||||||||||||
-	             4 : 0.188 : 0.500 :  3	||||||||||||||||||
-	             5 : 0.125 : 0.625 :  2	||||||||||||
+	             4 : 0.125 : 0.438 :  2	||||||||||||
+	             5 : 0.125 : 0.562 :  2	||||||||||||
+	             6 : 0.062 : 0.625 :  1	||||||
 	             7 : 0.250 : 0.875 :  4	|||||||||||||||||||||||||
 	             8 : 0.062 : 0.938 :  1	||||||
 	            11 : 0.062 : 1.000 :  1	||||||

metrixpp/tests/general/test_basic/test_std_member_metrics_view_nest_per_file_stdout.gold.txt

@@ -1,16 +1,16 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
+	Offsets        : 0-788
+	Line numbers   : 1-74
 	Modified       : None
 	std.code.member:namespaces: 1
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
+    	Offsets        : 2-787
+    	Line numbers   : 3-73
     	Modified       : None
     	std.code.member:classes: 1
     	std.code.member:types: 1
@@ -18,8 +18,8 @@
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
+        	Offsets        : 94-783
+        	Line numbers   : 9-71
         	Modified       : None
         	std.code.member:methods: 4
 

metrixpp/tests/general/test_basic/test_workflow_export_default_stdout.gold.txt

@@ -5,9 +5,9 @@ file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std
 ./file_deleted_in_new_sources.cpp,B,function,,12,20,1,8,2,0,9,,,,
 ./file_deleted_in_new_sources.cpp,never_old,function,,26,33,1,7,0,0,7,,,,
 ./file_deleted_in_new_sources.cpp,,file,,1,34,,,,,,,,,
-./simple.cpp,__global__,global,,1,71,,0,0,0,0,,,,
-./simple.cpp,hmm,namespace,,3,70,,4,1,1,6,,,,
-./simple.cpp,A,class,,9,68,,4,0,0,4,,,,
+./simple.cpp,__global__,global,,1,74,,0,0,0,0,,,,
+./simple.cpp,hmm,namespace,,3,73,,4,1,1,6,,,,
+./simple.cpp,A,class,,9,71,,6,0,0,6,,,,
 ./simple.cpp,A,function,,12,23,3,11,2,0,12,,,,
 ./simple.cpp,func,function,,26,40,1,5,0,0,5,,,,
 ./simple.cpp,embeded,class,,28,38,,3,0,0,3,,,,
@@ -16,4 +16,4 @@ file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std
 ./simple.cpp,embeded,class,,44,54,,3,0,0,3,,,,
 ./simple.cpp,embeded,function,,46,53,1,7,1,0,8,,,,
 ./simple.cpp,never,function,,58,65,1,7,0,0,7,,,,
-./simple.cpp,,file,,1,71,,,,,,,,,
+./simple.cpp,,file,,1,74,,,,,,,,,

metrixpp/tests/general/test_basic/test_workflow_info_default_stdout.gold.txt

@@ -8,7 +8,7 @@ test_workflow.db:: info: Created using plugins and settings:
 	std.code.java:version: 1.1
 	std.code.java:files: *.java
 	std.code.lines:version: 1.1
-	std.code.magic:version: 1.2
+	std.code.magic:version: 1.3
 	std.code.magic:number.simplier: False
 	std.code.todo:version: 1.0
 	std.code.todo:tags: FIXME,FixMe,HACK,TBD,TODO,ToDo,XXX
@@ -27,5 +27,5 @@ test_workflow.db:: info: Collected metrics:
 
 ./:: info: Processed files and checksums:
 	./file_deleted_in_new_sources.cpp: 0xfd51c243
-	./simple.cpp   : 0xcf51202e
+	./simple.cpp   : 0x9242fb5d
 

metrixpp/tests/general/test_basic/test_workflow_info_second_stdout.gold.txt

@@ -8,7 +8,7 @@ test_workflow.db:: info: Created using plugins and settings:
 	std.code.java:version: 1.1
 	std.code.java:files: *.java
 	std.code.lines:version: 1.1
-	std.code.magic:version: 1.2
+	std.code.magic:version: 1.3
 	std.code.magic:number.simplier: False
 	std.code.todo:version: 1.0
 	std.code.todo:tags: FIXME,FixMe,HACK,TBD,TODO,ToDo,XXX

metrixpp/tests/general/test_basic/test_workflow_view_default_stdout.gold.txt

@@ -12,12 +12,13 @@
                 </cyclomatic>
             </std.code.complexity>
             <std.code.lines>
-                <code avg="4.875" count="16" max="11" min="0" nonzero="False" sup="0" total="78.0">
+                <code avg="5.0" count="16" max="11" min="0" nonzero="False" sup="0" total="80.0">
                     <distribution-bars>
                         <distribution-bar count="2" metric="0" ratio="0.125" />
                         <distribution-bar count="3" metric="3" ratio="0.1875" />
-                        <distribution-bar count="3" metric="4" ratio="0.1875" />
+                        <distribution-bar count="2" metric="4" ratio="0.125" />
                         <distribution-bar count="2" metric="5" ratio="0.125" />
+                        <distribution-bar count="1" metric="6" ratio="0.0625" />
                         <distribution-bar count="4" metric="7" ratio="0.25" />
                         <distribution-bar count="1" metric="8" ratio="0.0625" />
                         <distribution-bar count="1" metric="11" ratio="0.0625" />
@@ -37,13 +38,12 @@
                         <distribution-bar count="1" metric="1" ratio="0.0625" />
                     </distribution-bars>
                 </preprocessor>
-                <total avg="5.4375" count="16" max="12" min="0" nonzero="False" sup="0" total="87.0">
+                <total avg="5.5625" count="16" max="12" min="0" nonzero="False" sup="0" total="89.0">
                     <distribution-bars>
                         <distribution-bar count="2" metric="0" ratio="0.125" />
                         <distribution-bar count="3" metric="3" ratio="0.1875" />
-                        <distribution-bar count="1" metric="4" ratio="0.0625" />
                         <distribution-bar count="2" metric="5" ratio="0.125" />
-                        <distribution-bar count="1" metric="6" ratio="0.0625" />
+                        <distribution-bar count="2" metric="6" ratio="0.125" />
                         <distribution-bar count="3" metric="7" ratio="0.1875" />
                         <distribution-bar count="2" metric="8" ratio="0.125" />
                         <distribution-bar count="1" metric="9" ratio="0.0625" />

metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_stdout.gold.txt

@@ -15,12 +15,13 @@
             </std.code.complexity>
             <std.code.lines>
                 <code avg="5.27272727" count="11" max="11" min="0" nonzero="False" sup="0" total="58.0">
-                    <__diff__ avg="0.18181818" count="0" max="0" min="0" nonzero="0" sup="0" total="2.0" />
+                    <__diff__ avg="0.0" count="0" max="0" min="0" nonzero="0" sup="0" total="0.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="0" count="1" metric="0" ratio="0.09090909" />
                         <distribution-bar __diff__="0" count="2" metric="3" ratio="0.18181818" />
-                        <distribution-bar __diff__="0" count="2" metric="4" ratio="0.18181818" />
+                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.18181818" />
                         <distribution-bar __diff__="0" count="2" metric="5" ratio="0.18181818" />
+                        <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
                         <distribution-bar __diff__="-2" count="1" metric="7" ratio="0.09090909" />
                         <distribution-bar __diff__="2" count="2" metric="8" ratio="0.18181818" />
                         <distribution-bar __diff__="0" count="1" metric="11" ratio="0.09090909" />
@@ -43,13 +44,13 @@
                     </distribution-bars>
                 </preprocessor>
                 <total avg="5.90909091" count="11" max="12" min="0" nonzero="False" sup="0" total="65.0">
-                    <__diff__ avg="0.36363636" count="0" max="0" min="0" nonzero="0" sup="0" total="4.0" />
+                    <__diff__ avg="0.18181818" count="0" max="0" min="0" nonzero="0" sup="0" total="2.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="0" count="1" metric="0" ratio="0.09090909" />
                         <distribution-bar __diff__="-1" count="1" metric="3" ratio="0.09090909" />
-                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.18181818" />
+                        <distribution-bar __diff__="2" count="2" metric="4" ratio="0.18181818" />
                         <distribution-bar __diff__="0" count="2" metric="5" ratio="0.18181818" />
-                        <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
+                        <distribution-bar __diff__="-2" count="0" metric="6" ratio="0" />
                         <distribution-bar __diff__="1" count="2" metric="7" ratio="0.18181818" />
                         <distribution-bar __diff__="-2" count="0" metric="8" ratio="0" />
                         <distribution-bar __diff__="2" count="2" metric="9" ratio="0.18181818" />
@@ -94,7 +95,7 @@
                 <region>
                     <data>
                         <std.code.lines code="4" comments="0" preprocessor="0" total="4">
-                            <__diff__ code="0" comments="0" preprocessor="0" total="0" />
+                            <__diff__ code="-2" comments="0" preprocessor="0" total="-2" />
                         </std.code.lines>
                     </data>
                     <info cursor="10" line_begin="10" line_end="75" modified="True" name="A" offset_begin="111" offset_end="831" type="class" />

metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_txt_all_stdout.gold.txt

@@ -26,10 +26,10 @@
 	Offsets        : 111-831
 	Line numbers   : 10-75
 	Modified       : True
-	std.code.lines:code: 4 [+0]
+	std.code.lines:code: 4 [-2]
 	std.code.lines:comments: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:total: 4 [+0]
+	std.code.lines:total: 4 [-2]
 
 ./simple.cpp:13: info: Metrics per 'A' region
 	Region name    : A
@@ -141,16 +141,17 @@
 	             3 : 0.143 : 1.000 : 1 [+0]	||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.27272727 [+0.18181818]
+	Average        : 5.27272727 [+0.0]
 	Minimum        : 0 [+0]
 	Maximum        : 11 [+0]
-	Total          : 58.0 [+2.0]
+	Total          : 58.0 [+0.0]
 	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
 	             3 : 0.182 : 0.273 :  2 [+0 ]	||||||||||||||||||
-	             4 : 0.182 : 0.455 :  2 [+0 ]	||||||||||||||||||
+	             4 : 0.182 : 0.455 :  2 [+1 ]	||||||||||||||||||
 	             5 : 0.182 : 0.636 :  2 [+0 ]	||||||||||||||||||
+	             6 : 0.000 : 0.636 :  0 [-1 ]	
 	             7 : 0.091 : 0.727 :  1 [-2 ]	|||||||||
 	             8 : 0.182 : 0.909 :  2 [+2 ]	||||||||||||||||||
 	            11 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
@@ -178,17 +179,17 @@
 	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.90909091 [+0.36363636]
+	Average        : 5.90909091 [+0.18181818]
 	Minimum        : 0 [+0]
 	Maximum        : 12 [+0]
-	Total          : 65.0 [+4.0]
+	Total          : 65.0 [+2.0]
 	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
 	             3 : 0.091 : 0.182 :  1 [-1 ]	|||||||||
-	             4 : 0.182 : 0.364 :  2 [+1 ]	||||||||||||||||||
+	             4 : 0.182 : 0.364 :  2 [+2 ]	||||||||||||||||||
 	             5 : 0.182 : 0.545 :  2 [+0 ]	||||||||||||||||||
-	             6 : 0.000 : 0.545 :  0 [-1 ]	
+	             6 : 0.000 : 0.545 :  0 [-2 ]	
 	             7 : 0.182 : 0.727 :  2 [+1 ]	||||||||||||||||||
 	             8 : 0.000 : 0.727 :  0 [-2 ]	
 	             9 : 0.182 : 0.909 :  2 [+2 ]	||||||||||||||||||

metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_txt_new_stdout.gold.txt

@@ -26,10 +26,10 @@
 	Offsets        : 111-831
 	Line numbers   : 10-75
 	Modified       : True
-	std.code.lines:code: 4 [+0]
+	std.code.lines:code: 4 [-2]
 	std.code.lines:comments: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:total: 4 [+0]
+	std.code.lines:total: 4 [-2]
 
 ./simple.cpp:13: info: Metrics per 'A' region
 	Region name    : A

metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_txt_touched_stdout.gold.txt

@@ -26,10 +26,10 @@
 	Offsets        : 111-831
 	Line numbers   : 10-75
 	Modified       : True
-	std.code.lines:code: 4 [+0]
+	std.code.lines:code: 4 [-2]
 	std.code.lines:comments: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:total: 4 [+0]
+	std.code.lines:total: 4 [-2]
 
 ./simple.cpp:13: info: Metrics per 'A' region
 	Region name    : A
@@ -140,15 +140,16 @@
 	             2 : 0.400 : 1.000 : 2 [+1]	||||||||||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.57142857 [+0.28571429]
+	Average        : 5.57142857 [+0.0]
 	Minimum        : 3 [+0]
 	Maximum        : 8 [+1]
-	Total          : 39.0 [+2.0]
+	Total          : 39.0 [+0.0]
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             3 : 0.143 : 0.143 : 1 [+0]	||||||||||||||
-	             4 : 0.286 : 0.429 : 2 [+0]	||||||||||||||||||||||||||||
+	             4 : 0.286 : 0.429 : 2 [+1]	||||||||||||||||||||||||||||
 	             5 : 0.143 : 0.571 : 1 [+0]	||||||||||||||
+	             6 : 0.000 : 0.571 : 0 [-1]	
 	             7 : 0.143 : 0.714 : 1 [-2]	||||||||||||||
 	             8 : 0.286 : 1.000 : 2 [+2]	||||||||||||||||||||||||||||
 
@@ -175,16 +176,16 @@
 	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 6.42857143 [+0.57142857]
+	Average        : 6.42857143 [+0.28571429]
 	Minimum        : 4 [+1]
 	Maximum        : 9 [+1]
-	Total          : 45.0 [+4.0]
+	Total          : 45.0 [+2.0]
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             3 : 0.000 : 0.000 : 0 [-1]	
-	             4 : 0.286 : 0.286 : 2 [+1]	||||||||||||||||||||||||||||
+	             4 : 0.286 : 0.286 : 2 [+2]	||||||||||||||||||||||||||||
 	             5 : 0.143 : 0.429 : 1 [+0]	||||||||||||||
-	             6 : 0.000 : 0.429 : 0 [-1]	
+	             6 : 0.000 : 0.429 : 0 [-2]	
 	             7 : 0.286 : 0.714 : 2 [+1]	||||||||||||||||||||||||||||
 	             8 : 0.000 : 0.714 : 0 [-2]	
 	             9 : 0.286 : 1.000 : 2 [+2]	||||||||||||||||||||||||||||

metrixpp/tests/general/test_basic/test_workflow_view_second_stdout.gold.txt

@@ -15,12 +15,13 @@
             </std.code.complexity>
             <std.code.lines>
                 <code avg="5.0" count="15" max="11" min="0" nonzero="False" sup="0" total="75.0">
-                    <__diff__ avg="0.125" count="-1" max="0" min="0" nonzero="0" sup="0" total="-3.0" />
+                    <__diff__ avg="0.0" count="-1" max="0" min="0" nonzero="0" sup="0" total="-5.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="0" count="2" metric="0" ratio="0.13333333" />
                         <distribution-bar __diff__="0" count="3" metric="3" ratio="0.2" />
-                        <distribution-bar __diff__="0" count="3" metric="4" ratio="0.2" />
+                        <distribution-bar __diff__="1" count="3" metric="4" ratio="0.2" />
                         <distribution-bar __diff__="0" count="2" metric="5" ratio="0.13333333" />
+                        <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
                         <distribution-bar __diff__="-3" count="1" metric="7" ratio="0.06666667" />
                         <distribution-bar __diff__="1" count="2" metric="8" ratio="0.13333333" />
                         <distribution-bar __diff__="1" count="1" metric="10" ratio="0.06666667" />
@@ -44,13 +45,13 @@
                     </distribution-bars>
                 </preprocessor>
                 <total avg="5.66666667" count="15" max="12" min="0" nonzero="False" sup="0" total="85.0">
-                    <__diff__ avg="0.22916667" count="-1" max="0" min="0" nonzero="0" sup="0" total="-2.0" />
+                    <__diff__ avg="0.10416667" count="-1" max="0" min="0" nonzero="0" sup="0" total="-4.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="0" count="2" metric="0" ratio="0.13333333" />
                         <distribution-bar __diff__="-1" count="2" metric="3" ratio="0.13333333" />
-                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.13333333" />
+                        <distribution-bar __diff__="2" count="2" metric="4" ratio="0.13333333" />
                         <distribution-bar __diff__="1" count="3" metric="5" ratio="0.2" />
-                        <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
+                        <distribution-bar __diff__="-2" count="0" metric="6" ratio="0" />
                         <distribution-bar __diff__="-1" count="2" metric="7" ratio="0.13333333" />
                         <distribution-bar __diff__="-2" count="0" metric="8" ratio="0" />
                         <distribution-bar __diff__="1" count="2" metric="9" ratio="0.13333333" />

metrixpp/tests/general/test_basic/test_workflow_view_second_txt_all_stdout.gold.txt

@@ -11,16 +11,17 @@
 	             3 : 0.250 : 1.000 : 2 [+1]	|||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.0 [+0.125]
+	Average        : 5.0 [+0.0]
 	Minimum        : 0 [+0]
 	Maximum        : 11 [+0]
-	Total          : 75.0 [-3.0]
+	Total          : 75.0 [-5.0]
 	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.133 : 0.133 :  2 [+0 ]	|||||||||||||
 	             3 : 0.200 : 0.333 :  3 [+0 ]	||||||||||||||||||||
-	             4 : 0.200 : 0.533 :  3 [+0 ]	||||||||||||||||||||
+	             4 : 0.200 : 0.533 :  3 [+1 ]	||||||||||||||||||||
 	             5 : 0.133 : 0.667 :  2 [+0 ]	|||||||||||||
+	             6 : 0.000 : 0.667 :  0 [-1 ]	
 	             7 : 0.067 : 0.733 :  1 [-3 ]	||||||
 	             8 : 0.133 : 0.867 :  2 [+1 ]	|||||||||||||
 	            10 : 0.067 : 0.933 :  1 [+1 ]	||||||
@@ -49,17 +50,17 @@
 	             2 : 0.067 : 1.000 :  1 [+1 ]	||||||
 
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.66666667 [+0.22916667]
+	Average        : 5.66666667 [+0.10416667]
 	Minimum        : 0 [+0]
 	Maximum        : 12 [+0]
-	Total          : 85.0 [-2.0]
+	Total          : 85.0 [-4.0]
 	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.133 : 0.133 :  2 [+0 ]	|||||||||||||
 	             3 : 0.133 : 0.267 :  2 [-1 ]	|||||||||||||
-	             4 : 0.133 : 0.400 :  2 [+1 ]	|||||||||||||
+	             4 : 0.133 : 0.400 :  2 [+2 ]	|||||||||||||
 	             5 : 0.200 : 0.600 :  3 [+1 ]	||||||||||||||||||||
-	             6 : 0.000 : 0.600 :  0 [-1 ]	
+	             6 : 0.000 : 0.600 :  0 [-2 ]	
 	             7 : 0.133 : 0.733 :  2 [-1 ]	|||||||||||||
 	             8 : 0.000 : 0.733 :  0 [-2 ]	
 	             9 : 0.133 : 0.867 :  2 [+1 ]	|||||||||||||

metrixpp/tests/general/test_basic/test_workflow_view_second_txt_touched_stdout.gold.txt

@@ -11,16 +11,17 @@
 	             3 : 0.167 : 1.000 : 1 [+1]	||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.09090909 [+0.17424242]
+	Average        : 5.09090909 [+0.00757576]
 	Minimum        : 0 [+0]
 	Maximum        : 10 [+2]
-	Total          : 56.0 [-3.0]
+	Total          : 56.0 [-5.0]
 	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
 	             3 : 0.182 : 0.273 :  2 [+0 ]	||||||||||||||||||
-	             4 : 0.273 : 0.545 :  3 [+0 ]	|||||||||||||||||||||||||||
+	             4 : 0.273 : 0.545 :  3 [+1 ]	|||||||||||||||||||||||||||
 	             5 : 0.091 : 0.636 :  1 [+0 ]	|||||||||
+	             6 : 0.000 : 0.636 :  0 [-1 ]	
 	             7 : 0.091 : 0.727 :  1 [-3 ]	|||||||||
 	             8 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
 	            10 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
@@ -48,17 +49,17 @@
 	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.90909091 [+0.32575758]
+	Average        : 5.90909091 [+0.15909091]
 	Minimum        : 0 [+0]
 	Maximum        : 12 [+3]
-	Total          : 65.0 [-2.0]
+	Total          : 65.0 [-4.0]
 	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
 	             3 : 0.091 : 0.182 :  1 [-1 ]	|||||||||
-	             4 : 0.182 : 0.364 :  2 [+1 ]	||||||||||||||||||
+	             4 : 0.182 : 0.364 :  2 [+2 ]	||||||||||||||||||
 	             5 : 0.182 : 0.545 :  2 [+1 ]	||||||||||||||||||
-	             6 : 0.000 : 0.545 :  0 [-1 ]	
+	             6 : 0.000 : 0.545 :  0 [-2 ]	
 	             7 : 0.182 : 0.727 :  2 [-1 ]	||||||||||||||||||
 	             8 : 0.000 : 0.727 :  0 [-2 ]	
 	             9 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||

metrixpp/tests/system/test_boost_parts/test_workflow_info_default_stdout.gold.txt

@@ -8,7 +8,7 @@ test_workflow.db:: info: Created using plugins and settings:
 	std.code.java:version: 1.1
 	std.code.java:files: *.java
 	std.code.lines:version: 1.1
-	std.code.magic:version: 1.2
+	std.code.magic:version: 1.3
 	std.code.magic:number.simplier: False
 	std.code.todo:version: 1.0
 	std.code.todo:tags: FIXME,FixMe,HACK,TBD,TODO,ToDo,XXX