api improvements

mainline/ext/std/code/complexity.py

@@ -72,15 +72,15 @@ class Plugin(mpp.api.Plugin, mpp.api.MetricPluginMixin, mpp.api.Child, mpp.api.I
             self.subscribe_by_parents_name('std.code.cs')
             self.subscribe_by_parents_name('std.code.java')
 
-    def _maxindent_count_initialize(self, data, alias, region):
+    def _maxindent_count_initialize(self, alias, data, region):
         return (0, {'cur_level': 0})
     
-    def _maxindent_count(self, data, alias, text, begin, end, m, count, counter_data, region, marker):
-        if m.group(0) == '{':
+    def _maxindent_count(self, alias, data, region, marker, match, count, counter_data):
+        if match.group(0) == '{':
             counter_data['cur_level'] += 1
             if counter_data['cur_level'] > count:
                 count = counter_data['cur_level']
-        elif m.group(0) == '}':
+        elif match.group(0) == '}':
             counter_data['cur_level'] -= 1
         else:
             assert False

mainline/mpp/api.py

@@ -1051,7 +1051,7 @@ class MetricPluginMixin(object):
                 counter_data = {}
                 count = 0
                 if hasattr(self, '_' + metric_name + '_count_initialize'):
-                    (count, counter_data) = self.__getattribute__('_' + metric_name + '_count_initialize')(data, alias, region)
+                    (count, counter_data) = self.__getattribute__('_' + metric_name + '_count_initialize')(alias, data, region)
                 for marker in data.iterate_markers(
                                 filter_group = field_data[1],
                                 region_id = region.get_id(),
@@ -1059,8 +1059,8 @@ class MetricPluginMixin(object):
                                 merge=field_data[3]):
                     begin = marker.get_offset_begin()
                     end = marker.get_offset_end()
-                    for m in pattern_to_search.finditer(text, begin, end):
-                        count = counter_callback(data, alias, text, begin, end, m, count, counter_data, region, marker)
+                    for match in pattern_to_search.finditer(text, begin, end):
+                        count = counter_callback(alias, data, region, marker, match, count, counter_data)
                 region.set_data(namespace, metric_name, count)
         else:
             for region in data.iterate_regions(filter_group=field_data[5]):

mainline/tests/system/test_api_tutorial/ext/step5/myext/magic.py

@@ -45,7 +45,7 @@ class Plugin(mpp.api.Plugin, mpp.api.IConfigurable, mpp.api.Child, mpp.api.Metri
         if self.is_active() == True:
             self.subscribe_by_parents_interface(mpp.api.ICode)
             
-    def _numbers_count(self, data, alias, text, begin, end, m, count, counter_data, region, marker):
-        if m.group(0).startswith('const'):
+    def _numbers_count(self, alias, data, region, marker, match, count, counter_data):
+        if match.group(0).startswith('const'):
             return count
         return count + 1