improve numbering of overloaded functions

Author: Calsign

generator.py

@@ -235,7 +235,8 @@ def save(self):
             f.write(self.buf.getvalue())
 
 
-def convert_name(name):
+def convert_name(name, is_function=True, create_ocaml_overload_counts=False,
+                 parent_module=None):
     # strip 'cv.' prefix
     if name.startswith('cv.'):
         name = name[3:]
@@ -251,14 +252,26 @@ def convert_name(name):
         overload_counts[c_name] += 1
         suffix = str(overload_counts[c_name])
         c_name = c_name + suffix
-        ocaml_name = name + suffix
+        ocaml_name = name if is_function else name + suffix
     else:
         overload_counts[c_name] = 0
         ocaml_name = name
 
     # convert to camel case
     ocaml_name = snake_case(ocaml_name)
 
+    # in this case we detect a class method and re-run this function anyway,
+    # so don't screw up the overload counts
+    if not ('.' in ocaml_name and is_function):
+        overload_key = ocaml_name if parent_module is None \
+            else parent_module + '.' + ocaml_name
+        if overload_key in ocaml_overload_counts:
+            ocaml_overload_counts[overload_key] += 1
+            suffix = str(ocaml_overload_counts[overload_key])
+            ocaml_name += suffix
+        elif create_ocaml_overload_counts:
+            ocaml_overload_counts[overload_key] = 0
+
     if ocaml_name in ocaml_reserved:
         ocaml_name = ocaml_reserved[ocaml_name]
 
@@ -344,6 +357,7 @@ def param_sub(match):
     defined_enum_consts = set()
     classes = {}
     overload_counts = {}
+    ocaml_overload_counts = {}
     draw_functions = []
 
     def add_struct(struct):
@@ -377,7 +391,7 @@ def build_enum_constr(arg):
 
     def add_class(decl):
         full_class_name = decl[0].rsplit(' ', 1)[1]
-        name, c_name, ocaml_name = convert_name(full_class_name)
+        name, c_name, ocaml_name = convert_name(full_class_name, is_function=False)
         inherits = decl[1].rsplit('::', 1)[1] if len(decl[1]) > 0 else None
 
         cpp_name = name
@@ -432,7 +446,7 @@ def sanitize_param(param):
             if cls in classes:
                 name = name.rsplit('.', 1)[1]
                 c_name = c_name.replace('.', '_')
-                ocaml_name = convert_name(name)[2]
+                ocaml_name = convert_name(name, parent_module=cls)[2]
 
                 c_params = params[:]
 
@@ -466,8 +480,8 @@ def sanitize_param(param):
     # first pass to collect classes and add types
     for decl in decls:
         if decl[0].startswith('enum'):
-            # there's something screwy that happens where sometimes classes show up as enums
-            # this is a really hacky way to make it work
+            # there's something screwy that happens where sometimes classes
+            # show up as enums, this is a really hacky way to make it work
             if decl[0].endswith('.<unnamed>'):
                 decl[0] = decl[0][:-10]
                 full_class_name = decl[0].rsplit(' ', 1)[1]
@@ -481,7 +495,26 @@ def sanitize_param(param):
         else:
             pass
 
-    # second pass to collect functions and methods
+    # second pass to identify overloaded OCaml functions
+    for decl in decls:
+        if decl[0].startswith('enum') or decl[0].startswith('class'):
+            pass
+        else:
+            name, _, _ = convert_name(decl[0], create_ocaml_overload_counts=True)
+
+            if '.' in name:
+                # class method
+                cls = name.rsplit('.', 1)[0]
+                if cls in classes:
+                    name = name.rsplit('.', 1)[1]
+                    convert_name(name, create_ocaml_overload_counts=True,
+                                 parent_module=cls)
+
+    # only add numbers for functions that are actually overloaded
+    ocaml_overload_counts = \
+        {name: 0 for name, count in ocaml_overload_counts.items() if count > 0}
+
+    # third pass to collect functions and methods
     for decl in decls:
         if decl[0].startswith('enum'):
             pass

tests/demo/demo.ml

@@ -7,15 +7,15 @@ let () =
   let vid = Video_capture.video_capture2 "test.mp4" in
   (* let _ = get_text_size "hello" 10 10.0 10 10 in *)
   let rec loop () =
-    let mat, _ = Video_capture.read1 vid in
+    let mat, _ = Video_capture.read vid in
     let lab = cvt_color mat ~~`COLOR_BGR2Lab in
     let lab_l = extract_channel lab 0 in
     let blurred = gaussian_blur lab_l {width=21; height=21} 10. in
     let threshed, _ = threshold blurred 100. 200. ~~`THRESH_BINARY in
     let contours, _ = find_contours threshed ~~`RETR_EXTERNAL ~~`CHAIN_APPROX_SIMPLE in
     let rect = bounding_rect threshed in
     let drawn = Draw.draw [
-        Draw.rectangle1 rect (color1 255.) ~thickness:2;
+        Draw.rectangle2 rect (color1 255.) ~thickness:2;
         Draw.draw_contours contours (-1) (color1 0.) ~thickness:4;
       ] blurred in
     (* let _ = calc_hist [lab_l] [0] threshed [10] [0.; 255.] in *)

tests/demo_reuse/demo_reuse.ml

@@ -9,13 +9,13 @@ let () =
   let chan = Cvdata.Mat (Mat.create ()) in
   let threshed = Cvdata.Mat (Mat.create ()) in
   let rec loop () =
-    let _ = Video_capture.read1 vid ~image:mat in
+    let _ = Video_capture.read vid ~image:mat in
     let _ = cvt_color mat ~dst:mat ~~`COLOR_BGR2Lab in
     let _ = extract_channel mat ~dst:chan 0 in
     let _ = gaussian_blur chan ~dst:chan {width=21; height=21} 10. in
     let _ = threshold chan ~dst:threshed 100. 200. ~~`THRESH_BINARY in
     let rect = bounding_rect threshed in
-    let _ = rectangle1 chan rect (color1 255.) ~thickness:2 in
+    let _ = rectangle2 chan rect (color1 255.) ~thickness:2 in
     let b = 30 in
     let tiled = Owl.Dense.Ndarray.Generic.concatenate ~axis:1
         [|chan |> Cvdata.to_mat; threshed |> Cvdata.to_mat|] in