Minor changes. Trying to fix performance issue

Author: Pencilcaseman

librapid/bindings/generators/argument.py

@@ -21,7 +21,7 @@ def __init__(self, *args, **kwargs):
         - default
         - const
         - ref
-        - move
+        # - move
         - pointer
         - noConvert
         - returnPolicy
@@ -33,11 +33,11 @@ def __init__(self, *args, **kwargs):
         self.name = kwargs.get("name", None)
         self.type = kwargs.get("type", None)
         self.default = kwargs.get("default", None)
-        self.const = kwargs.get("const", True)
-        self.ref = kwargs.get("ref", True)
-        self.move = kwargs.get("move", False)
-        self.pointer = kwargs.get("pointer", False)
-        self.noConvert = kwargs.get("noConvert", False)
+        self.const = kwargs.get("const", None)
+        self.ref = kwargs.get("ref", None)
+        # self.move = kwargs.get("move", None)
+        self.pointer = kwargs.get("pointer", None)
+        self.noConvert = kwargs.get("noConvert", None)
 
         for i in range(len(args)):
             if i == 0 and self.name is None:
@@ -50,11 +50,11 @@ def __init__(self, *args, **kwargs):
                 self.const = args[i]
             elif i == 4 and self.ref is None:
                 self.ref = args[i]
-            elif i == 5 and self.move is None:
-                self.move = args[i]
-            elif i == 6 and self.pointer is None:
+            # elif i == 5 and self.move is None:
+            #     self.move = args[i]
+            elif i == 5 and self.pointer is None:
                 self.pointer = args[i]
-            elif i == 7 and self.noConvert is None:
+            elif i == 6 and self.noConvert is None:
                 self.noConvert = args[i]
             else:
                 raise ValueError("Too many arguments")
@@ -65,8 +65,23 @@ def __init__(self, *args, **kwargs):
         if self.type is None:
             raise ValueError("Argument must have a type")
 
-        if self.move and self.ref:
-            raise ValueError("Argument cannot be both a move and a reference")
+        if self.const is None:
+            self.const = False
+
+        if self.ref is None:
+            self.ref = False
+
+        # if self.move is None:
+        #     self.move = False
+
+        if self.pointer is None:
+            self.pointer = False
+
+        if self.noConvert is None:
+            self.noConvert = False
+
+        # if self.move and self.ref:
+        #     raise ValueError("Argument cannot be both a move and a reference")
 
         self.isArgs = self.name == "*args"
         self.isKwargs = self.name == "**kwargs"
@@ -78,7 +93,8 @@ def param(self):
             return f"py::kwargs kwargs"
         else:
             isPrimitiveType = isPrimitive(self.type)
-            return f"{'const ' if self.const and not isPrimitiveType else ''}{self.type} {'&' if self.ref and not isPrimitiveType else ''}{'&&' if self.move else ''}{'*' if self.pointer else ''}{self.name}"
+            # return f"{'const ' if self.const and not isPrimitiveType and not self.move else ''}{self.type} {'&' if self.ref and not isPrimitiveType else ''}{'&&' if self.move else ''}{'*' if self.pointer else ''}{self.name}"
+            return f"{'const ' if self.const and not isPrimitiveType else ''}{self.type} {'&' if self.ref and not isPrimitiveType else ''}{'*' if self.pointer else ''}{self.name}"
 
     def declaration(self):
         if self.default is None:

librapid/bindings/generators/arrayGenerator.py

@@ -37,8 +37,33 @@ def generateFunctionsForArray(config):
         function.Function(
             name="__init__",
             args=[]
-        )
-    ]
+        ),
+
+        # Copy constructor
+        function.Function(
+            name="__init__",
+            args=[
+                argument.Argument(
+                    name="other",
+                    type=generateCppArrayType(config),
+                    const=True,
+                    ref=True
+                )
+            ]
+        ),
+
+        # # Move constructor
+        # function.Function(
+        #     name="__init__",
+        #     args=[
+        #         argument.Argument(
+        #             name="other",
+        #             type=generateCppArrayType(config),
+        #             move=True
+        #         )
+        #     ]
+        # )
+    ],
 
     # Static fromData (n dimensions)
     for n in range(1, 9):
@@ -390,7 +415,6 @@ def writeArray(root, config):
     # Run clang-format if possible
     try:
         import subprocess
-
         subprocess.run(["clang-format", "-i", fileType.path])
     except Exception as e:
         print("Unable to run clang-format:", e)