Added preliminary framework for C# support

mainline/ext/std/code/cpp.py

@@ -27,7 +27,7 @@ import core.api
 class Plugin(core.api.Plugin, core.api.Parent, core.api.IParser, core.api.IConfigurable, core.api.ICode):
     
     def declare_configuration(self, parser):
-        parser.add_option("--std.code.cpp.files", default="*.c,*.cpp,*.h,*.hpp",
+        parser.add_option("--std.code.cpp.files", default="*.c,*.h,*.cpp,*.hpp,*.cc,*.hh,*.cxx,*.hxx",
                          help="Enumerates filename extensions to match C/C++ files [default: %default]")
     
     def configure(self, options):

mainline/ext/std/code/test.ini

@@ -20,7 +20,7 @@
 [Plugin]
 version: 1.0
 package: std.code
-module:  test
+module:  cs
 class:   Plugin
 depends: None
 enabled: True

mainline/ext/std/code/cs.py

@@ -0,0 +1,304 @@
+#
+#    Metrix++, Copyright 2009-2013, Metrix++ Project
+#    Link: http://metrixplusplus.sourceforge.net
+#    
+#    This file is a part of Metrix++ Tool.
+#    
+#    Metrix++ is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#    
+#    Metrix++ is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#    
+#    You should have received a copy of the GNU General Public License
+#    along with Metrix++.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+import re
+import binascii
+import logging
+
+import core.api
+
+class Plugin(core.api.Plugin, core.api.Parent, core.api.IParser, core.api.IConfigurable, core.api.ICode):
+    
+    def declare_configuration(self, parser):
+        parser.add_option("--std.code.cs.files", default="*.cs",
+                         help="Enumerates filename extensions to match C/C++ files [default: %default]")
+    
+    def configure(self, options):
+        self.files = options.__dict__['std.code.cs.files'].split(',')
+        self.files.sort() # sorted list goes to properties
+        
+    def initialize(self):
+        self.get_plugin_loader().register_parser(self.files, self)
+
+        # trigger version property set
+        core.api.Plugin.initialize(self)
+        db_loader = self.get_plugin_loader().get_database_loader()
+        prev_ext = db_loader.set_property(self.get_name() + ":files", ','.join(self.files))
+        if prev_ext != ','.join(self.files):
+            self.is_updated = True
+        
+        namespace = self.get_plugin_loader().get_database_loader().create_namespace(self.get_name())
+        namespace.add_field('mismatched_brackets', int, non_zero=True)
+    
+    def process(self, parent, data, is_updated):
+        is_updated = is_updated or self.is_updated
+        if is_updated == True:
+            count_mismatched_brackets = CppCodeParser().run(data)
+            if count_mismatched_brackets != 0:
+                data.set_data(self.get_name(), 'mismatched_brackets', count_mismatched_brackets)
+        self.notify_children(data, is_updated)
+            
+class CppCodeParser(object):
+    
+    regex_cpp = re.compile(r'''
+                   /([\\](?:\n|\r|\r\n))*/(?=\n|\r|\r\n)              # Match C++ style comments (empty comment line)
+                |  /([\\](?:\n|\r|\r\n))*/.*?[^\\](?=\n|\r|\r\n)      # Match C++ style comments
+                                                                      # NOTE: end of line is NOT consumed
+                                                                      # NOTE: ([\\](?:\n|\r|\r\n))* for new line separators,
+                                                                      # Need to support new line separators in expense of efficiency?
+                | /([\\](?:\n|\r|\r\n))*\*.*?\*([\\](?:\n|\r|\r\n))*/ # Match C style comments
+                | \'(?:\\.|[^\\\'])*\'                                # Match quoted strings
+                | "(?:\\.|[^\\"])*"                                   # Match double quoted strings
+                | (((?<=\n|\r)|^)[ \t]*[#].*?[^\\](?=\n|\r|\r\n))     # Match preprocessor
+                                                                      # NOTE: end of line is NOT consumed
+                                                                      # NOTE: beginning of line is NOT consumed
+                | (?P<fn_name>
+                      (operator(                                      # Match C++ operator ...
+                         (\s+[_a-zA-Z][_a-zA-Z0-9]*(\s*\[\s*\])?)     # - cast, new and delete operators
+                       | (\s*\[\s*\])                                 # - operator []
+                       | (\s*\(\s*\))                                 # - operator ()
+                       | (\s*[+-\\*/=<>!%&^|~,?.]{1,3})               # - other operators (from 1 to 3 symbols)
+                      ))                                               
+                    | ([~]?[_a-zA-Z][_a-zA-Z0-9]*)                    # ... or function or constructor
+                  )\s*[(]                                             # LIMITATION: if there are comments after function name
+                                                                      # and before '(', it is not detected
+                                                                      # LIMITATION: if there are comments within operator definition,
+                                                                      # if may be not detected
+                | ((?P<block_type>class|struct|namespace)             # Match C++ class or struct
+                    (?P<block_name>((\s+[a-zA-Z_][a-zA-Z0-9_]*)|(?=\s*[{])))) # noname is supported, symbol '{' is not consumed
+                                                                      # LIMITATION: if there are comments between keyword and name,
+                                                                      # it is not detected
+                | [<>{};:]                                            # Match block start/end, brackets and statement separator
+                | ((?:\n|\r|\r\n)\s*(?:\n|\r|\r\n))                   # Match double empty line
+            ''',
+            re.DOTALL | re.MULTILINE | re.VERBOSE
+        )
+
+    regex_ln = re.compile(r'(\n)|(\r)|(\r\n)')
+
+    def run(self, data):
+        self.__init__() # Go to initial state if it is called twice
+        return self.parse(data)
+        
+    def finalize_block(self, text, block, block_end):
+        space_match = re.match('^\s*', text[block['start']:block_end], re.MULTILINE)
+        block['start'] += space_match.end() # trim spaces at the beginning
+        block['end'] = block_end
+
+        start_pos = block['start']
+        crc32 = 0
+        for child in block['children']:
+            # exclude children
+            crc32 = binascii.crc32(text[start_pos:child['start']], crc32)
+            start_pos = child['end']
+        block['checksum'] = binascii.crc32(text[start_pos:block['end']], crc32) & 0xffffffff # to match python 3
+        
+    def add_lines_data(self, text, blocks):
+        def add_lines_data_rec(self, text, blocks):
+            for each in blocks:
+                # add line begin
+                self.total_current += len(self.regex_ln.findall(text, self.total_last_pos, each['start']))
+                each['line_begin'] = self.total_current
+                self.total_last_pos = each['start']
+                # process enclosed
+                add_lines_data_rec(self, text, each['children'])
+                # add line end
+                self.total_current += len(self.regex_ln.findall(text, self.total_last_pos, each['end']))
+                each['line_end'] = self.total_current
+                self.total_last_pos = each['end']
+        self.total_last_pos = 0
+        self.total_current = 1
+        add_lines_data_rec(self, text, blocks)
+
+    def add_regions(self, data, blocks):
+        # Note: data.add_region() internals depend on special ordering of regions
+        # in order to identify enclosed regions efficiently
+        def add_regions_rec(self, data, blocks):
+            def get_type_id(data, named_type):
+                if named_type == "function":
+                    return data.get_region_types().FUNCTION
+                elif named_type == "class":
+                    return data.get_region_types().CLASS
+                elif named_type == "struct":
+                    return data.get_region_types().STRUCT
+                elif named_type == "namespace":
+                    return data.get_region_types().NAMESPACE
+                elif named_type == "__global__":
+                    return data.get_region_types().GLOBAL
+                else:
+                    assert(False)
+            for each in blocks:
+                data.add_region(each['name'], each['start'], each['end'],
+                                each['line_begin'], each['line_end'], each['cursor'],
+                                get_type_id(data, each['type']), each['checksum'])
+                add_regions_rec(self, data, each['children'])
+        add_regions_rec(self, data, blocks)
+        
+    def parse(self, data):
+        
+        def reset_next_block(start):
+            return {'name':'', 'start':start, 'cursor':0, 'type':'', 'confirmed':False}
+        
+        count_mismatched_brackets = 0
+        
+        text = data.get_content()
+        indent_current = 0;
+        
+        blocks = [{'name':'__global__', 'start':0, 'cursor':0, 'type':'__global__', 'indent_start':indent_current, 'children':[]}]
+        curblk = 0
+        
+        next_block = reset_next_block(0)
+        
+        cursor_last_pos = 0
+        cursor_current = 1
+        
+        for m in re.finditer(self.regex_cpp, text):
+            # Comment
+            if text[m.start()] == '/':
+                data.add_marker(m.start(), m.end(), data.get_marker_types().COMMENT)
+                if text[m.start():m.end()].startswith("//\n"):
+                    print text[m.start():m.end()]
+            
+            # String
+            elif text[m.start()] == '"' or text[m.start()] == '\'':
+                data.add_marker(m.start() + 1, m.end() - 1, data.get_marker_types().STRING)
+            
+            # Preprocessor (including internal comments)
+            elif text[m.start()] == ' ' or text[m.start()] == '\t' or text[m.start()] == '#':
+                data.add_marker(m.start(), m.end(), data.get_marker_types().PREPROCESSOR)
+
+            # Statement end
+            elif text[m.start()] == ';':
+                # Reset next block name and start
+                next_block['name'] = ""
+                next_block['start'] = m.end() # potential region start
+
+            # Template argument closing bracket
+            elif text[m.start()] == '>':
+                # Reset next block name and start (in order to skip class names in templates), if has not been confirmed before
+                if next_block['confirmed'] == False and (next_block['type'] == 'class' or next_block['type'] == 'struct'):
+                    next_block['name'] = ""
+                    next_block['start'] = m.end() # potential region start
+                    
+            # Template argument opening bracket or after class inheritance specification
+            elif text[m.start()] == ':' or text[m.start()] == '<':
+                # .. if goes after calss definition
+                if next_block['type'] == 'class' or next_block['type'] == 'struct':
+                    next_block['confirmed'] = True
+
+            # Double end line
+            elif text[m.start()] == '\n' or text[m.start()] == '\r':
+                # Reset next block start, if has not been named yet
+                if next_block['name'] == "":
+                    next_block['start'] = m.end() # potential region start
+
+            # Block start...
+            elif text[m.start()] == '{':
+                # shift indent right
+                indent_current += 1
+                
+                # ... if name detected previously
+                if next_block['name'] != '': # - Start of enclosed block
+                    blocks.append({'name':next_block['name'],
+                                   'start':next_block['start'],
+                                   'cursor':next_block['cursor'],
+                                   'type':next_block['type'],
+                                   'indent_start':indent_current,
+                                   'children':[]})
+                    next_block = reset_next_block(m.end())
+                    curblk += 1
+                # ... reset next block start, otherwise
+                else: # - unknown type of block start
+                    next_block['start'] = m.end() # potential region start
+            
+            # Block end...
+            elif text[m.start()] == '}':
+                # ... if indent level matches the start
+                if blocks[curblk]['indent_start'] == indent_current:
+                    next_block = reset_next_block(m.end())
+                    if curblk == 0:
+                        logging.warning("Non-matching closing bracket '}' detected: " + data.get_path() + ":" +
+                                        str(cursor_current + len(self.regex_ln.findall(text, cursor_last_pos, m.start()))))
+                        count_mismatched_brackets += 1
+                        continue
+                    
+                    self.finalize_block(text, blocks[curblk], m.end())
+                    assert(blocks[curblk]['type'] != '__global__')
+                    
+                    curblk -= 1
+                    assert(curblk >= 0)
+                    blocks[curblk]['children'].append(blocks.pop())
+
+                # shift indent left
+                indent_current -= 1
+                if indent_current < 0:
+                    logging.warning("Non-matching closing bracket '}' detected")
+                    count_mismatched_brackets += 1
+                    indent_current = 0
+
+            # Potential namespace, struct, class
+            elif text[m.start():m.end()].startswith(('class','struct','namespace')) == True \
+                and m.group('fn_name') == None: # function name can start with keyword, for example class_id_type()
+                if next_block['name'] == "":
+                    # - 'name'
+                    next_block['name'] = m.group('block_name').strip()
+                    if next_block['name'] == "":
+                        next_block['name'] = '__noname__'
+                    # - 'cursor'
+                    cursor_current += len(self.regex_ln.findall(text, cursor_last_pos, m.start('block_name')))
+                    cursor_last_pos = m.start('block_name')
+                    next_block['cursor'] = cursor_current
+                    # - 'type'
+                    next_block['type'] = m.group('block_type').strip()
+                    # - 'start' detected earlier
+
+            # Potential function name detected...
+            else:
+                # ... if outside of a function (do not detect enclosed functions, unless classes are matched)
+                if blocks[curblk]['type'] != 'function' and (next_block['name'] == "" or next_block['type'] != 'function'):
+                    # - 'name'
+                    next_block['name'] = m.group('fn_name').strip()
+                    # - 'cursor'
+                    cursor_current += len(self.regex_ln.findall(text, cursor_last_pos, m.start('fn_name')))
+                    cursor_last_pos = m.start('fn_name')
+                    # NOTE: cursor could be collected together with line_begin, line_end,
+                    # but we keep it here separately for easier debugging of file parsing problems
+                    next_block['cursor'] = cursor_current
+                    # - 'type'
+                    next_block['type'] = 'function'
+                    # - 'start' detected earlier
+
+        while indent_current > 0:
+            # log all
+            logging.warning("Non-matching opening bracket '{' detected")
+            count_mismatched_brackets += 1
+            indent_current -= 1
+
+        for (ind, each) in enumerate(blocks):
+            each = each # used
+            block = blocks[len(blocks) - 1 - ind]
+            self.finalize_block(text, block, len(text))
+
+        self.add_lines_data(text, blocks)
+        self.add_regions(data, blocks)
+        
+        return count_mismatched_brackets
+
+            

mainline/ext/std/code/test.py

@@ -1,43 +0,0 @@
-#
-#    Metrix++, Copyright 2009-2013, Metrix++ Project
-#    Link: http://metrixplusplus.sourceforge.net
-#    
-#    This file is a part of Metrix++ Tool.
-#    
-#    Metrix++ is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, version 3 of the License.
-#    
-#    Metrix++ is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU General Public License for more details.
-#    
-#    You should have received a copy of the GNU General Public License
-#    along with Metrix++.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import core.api
-
-class Plugin(core.api.Plugin, core.api.Child, core.api.IConfigurable):
-    
-    def declare_configuration(self, parser):
-        parser.add_option("--std.code.test.on", action="store_true", default=False,
-                         help="Enables test plugin (for development purposes) [default: %default]")
-    
-    def configure(self, options):
-        self.is_active = options.__dict__['std.code.test.on']
-        
-    def initialize(self):
-        if self.is_active == True:
-            core.api.subscribe_by_parents_interface(core.api.ICode, self)
-
-    def callback(self, parent, data, is_updated):
-        
-        def print_rec(data, indent, region_id):
-            print ("   ." * indent) + str(data.get_region(region_id).get_type()) + " " + data.get_region(region_id).get_name() + " " + str(data.get_region(region_id).get_cursor())
-            for sub_id in data.get_region(region_id).iterate_subregion_ids():
-                print_rec(data, indent + 1, sub_id) 
-        
-        print_rec(data, 0, 1)
-        

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

@@ -101,6 +101,11 @@
                     <__diff__ max="0" total="0.0" avg="0" min="0" />
                 </mismatched_brackets>
             </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None">
+                    <__diff__ max="0" total="0.0" avg="0" min="0" />
+                </mismatched_brackets>
+            </std.code.cs>
         </aggregated-data>
     </data>
 </export>

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

@@ -19,6 +19,11 @@
                     <__diff__ max="0" total="0.0" avg="0" min="0" />
                 </mismatched_brackets>
             </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None">
+                    <__diff__ max="0" total="0.0" avg="0" min="0" />
+                </mismatched_brackets>
+            </std.code.cs>
         </aggregated-data>
     </data>
 </export>

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

@@ -1 +1 @@
-{'export': [{'data: {'info': {'path': '', 'id': 1}, 'file-data': {}, 'subfiles': [], 'subdirs': [u'.'], 'aggregated-data': {'std.code.complexity': {'cyclomatic': {'total': 6.0, 'max': 3, 'avg': 1.5, 'min': 1}}, 'std.code.cpp': {'mismatched_brackets': {'total': 0.0, 'max': None, 'avg': None, 'min': None}}}}}]}
+{'export': [{'data: {'info': {'path': '', 'id': 1}, 'file-data': {}, 'subfiles': [], 'subdirs': [u'.'], 'aggregated-data': {'std.code.complexity': {'cyclomatic': {'total': 6.0, 'max': 3, 'avg': 1.5, 'min': 1}}, 'std.code.cpp': {'mismatched_brackets': {'total': 0.0, 'max': None, 'avg': None, 'min': None}}, 'std.code.cs': {'mismatched_brackets': {'total': 0.0, 'max': None, 'avg': None, 'min': None}}}}}]}

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

@@ -24,6 +24,12 @@ data:
 .   .   .   .   total="0.0"
 .   .   .   .   avg="None"
 .   .   .   .   min="None"
+.   .   std.code.cs:  
+.   .   .   mismatched_brackets: 
+.   .   .   .   max="None"
+.   .   .   .   total="0.0"
+.   .   .   .   avg="None"
+.   .   .   .   min="None"
 ================================================================================
 
 

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

@@ -15,6 +15,9 @@
             <std.code.cpp>
                 <mismatched_brackets max="None" total="0.0" avg="None" min="None" />
             </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None" />
+            </std.code.cs>
         </aggregated-data>
     </data>
 </export>

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

@@ -32,9 +32,10 @@ Options:
                         by McCabe [default: False]
   --std.code.cpp.files=STD.CODE.CPP.FILES
                         Enumerates filename extensions to match C/C++ files
-                        [default: *.c,*.cpp,*.h,*.hpp]
+                        [default: *.c,*.h,*.cpp,*.hpp,*.cc,*.hh,*.cxx,*.hxx]
+  --std.code.cs.files=STD.CODE.CS.FILES
+                        Enumerates filename extensions to match C/C++ files
+                        [default: *.cs]
   --std.code.dumper.on  If the option is set (True), HTML files are generated
                         for every parsed file containing code (for
                         troubleshooting purposes only) [default: False]
-  --std.code.test.on    Enables test plugin (for development purposes)
-                        [default: False]

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

@@ -2,4 +2,4 @@
 [LOG]: INFO:	Excluding: ./.unused.cpp
 [LOG]: INFO:	Skipping: ./dummy.txt
 [LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: WARNING:	Exit code: 0. Time spent: 0.11 seconds. Done
+[LOG]: WARNING:	Exit code: 0. Time spent: 0.13 seconds. Done

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

@@ -1,3 +1,3 @@
 [LOG]: WARNING:	Logging enabled with INFO level
 [LOG]: INFO:	Processing: 
-[LOG]: WARNING:	Exit code: 0. Time spent: 0.0 seconds. Done
+[LOG]: WARNING:	Exit code: 0. Time spent: 0.01 seconds. Done

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

@@ -15,6 +15,9 @@
             <std.code.cpp>
                 <mismatched_brackets max="None" total="0.0" avg="None" min="None" />
             </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None" />
+            </std.code.cs>
         </aggregated-data>
     </data>
 </export>

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

@@ -1,3 +1,3 @@
 [LOG]: WARNING:	Logging enabled with INFO level
 [LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: WARNING:	Exit code: 0. Time spent: 0.01 seconds. Done
+[LOG]: WARNING:	Exit code: 0. Time spent: 0.02 seconds. Done

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

@@ -81,6 +81,11 @@
                     <__diff__ max="0" total="0.0" avg="0" min="0" />
                 </mismatched_brackets>
             </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None">
+                    <__diff__ max="0" total="0.0" avg="0" min="0" />
+                </mismatched_brackets>
+            </std.code.cs>
         </aggregated-data>
     </data>
 </export>

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

@@ -19,6 +19,11 @@
                     <__diff__ max="0" total="0.0" avg="0" min="0" />
                 </mismatched_brackets>
             </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None">
+                    <__diff__ max="0" total="0.0" avg="0" min="0" />
+                </mismatched_brackets>
+            </std.code.cs>
         </aggregated-data>
     </data>
 </export>

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

@@ -1,2 +1,2 @@
 [LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: WARNING:	Exit code: 0. Time spent: 0.0 seconds. Done
+[LOG]: WARNING:	Exit code: 0. Time spent: 0.01 seconds. Done

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

@@ -3,4 +3,6 @@ Info data:
 	core.log:version	=>	1.0
 	std.code.complexity:version	=>	1.0
 	std.code.cpp:version	=>	1.1
-	std.code.cpp:files	=>	*.c,*.cpp,*.h,*.hpp
+	std.code.cpp:files	=>	*.c,*.cc,*.cpp,*.cxx,*.h,*.hh,*.hpp,*.hxx
+	std.code.cs:version	=>	1.0
+	std.code.cs:files	=>	*.cs

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

@@ -3,4 +3,6 @@ Info data:
 	core.log:version	=>	1.0
 	std.code.complexity:version	=>	1.0
 	std.code.cpp:version	=>	1.1
-	std.code.cpp:files	=>	*.c,*.cpp,*.h,*.hpp
+	std.code.cpp:files	=>	*.c,*.cc,*.cpp,*.cxx,*.h,*.hh,*.hpp,*.hxx
+	std.code.cs:version	=>	1.0
+	std.code.cs:files	=>	*.cs

mainline/tests/general/test_std_code_cpp/test_parser_export_default_stdout.gold.txt

@@ -15,6 +15,9 @@
             <std.code.cpp>
                 <mismatched_brackets max="3" total="3.0" avg="None" min="None" />
             </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None" />
+            </std.code.cs>
         </aggregated-data>
     </data>
 </export>

mainline/tests/general/test_std_code_cpp/test_parser_export_files_stdout.gold.txt

@@ -720,6 +720,12 @@ data:
 .   .   .   .   total="0.0"
 .   .   .   .   avg="None"
 .   .   .   .   min="None"
+.   .   std.code.cs:  
+.   .   .   mismatched_brackets: 
+.   .   .   .   max="None"
+.   .   .   .   total="0.0"
+.   .   .   .   avg="None"
+.   .   .   .   min="None"
 ================================================================================
 --------------------------------------------------------------------------------
 data:  
@@ -1132,6 +1138,12 @@ data:
 .   .   .   .   total="0.0"
 .   .   .   .   avg="None"
 .   .   .   .   min="None"
+.   .   std.code.cs:  
+.   .   .   mismatched_brackets: 
+.   .   .   .   max="None"
+.   .   .   .   total="0.0"
+.   .   .   .   avg="None"
+.   .   .   .   min="None"
 ================================================================================
 --------------------------------------------------------------------------------
 data:  
@@ -1240,6 +1252,12 @@ data:
 .   .   .   .   total="0.0"
 .   .   .   .   avg="None"
 .   .   .   .   min="None"
+.   .   std.code.cs:  
+.   .   .   mismatched_brackets: 
+.   .   .   .   max="None"
+.   .   .   .   total="0.0"
+.   .   .   .   avg="None"
+.   .   .   .   min="None"
 ================================================================================
 --------------------------------------------------------------------------------
 data:  
@@ -1372,6 +1390,12 @@ data:
 .   .   .   .   total="3.0"
 .   .   .   .   avg="None"
 .   .   .   .   min="None"
+.   .   std.code.cs:  
+.   .   .   mismatched_brackets: 
+.   .   .   .   max="None"
+.   .   .   .   total="0.0"
+.   .   .   .   avg="None"
+.   .   .   .   min="None"
 ================================================================================
 
 

mainline/tests/general/test_std_code_cs.py

@@ -0,0 +1,41 @@
+#
+#    Metrix++, Copyright 2009-2013, Metrix++ Project
+#    Link: http://metrixplusplus.sourceforge.net
+#    
+#    This file is a part of Metrix++ Tool.
+#    
+#    Metrix++ is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#    
+#    Metrix++ is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#    
+#    You should have received a copy of the GNU General Public License
+#    along with Metrix++.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+import unittest
+
+import tests.common
+
+class Test(tests.common.TestCase):
+
+    def test_parser(self):
+        
+        runner = tests.common.ToolRunner('collect', ['--std.code.complexity.on'])
+        self.assertExec(runner.run())
+
+        runner = tests.common.ToolRunner('export', ['--general.nest-regions'])
+        self.assertExec(runner.run())
+
+        runner = tests.common.ToolRunner('limit',
+                                         ['--general.max-limit=std.code.complexity:cyclomatic:0'],
+                                         exit_code=11)
+        self.assertExec(runner.run())
+
+if __name__ == '__main__':
+    unittest.main()

mainline/tests/general/test_std_code_cs/test_parser_export_default_stdout.gold.txt

@@ -0,0 +1,23 @@
+<export>
+
+    <data>
+        <info path="" id="1" />
+        <file-data />
+        <subfiles>
+        </subfiles>
+        <subdirs>
+            <subdir>.</subdir>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic max="2" total="15.0" avg="0.180722891566" min="0" />
+            </std.code.complexity>
+            <std.code.cpp>
+                <mismatched_brackets max="3" total="3.0" avg="None" min="None" />
+            </std.code.cpp>
+            <std.code.cs>
+                <mismatched_brackets max="None" total="0.0" avg="None" min="None" />
+            </std.code.cs>
+        </aggregated-data>
+    </data>
+</export>

mainline/tests/general/test_std_code_cs/test_parser_limit_default_stdout.gold.txt

@@ -0,0 +1,88 @@
+./operator_test.hpp:6: warning: Metric 'std.code.complexity/cyclomatic' for region 'policy_mcr' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : policy_mcr
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./operator_test.hpp:71: warning: Metric 'std.code.complexity/cyclomatic' for region 'operator &&' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : operator &&
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./operator_test.hpp:72: warning: Metric 'std.code.complexity/cyclomatic' for region 'operator ||' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : operator ||
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test.c:147: warning: Metric 'std.code.complexity/cyclomatic' for region 'uppercase' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : uppercase
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test.c:216: warning: Metric 'std.code.complexity/cyclomatic' for region 'reset' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : reset
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test.c:296: warning: Metric 'std.code.complexity/cyclomatic' for region 'save' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : save
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test.c:332: warning: Metric 'std.code.complexity/cyclomatic' for region 'main' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : main
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test2.cpp:7: warning: Metric 'std.code.complexity/cyclomatic' for region 'A' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : A
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test3.cpp:39: warning: Metric 'std.code.complexity/cyclomatic' for region 'doColor' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : doColor
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test3.cpp:53: warning: Metric 'std.code.complexity/cyclomatic' for region 'doFont' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : doFont
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+
+./test3.cpp:72: warning: Metric 'std.code.complexity/cyclomatic' for region 'doFont222' exceeds the limit.
+	Metric name    : std.code.complexity/cyclomatic
+	Region name    : doFont222
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+