Fix region parser consuming number separators

metrixpp/ext/std/code/cpp.py

@@ -51,7 +51,7 @@ class CppCodeParser(object):
                                                                       # Need to support new line separators in expense of efficiency?
                 | /\*\*/                                              # Match C style comments (empty comment line)
                 | /([\\](?:\n|\r\n|\r))*\*.*?\*([\\](?:\n|\r\n|\r))*/ # Match C style comments
-                | \'(?:\\.|[^\\\'])*\'                                # Match quoted strings
+                | (?<![0-9a-fA-F])\'(?:\\.|[^\\\'])*\'                                # Match quoted strings
                 | "(?:\\.|[^\\"])*"                                   # Match double quoted strings
                 | (((?<=\n|\r)|^)[ \t]*[#].*?[^\\](?=\n|\r\n|\r))     # Match preprocessor
                                                                       # NOTE: end of line is NOT consumed

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

@@ -74,12 +74,16 @@ class A
     unsigned long long int octal_number = 074uLL;
     unsigned long long int different_order = 123llU;
     long int just_l = 42l;
+    int one_separator = 123'456;
+    int two_separators = 123'456'789;
 
     const int const_hex_number = 0xaBc78;
     const unsigned int const_binary_number = 0b00110u;
     const unsigned long long int const_octal_number = 074uLL;
     const unsigned long long int const_different_order = 123llU;
     const long int const_just_l = 42l;
+    const int one_separator = 123'456;
+    const int two_separators = 123'456'789;
 };
 
 }

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

@@ -1,14 +1,14 @@
 ./:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 2.11111111 (excluding zero metric values)
+	Average        : 2.33333333 (excluding zero metric values)
 	Minimum        : 1
-	Maximum        : 6
-	Total          : 19.0
+	Maximum        : 8
+	Total          : 21.0
 	Distribution   : 9 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 0.556 : 0.556 : 5	|||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             2 : 0.222 : 0.778 : 2	||||||||||||||||||||||
 	             4 : 0.111 : 0.889 : 1	|||||||||||
-	             6 : 0.111 : 1.000 : 1	|||||||||||
+	             8 : 0.111 : 1.000 : 1	|||||||||||
 
 ./:: info: Directory content:
 	File           : file_deleted_in_new_sources.cpp

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

@@ -1,24 +1,24 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	Modified       : None
-        	std.code.magic:numbers: 6
+        	std.code.magic:numbers: 8
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region
             	Region name    : A
@@ -83,15 +83,15 @@
             	std.code.magic:numbers: 2
 
 ./simple.cpp:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 2.28571429 (excluding zero metric values)
+	Average        : 2.57142857 (excluding zero metric values)
 	Minimum        : 1
-	Maximum        : 6
-	Total          : 16.0
+	Maximum        : 8
+	Total          : 18.0
 	Distribution   : 7 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 0.571 : 0.571 : 4	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             2 : 0.143 : 0.714 : 1	||||||||||||||
 	             4 : 0.143 : 0.857 : 1	||||||||||||||
-	             6 : 0.143 : 1.000 : 1	||||||||||||||
+	             8 : 0.143 : 1.000 : 1	||||||||||||||
 
 

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

@@ -1,24 +1,24 @@
 ./simple.cpp:0: info: Metrics per '__global__' region
 	Region name    : __global__
 	Region type    : global
-	Offsets        : 0-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	Modified       : None
-        	std.code.magic:numbers: 6
+        	std.code.magic:numbers: 8
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region
             	Region name    : A
@@ -83,13 +83,13 @@
             	std.code.magic:numbers: 1
 
 ./simple.cpp:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.71428571 (excluding zero metric values)
+	Average        : 2.0 (excluding zero metric values)
 	Minimum        : 1
-	Maximum        : 6
-	Total          : 12.0
+	Maximum        : 8
+	Total          : 14.0
 	Distribution   : 7 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 0.857 : 0.857 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             6 : 0.143 : 1.000 : 1	||||||||||||||
+	             8 : 0.143 : 1.000 : 1	||||||||||||||
 
 

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

@@ -1,12 +1,12 @@
 ./:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.55555556 (excluding zero metric values)
+	Average        : 1.77777778 (excluding zero metric values)
 	Minimum        : 1
-	Maximum        : 6
-	Total          : 14.0
+	Maximum        : 8
+	Total          : 16.0
 	Distribution   : 9 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 0.889 : 0.889 : 8	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             6 : 0.111 : 1.000 : 1	|||||||||||
+	             8 : 0.111 : 1.000 : 1	|||||||||||
 
 ./:: info: Directory content:
 	File           : file_deleted_in_new_sources.cpp

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-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	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-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	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: 65
+	std.code.filelines:code: 69
 	std.code.filelines:comments: 5
 	std.code.filelines:preprocessor: 1
-	std.code.filelines:total: 70
+	std.code.filelines:total: 74
 
 ./simple.cpp:: info: Overall metrics for 'std.code.filelines:code' metric
-	Average        : 65.0
-	Minimum        : 65
-	Maximum        : 65
-	Total          : 65.0
+	Average        : 69.0
+	Minimum        : 69
+	Maximum        : 69
+	Total          : 69.0
 	Distribution   : 1 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
-	            65 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	            69 : 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        : 70.0
-	Minimum        : 70
-	Maximum        : 70
-	Total          : 70.0
+	Average        : 74.0
+	Minimum        : 74
+	Maximum        : 74
+	Total          : 74.0
 	Distribution   : 1 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
-	            70 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	            74 : 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        : 43.0
+	Average        : 45.0
 	Minimum        : 21
-	Maximum        : 65
-	Total          : 86.0
+	Maximum        : 69
+	Total          : 90.0
 	Distribution   : 2 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
 	            21 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	            65 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	            69 : 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        : 47.5
+	Average        : 49.5
 	Minimum        : 25
-	Maximum        : 70
-	Total          : 95.0
+	Maximum        : 74
+	Total          : 99.0
 	Distribution   : 2 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
 	            25 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	            70 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	            74 : 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-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	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: 1256
+	std.general:size: 1410
 
 ./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        : 1256.0
-	Minimum        : 1256
-	Maximum        : 1256
-	Total          : 1256.0
+	Average        : 1410.0
+	Minimum        : 1410
+	Maximum        : 1410
+	Total          : 1410.0
 	Distribution   : 1 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
-	          1256 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	          1410 : 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        : 767.5
+	Average        : 844.5
 	Minimum        : 279
-	Maximum        : 1256
-	Total          : 1535.0
+	Maximum        : 1410
+	Total          : 1689.0
 	Distribution   : 2 files in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of files
 	           279 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	          1256 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	          1410 : 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-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	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-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	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-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	Modified       : None
-        	std.code.lines:code: 16
+        	std.code.lines:code: 20
         	std.code.lines:comments: 0
         	std.code.lines:preprocessor: 0
-        	std.code.lines:total: 16
+        	std.code.lines:total: 20
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region
             	Region name    : A
@@ -120,10 +120,10 @@
             	std.code.lines:total: 7
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 6.18181818
+	Average        : 6.54545455
 	Minimum        : 0
-	Maximum        : 16
-	Total          : 68.0
+	Maximum        : 20
+	Total          : 72.0
 	Distribution   : 11 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1	|||||||||
@@ -132,7 +132,7 @@
 	             5 : 0.182 : 0.545 :  2	||||||||||||||||||
 	             7 : 0.273 : 0.818 :  3	|||||||||||||||||||||||||||
 	            11 : 0.091 : 0.909 :  1	|||||||||
-	            16 : 0.091 : 1.000 :  1	|||||||||
+	            20 : 0.091 : 1.000 :  1	|||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
 	Average        : 0.45454545
@@ -156,10 +156,10 @@
 	             1 : 0.091 : 1.000 :  1	|||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 6.63636364
+	Average        : 7.0
 	Minimum        : 0
-	Maximum        : 16
-	Total          : 73.0
+	Maximum        : 20
+	Total          : 77.0
 	Distribution   : 11 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.091 : 0.091 :  1	|||||||||
@@ -169,6 +169,6 @@
 	             7 : 0.091 : 0.636 :  1	|||||||||
 	             8 : 0.182 : 0.818 :  2	||||||||||||||||||
 	            12 : 0.091 : 0.909 :  1	|||||||||
-	            16 : 0.091 : 1.000 :  1	|||||||||
+	            20 : 0.091 : 1.000 :  1	|||||||||
 
 

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

@@ -1,8 +1,8 @@
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.625
+	Average        : 5.875
 	Minimum        : 0
-	Maximum        : 16
-	Total          : 90.0
+	Maximum        : 20
+	Total          : 94.0
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
@@ -12,7 +12,7 @@
 	             7 : 0.250 : 0.812 :  4	|||||||||||||||||||||||||
 	             8 : 0.062 : 0.875 :  1	||||||
 	            11 : 0.062 : 0.938 :  1	||||||
-	            16 : 0.062 : 1.000 :  1	||||||
+	            20 : 0.062 : 1.000 :  1	||||||
 
 ./:: info: Overall metrics for 'std.code.lines:comments' metric
 	Average        : 0.625
@@ -37,10 +37,10 @@
 	             1 : 0.062 : 1.000 :  1	||||||
 
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 6.1875
+	Average        : 6.4375
 	Minimum        : 0
-	Maximum        : 16
-	Total          : 99.0
+	Maximum        : 20
+	Total          : 103.0
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
@@ -51,7 +51,7 @@
 	             8 : 0.125 : 0.812 :  2	||||||||||||
 	             9 : 0.062 : 0.875 :  1	||||||
 	            12 : 0.062 : 0.938 :  1	||||||
-	            16 : 0.062 : 1.000 :  1	||||||
+	            20 : 0.062 : 1.000 :  1	||||||
 
 ./:: info: Directory content:
 	File           : file_deleted_in_new_sources.cpp

metrixpp/tests/general/test_basic/test_std_longlines_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-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	Modified       : None
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	Modified       : None
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region type    : class
-        	Offsets        : 94-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	Modified       : None
         	std.code.longlines:numbers: 4
 

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

@@ -10,10 +10,10 @@
 	             3 : 0.125 : 1.000 : 1	||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.625
+	Average        : 5.875
 	Minimum        : 0
-	Maximum        : 16
-	Total          : 90.0
+	Maximum        : 20
+	Total          : 94.0
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
@@ -23,7 +23,7 @@
 	             7 : 0.250 : 0.812 :  4	|||||||||||||||||||||||||
 	             8 : 0.062 : 0.875 :  1	||||||
 	            11 : 0.062 : 0.938 :  1	||||||
-	            16 : 0.062 : 1.000 :  1	||||||
+	            20 : 0.062 : 1.000 :  1	||||||
 
 ./:: info: Overall metrics for 'std.code.mi:simple' metric
 	Average        : 1.0

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-1256
-	Line numbers   : 1-86
+	Offsets        : 0-1410
+	Line numbers   : 1-90
 	Modified       : None
 	std.code.member:namespaces: 1
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
     	Region name    : hmm
     	Region type    : namespace
-    	Offsets        : 2-1255
-    	Line numbers   : 3-85
+    	Offsets        : 2-1409
+    	Line numbers   : 3-89
     	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-1251
-        	Line numbers   : 9-83
+        	Offsets        : 94-1405
+        	Line numbers   : 9-87
         	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,86,,0,0,0,0,,,,
-./simple.cpp,hmm,namespace,,3,85,,4,1,1,6,,,,
-./simple.cpp,A,class,,9,83,,16,0,0,16,,,,
+./simple.cpp,__global__,global,,1,90,,0,0,0,0,,,,
+./simple.cpp,hmm,namespace,,3,89,,4,1,1,6,,,,
+./simple.cpp,A,class,,9,87,,20,0,0,20,,,,
 ./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,86,,,,,,,,,
+./simple.cpp,,file,,1,90,,,,,,,,,

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

@@ -27,5 +27,5 @@ test_workflow.db:: info: Collected metrics:
 
 ./:: info: Processed files and checksums:
 	./file_deleted_in_new_sources.cpp: 0xfd51c243
-	./simple.cpp   : 0x63c123b9
+	./simple.cpp   : 0xecc4bf6c
 

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

@@ -12,7 +12,7 @@
                 </cyclomatic>
             </std.code.complexity>
             <std.code.lines>
-                <code avg="5.625" count="16" max="16" min="0" nonzero="False" sup="0" total="90.0">
+                <code avg="5.875" count="16" max="20" min="0" nonzero="False" sup="0" total="94.0">
                     <distribution-bars>
                         <distribution-bar count="2" metric="0" ratio="0.125" />
                         <distribution-bar count="3" metric="3" ratio="0.1875" />
@@ -21,7 +21,7 @@
                         <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" />
-                        <distribution-bar count="1" metric="16" ratio="0.0625" />
+                        <distribution-bar count="1" metric="20" ratio="0.0625" />
                     </distribution-bars>
                 </code>
                 <comments avg="0.625" count="16" max="3" min="0" nonzero="False" sup="0" total="10.0">
@@ -38,7 +38,7 @@
                         <distribution-bar count="1" metric="1" ratio="0.0625" />
                     </distribution-bars>
                 </preprocessor>
-                <total avg="6.1875" count="16" max="16" min="0" nonzero="False" sup="0" total="99.0">
+                <total avg="6.4375" count="16" max="20" min="0" nonzero="False" sup="0" total="103.0">
                     <distribution-bars>
                         <distribution-bar count="2" metric="0" ratio="0.125" />
                         <distribution-bar count="3" metric="3" ratio="0.1875" />
@@ -48,7 +48,7 @@
                         <distribution-bar count="2" metric="8" ratio="0.125" />
                         <distribution-bar count="1" metric="9" ratio="0.0625" />
                         <distribution-bar count="1" metric="12" ratio="0.0625" />
-                        <distribution-bar count="1" metric="16" ratio="0.0625" />
+                        <distribution-bar count="1" metric="20" ratio="0.0625" />
                     </distribution-bars>
                 </total>
             </std.code.lines>

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

@@ -15,7 +15,7 @@
             </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.90909091" count="0" max="-5" min="0" nonzero="0" sup="0" total="-10.0" />
+                    <__diff__ avg="-1.27272727" count="0" max="-9" min="0" nonzero="0" sup="0" total="-14.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" />
@@ -43,7 +43,7 @@
                     </distribution-bars>
                 </preprocessor>
                 <total avg="5.90909091" count="11" max="12" min="0" nonzero="False" sup="0" total="65.0">
-                    <__diff__ avg="-0.72727273" count="0" max="-4" min="0" nonzero="0" sup="0" total="-8.0" />
+                    <__diff__ avg="-1.09090909" count="0" max="-8" min="0" nonzero="0" sup="0" total="-12.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" />
@@ -94,7 +94,7 @@
                 <region>
                     <data>
                         <std.code.lines code="4" comments="0" preprocessor="0" total="4">
-                            <__diff__ code="-12" comments="0" preprocessor="0" total="-12" />
+                            <__diff__ code="-16" comments="0" preprocessor="0" total="-16" />
                         </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 [-12]
+	std.code.lines:code: 4 [-16]
 	std.code.lines:comments: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:total: 4 [-12]
+	std.code.lines:total: 4 [-16]
 
 ./simple.cpp:13: info: Metrics per 'A' region
 	Region name    : A
@@ -141,10 +141,10 @@
 	             3 : 0.143 : 1.000 : 1 [+0]	||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.27272727 [-0.90909091]
+	Average        : 5.27272727 [-1.27272727]
 	Minimum        : 0 [+0]
-	Maximum        : 11 [-5]
-	Total          : 58.0 [-10.0]
+	Maximum        : 11 [-9]
+	Total          : 58.0 [-14.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 ]	|||||||||
@@ -178,10 +178,10 @@
 	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.90909091 [-0.72727273]
+	Average        : 5.90909091 [-1.09090909]
 	Minimum        : 0 [+0]
-	Maximum        : 12 [-4]
-	Total          : 65.0 [-8.0]
+	Maximum        : 12 [-8]
+	Total          : 65.0 [-12.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 ]	|||||||||

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 [-12]
+	std.code.lines:code: 4 [-16]
 	std.code.lines:comments: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:total: 4 [-12]
+	std.code.lines:total: 4 [-16]
 
 ./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 [-12]
+	std.code.lines:code: 4 [-16]
 	std.code.lines:comments: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:total: 4 [-12]
+	std.code.lines:total: 4 [-16]
 
 ./simple.cpp:13: info: Metrics per 'A' region
 	Region name    : A
@@ -140,10 +140,10 @@
 	             2 : 0.400 : 1.000 : 2 [+1]	||||||||||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.57142857 [-1.42857143]
+	Average        : 5.57142857 [-2.0]
 	Minimum        : 3 [+0]
-	Maximum        : 8 [-8]
-	Total          : 39.0 [-10.0]
+	Maximum        : 8 [-12]
+	Total          : 39.0 [-14.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]	||||||||||||||
@@ -175,10 +175,10 @@
 	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 6.42857143 [-1.14285714]
+	Average        : 6.42857143 [-1.71428571]
 	Minimum        : 4 [+1]
-	Maximum        : 9 [-7]
-	Total          : 45.0 [-8.0]
+	Maximum        : 9 [-11]
+	Total          : 45.0 [-12.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]	

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

@@ -15,7 +15,7 @@
             </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.625" count="-1" max="-5" min="0" nonzero="0" sup="0" total="-15.0" />
+                    <__diff__ avg="-0.875" count="-1" max="-9" min="0" nonzero="0" sup="0" total="-19.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" />
@@ -44,7 +44,7 @@
                     </distribution-bars>
                 </preprocessor>
                 <total avg="5.66666667" count="15" max="12" min="0" nonzero="False" sup="0" total="85.0">
-                    <__diff__ avg="-0.52083333" count="-1" max="-4" min="0" nonzero="0" sup="0" total="-14.0" />
+                    <__diff__ avg="-0.77083333" count="-1" max="-8" min="0" nonzero="0" sup="0" total="-18.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" />

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

@@ -11,10 +11,10 @@
 	             3 : 0.250 : 1.000 : 2 [+1]	|||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.0 [-0.625]
+	Average        : 5.0 [-0.875]
 	Minimum        : 0 [+0]
-	Maximum        : 11 [-5]
-	Total          : 75.0 [-15.0]
+	Maximum        : 11 [-9]
+	Total          : 75.0 [-19.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 ]	|||||||||||||
@@ -49,10 +49,10 @@
 	             2 : 0.067 : 1.000 :  1 [+1 ]	||||||
 
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.66666667 [-0.52083333]
+	Average        : 5.66666667 [-0.77083333]
 	Minimum        : 0 [+0]
-	Maximum        : 12 [-4]
-	Total          : 85.0 [-14.0]
+	Maximum        : 12 [-8]
+	Total          : 85.0 [-18.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 ]	|||||||||||||

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

@@ -11,10 +11,10 @@
 	             3 : 0.167 : 1.000 : 1 [+1]	||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.09090909 [-0.82575758]
+	Average        : 5.09090909 [-1.15909091]
 	Minimum        : 0 [+0]
-	Maximum        : 10 [-6]
-	Total          : 56.0 [-15.0]
+	Maximum        : 10 [-10]
+	Total          : 56.0 [-19.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 ]	|||||||||
@@ -48,10 +48,10 @@
 	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.90909091 [-0.67424242]
+	Average        : 5.90909091 [-1.00757576]
 	Minimum        : 0 [+0]
-	Maximum        : 12 [-4]
-	Total          : 65.0 [-14.0]
+	Maximum        : 12 [-8]
+	Total          : 65.0 [-18.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 ]	|||||||||