Merge branch '77_array_params' into main

Author: anderslanglands

CMakeLists.txt

@@ -44,3 +44,4 @@ add_subdirectory(test/imath)
 # add_subdirectory(test/openexr)
 add_subdirectory(test/oiio)
 add_subdirectory(test/usd)
+add_subdirectory(test/array_params)

astgen/src/process_binding.cpp

@@ -1074,7 +1074,32 @@ NodeId process_function_proto_type(const FunctionProtoType* fpt,
 /// Create a QType from the given QualType. Recursively processes the contained
 /// types.
 QType process_qtype(const QualType& qt) {
-    if (qt->isPointerType() || qt->isReferenceType()) {
+    if (const auto* dt = qt->getAs<DecayedType>()) {
+        // if it's a decayed type, get back the original type
+        const auto ot = dt->getOriginalType();
+        return process_qtype(ot);
+    } else if (qt->isConstantArrayType()) {
+        // e.g. float[3]
+        const std::string type_name = qt.getCanonicalType().getAsString();
+        const std::string type_node_name = "TYPE:" + type_name;
+        auto it = NODE_MAP.find(type_node_name);
+        NodeId id;
+        if (it == NODE_MAP.end()) {
+            const ConstantArrayType* cat =
+                dyn_cast<ConstantArrayType>(qt.getTypePtr());
+            QType element_type = process_qtype(cat->getElementType());
+            id = NODES.size();
+            auto node_type = std::make_unique<NodeConstantArrayType>(
+                type_node_name, id, 0, type_name, element_type,
+                cat->getSize().getLimitedValue());
+            NODES.emplace_back(std::move(node_type));
+            NODE_MAP[type_node_name] = id;
+        } else {
+            id = it->second;
+        }
+
+        return QType{id, qt.isConstQualified()};
+    } else if (qt->isPointerType() || qt->isReferenceType()) {
         // first, figure out what kind of pointer we have
         auto pointer_kind = PointerKind::Pointer;
         if (qt->isRValueReferenceType()) {
@@ -1106,27 +1131,6 @@ QType process_qtype(const QualType& qt) {
             id = it->second;
         }
 
-        return QType{id, qt.isConstQualified()};
-    } else if (qt->isConstantArrayType()) {
-        // e.g. float[3]
-        const std::string type_name = qt.getCanonicalType().getAsString();
-        const std::string type_node_name = "TYPE:" + type_name;
-        auto it = NODE_MAP.find(type_node_name);
-        NodeId id;
-        if (it == NODE_MAP.end()) {
-            const ConstantArrayType* cat =
-                dyn_cast<ConstantArrayType>(qt.getTypePtr());
-            QType element_type = process_qtype(cat->getElementType());
-            id = NODES.size();
-            auto node_type = std::make_unique<NodeConstantArrayType>(
-                type_node_name, id, 0, type_name, element_type,
-                cat->getSize().getLimitedValue());
-            NODES.emplace_back(std::move(node_type));
-            NODE_MAP[type_node_name] = id;
-        } else {
-            id = it->second;
-        }
-
         return QType{id, qt.isConstQualified()};
     } else {
         // regular type, let's get a nice name for it by removing the

test/array_params/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(testname array_params)
+
+add_test(NAME ${testname} 
+    COMMAND 
+        python 
+            ${CMAKE_SOURCE_DIR}/test/runtest.py 
+            $<TARGET_FILE:astgen> 
+            $<TARGET_FILE:asttoc> 
+            ${CMAKE_CURRENT_SOURCE_DIR}/bind 
+            ${CMAKE_BINARY_DIR}/test/${testname}/output
+            ${testname}
+            ${CMAKE_CURRENT_SOURCE_DIR}/ref
+            -I${CMAKE_CURRENT_SOURCE_DIR}/include
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)

test/array_params/bind/c-array_params.cpp

@@ -0,0 +1,22 @@
+#include <array_params.hpp>
+
+#include <cppmm_bind.hpp>
+
+namespace cppmm_bind {
+
+namespace imath {
+
+template <typename T> struct Matrix44 {
+    using BoundType = ::imath::Matrix44<T>;
+
+    Matrix44(const T a[4][4]) CPPMM_RENAME(from_array);
+} CPPMM_VALUETYPE;
+
+template class Matrix44<float>;
+using M44f = ::imath::Matrix44<float>;
+
+} // namespace imath
+
+} // namespace cppmm_bind
+
+template class imath::Matrix44<float>;

test/array_params/include/array_params.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+namespace imath {
+
+template <typename T> struct Matrix44 {
+    T data[4][4];
+
+    Matrix44(const T a[4][4]) {
+        for (int r = 0; r < 4; ++r) {
+            for (int c = 0; c < 4; ++c) {
+                data[r][c] = a[r][c];
+            }
+        }
+    }
+};
+
+} // namespace imath