Add tests for parameter special cases, fix array defaults

robotpy_build/hooks.py

@@ -174,6 +174,8 @@ def _resolve_default(self, fn, p, name):
             return name
 
         if name and name[0] == "{" and name[-1] == "}":
+            if p["array"]:
+                return name
             return f"{p['x_type']}{name}"
 
         # if there's a parent, look there
@@ -393,9 +395,12 @@ def _function_hook(self, fn, data: FunctionData, internal: bool = False):
                     ptype = "ignored"
 
             elif p.get("force_out") or (
-                p["pointer"] and not p["constant"] and p["fundamental"]
+                (p["pointer"] or p["reference"] == 1)
+                and not p["constant"]
+                and p["fundamental"]
             ):
-                p["x_callname"] = "&%(x_callname)s" % p
+                if p["pointer"]:
+                    p["x_callname"] = f"&{p['x_callname']}"
                 ptype = "out"
             elif p["array"]:
                 asz = p.get("array_size", 0)

tests/cpp/gen/ft/parameters.yml

@@ -0,0 +1,7 @@
+---
+
+functions:
+  fnParamArrayOutWithDefault:
+    param_override:
+      x:
+        default: "{0, 1, 2}"

tests/cpp/pyproject.toml.tmpl

@@ -44,6 +44,7 @@ generate = [
     { ignore = "ignore.h" },
     { lifetime = "lifetime.h" },
     { overloads = "overloads.h" },
+    { parameters = "parameters.h" },
     { rename = "rename.h" },
     { subpkg = "subpkg.h" },
     { static_only = "static_only.h" },

tests/cpp/rpytest/ft/__init__.py

@@ -55,6 +55,11 @@
     fnEmptyDefaultParam,
     fnIgnoredParam,
     fnOverload,
+    fnParamArrayOut,
+    fnParamArrayOutWithDefault,
+    fnParamFundConstRef,
+    fnParamFundPtr,
+    fnParamFundRef,
     fnRenamed,
     fnRenamedParam,
     fnSimpleDefaultParam,
@@ -116,6 +121,11 @@
     "fnEmptyDefaultParam",
     "fnIgnoredParam",
     "fnOverload",
+    "fnParamArrayOut",
+    "fnParamArrayOutWithDefault",
+    "fnParamFundConstRef",
+    "fnParamFundPtr",
+    "fnParamFundRef",
     "fnRenamed",
     "fnRenamedParam",
     "fnSimpleDefaultParam",

tests/cpp/rpytest/ft/include/parameters.h

@@ -0,0 +1,43 @@
+
+#pragma once
+
+//
+// Various tests related to function parameters
+//
+
+// the array parameter is returned
+int fnParamArrayOut(int x[3])
+{
+    x[0] = 5;
+    x[1] = 6;
+    x[2] = 7;
+    return 4;
+}
+
+// the array parameter is returned, with a default initialization
+int fnParamArrayOutWithDefault(int x[3])
+{
+    x[1] = 6;
+    return 4;
+}
+
+// parameters that are pointers and fundamental types are out by default
+int fnParamFundPtr(int x, int * y)
+{
+    *y = x + 1;
+    return x - 1;
+}
+
+// parameters that are references and fundamental types are out by default
+int fnParamFundRef(int x, int &y)
+{
+    y = x - 1;
+    return x + 1;
+}
+
+// parameters that are const references and fundamental types are inputs
+int fnParamFundConstRef(int x, const int &y)
+{
+    return x + y;
+}
+

tests/test_ft_parameters.py

@@ -0,0 +1,21 @@
+from rpytest import ft
+
+
+def test_array_out():
+    assert ft.fnParamArrayOut() == (4, [5, 6, 7])
+
+
+def test_array_out_w_default():
+    assert ft.fnParamArrayOutWithDefault() == (4, [0, 6, 2])
+
+
+def test_fund_ptr():
+    assert ft.fnParamFundPtr(4) == (3, 5)
+
+
+def test_fund_ref():
+    assert ft.fnParamFundRef(6) == (7, 5)
+
+
+def test_fund_const_ref():
+    assert ft.fnParamFundConstRef(1, 2) == 3