improvement for export tool: added region type column

mainline/ext/std/tools/export.py

@@ -45,7 +45,7 @@ class Plugin(mpp.api.Plugin, mpp.api.IRunable):
         exit_code = 0
     
         columns = []
-        columnNames = ["file", "region", "modified", "line start", "line end"]
+        columnNames = ["file", "region", "type", "modified", "line start", "line end"]
         for name in self.loader.iterate_namespace_names():
             namespace = self.loader.get_namespace(name)
             for field in namespace.iterate_field_names():
@@ -72,6 +72,7 @@ class Plugin(mpp.api.Plugin, mpp.api.IRunable):
                     matcher = mpp.utils.FileRegionsMatcher(file_data, file_data_prev)
                 for reg in file_data.iterate_regions():
                     per_reg_data = []
+                    per_reg_data.append(mpp.api.Region.T().to_str(reg.get_type()))
                     if matcher != None and matcher.is_matched(reg.get_id()):
                         per_reg_data.append(matcher.is_modified(reg.get_id()))
                     else:
@@ -82,6 +83,7 @@ class Plugin(mpp.api.Plugin, mpp.api.IRunable):
                         per_reg_data.append(reg.get_data(column[0], column[1]))
                     csvWriter.writerow([file_data.get_path(), reg.get_name()] + per_reg_data)
                 per_file_data = []
+                per_file_data.append('file')
                 if file_data_prev != None:
                     per_file_data.append(file_data.get_checksum() != file_data_prev.get_checksum()) 
                 else:

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

@@ -1,19 +1,19 @@
-file,region,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
-./file_deleted_in_new_sources.cpp,__global__,,1,34,,,,,,0,0,0,0
-./file_deleted_in_new_sources.cpp,hmm,,3,24,,,,,,4,7,0,3
-./file_deleted_in_new_sources.cpp,B,,9,22,,,,,,3,3,0,0
-./file_deleted_in_new_sources.cpp,B,,12,20,1,,,,,8,9,0,2
-./file_deleted_in_new_sources.cpp,never_old,,26,33,1,,,,,7,7,0,0
-./file_deleted_in_new_sources.cpp,,,1,34,,,,,,,,,
-./simple.cpp,__global__,,1,71,,,,,,0,0,0,0
-./simple.cpp,hmm,,3,70,,,,,,4,6,1,1
-./simple.cpp,A,,9,68,,,,,,4,4,0,0
-./simple.cpp,A,,12,23,3,,,,,11,12,0,2
-./simple.cpp,func,,26,40,1,,,,,5,5,0,0
-./simple.cpp,embeded,,28,38,,,,,,3,3,0,0
-./simple.cpp,embeded,,30,37,1,,,,,7,8,0,1
-./simple.cpp,func_to_be_removed_in_new_sources,,42,56,2,,,,,5,5,0,0
-./simple.cpp,embeded,,44,54,,,,,,3,3,0,0
-./simple.cpp,embeded,,46,53,1,,,,,7,8,0,1
-./simple.cpp,never,,58,65,1,,,,,7,7,0,0
-./simple.cpp,,,1,71,,,,,,,,,
+file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
+./file_deleted_in_new_sources.cpp,__global__,global,,1,34,,,,,,0,0,0,0
+./file_deleted_in_new_sources.cpp,hmm,namespace,,3,24,,,,,,4,7,0,3
+./file_deleted_in_new_sources.cpp,B,class,,9,22,,,,,,3,3,0,0
+./file_deleted_in_new_sources.cpp,B,function,,12,20,1,,,,,8,9,0,2
+./file_deleted_in_new_sources.cpp,never_old,function,,26,33,1,,,,,7,7,0,0
+./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,6,1,1
+./simple.cpp,A,class,,9,68,,,,,,4,4,0,0
+./simple.cpp,A,function,,12,23,3,,,,,11,12,0,2
+./simple.cpp,func,function,,26,40,1,,,,,5,5,0,0
+./simple.cpp,embeded,class,,28,38,,,,,,3,3,0,0
+./simple.cpp,embeded,function,,30,37,1,,,,,7,8,0,1
+./simple.cpp,func_to_be_removed_in_new_sources,function,,42,56,2,,,,,5,5,0,0
+./simple.cpp,embeded,class,,44,54,,,,,,3,3,0,0
+./simple.cpp,embeded,function,,46,53,1,,,,,7,8,0,1
+./simple.cpp,never,function,,58,65,1,,,,,7,7,0,0
+./simple.cpp,,file,,1,71,,,,,,,,,

mainline/tests/general/test_basic/test_workflow_export_second_stdout.gold.txt

@@ -1,18 +1,18 @@
-file,region,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
-./simple.cpp,__global__,False,1,78,,,,,,0,0,0,0
-./simple.cpp,hmm,True,3,77,,,,,,4,7,2,1
-./simple.cpp,A,True,10,75,,,,,,4,4,0,0
-./simple.cpp,A,False,13,24,3,,,,,11,12,0,2
-./simple.cpp,func,False,26,42,1,,,,,5,5,0,0
-./simple.cpp,embeded,False,28,40,,,,,,3,3,0,0
-./simple.cpp,embeded,True,30,39,2,,,,,8,9,0,2
-./simple.cpp,never,True,44,51,1,,,,,7,7,0,1
-./simple.cpp,new_func,,53,56,0,,,,,3,4,0,1
-./simple.cpp,new_func_complex,,58,62,1,,,,,5,5,0,0
-./simple.cpp,new_func_complex_but_suppressed,,64,72,2,,,1,[std.code.complexity:cyclomatic],8,9,0,1
-./simple.cpp,,True,1,78,,,,,,,,,
-./simple2.cpp,__global__,,1,26,,,,,,0,0,0,0
-./simple2.cpp,hmm,,3,25,,,,,,4,5,0,1
-./simple2.cpp,New_A,,7,23,,,,,,3,3,0,0
-./simple2.cpp,New_A,,10,21,3,,,,,10,12,0,2
-./simple2.cpp,,,1,26,,,,,,,,,
+file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
+./simple.cpp,__global__,global,False,1,78,,,,,,0,0,0,0
+./simple.cpp,hmm,namespace,True,3,77,,,,,,4,7,2,1
+./simple.cpp,A,class,True,10,75,,,,,,4,4,0,0
+./simple.cpp,A,function,False,13,24,3,,,,,11,12,0,2
+./simple.cpp,func,function,False,26,42,1,,,,,5,5,0,0
+./simple.cpp,embeded,class,False,28,40,,,,,,3,3,0,0
+./simple.cpp,embeded,function,True,30,39,2,,,,,8,9,0,2
+./simple.cpp,never,function,True,44,51,1,,,,,7,7,0,1
+./simple.cpp,new_func,function,,53,56,0,,,,,3,4,0,1
+./simple.cpp,new_func_complex,function,,58,62,1,,,,,5,5,0,0
+./simple.cpp,new_func_complex_but_suppressed,function,,64,72,2,,,1,[std.code.complexity:cyclomatic],8,9,0,1
+./simple.cpp,,file,True,1,78,,,,,,,,,
+./simple2.cpp,__global__,global,,1,26,,,,,,0,0,0,0
+./simple2.cpp,hmm,namespace,,3,25,,,,,,4,5,0,1
+./simple2.cpp,New_A,class,,7,23,,,,,,3,3,0,0
+./simple2.cpp,New_A,function,,10,21,3,,,,,10,12,0,2
+./simple2.cpp,,file,,1,26,,,,,,,,,