diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
index 9c566f158f06fd..2b828da8a5afa2 100644
--- a/src/app/tests/suites/TestCluster.yaml
+++ b/src/app/tests/suites/TestCluster.yaml
@@ -912,7 +912,6 @@ tests:
- label:
"Send Test Command With Nested Struct Argument and arg1.c.b is true"
- disabled: true
command: "testNestedStructArgumentRequest"
arguments:
values:
@@ -939,7 +938,6 @@ tests:
value: true
- label: "Send Test Command With Nested Struct Argument arg1.c.b is false"
- disabled: true
command: "testNestedStructArgumentRequest"
arguments:
values:
@@ -968,7 +966,6 @@ tests:
- label:
"Send Test Command With Nested Struct List Argument and all fields b
of arg1.d are true"
- disabled: true
command: "testNestedStructListArgumentRequest"
arguments:
values:
@@ -1023,12 +1020,11 @@ tests:
response:
values:
- name: "value"
- value: false
+ value: true
- label:
"Send Test Command With Nested Struct List Argument and some fields b
of arg1.d are false"
- disabled: true
command: "testNestedStructListArgumentRequest"
arguments:
values:
@@ -1236,7 +1232,6 @@ tests:
- label:
"Send Test Command With List of Nested Struct List Argument and all
fields b of elements of arg1.d are true"
- disabled: true
command: "testListNestedStructListArgumentRequest"
arguments:
values:
@@ -1298,7 +1293,6 @@ tests:
- label:
"Send Test Command With Nested Struct List Argument and some fields b
of elements of arg1.d are false"
- disabled: true
command: "testListNestedStructListArgumentRequest"
arguments:
values:
@@ -2084,7 +2078,6 @@ tests:
- label: "Read attribute NULLABLE_CHAR_STRING"
command: "readAttribute"
attribute: "nullable_char_string"
- disabled: true
response:
value: "☉T☉"
diff --git a/src/app/zap-templates/templates/app/CHIPClusters-src.zapt b/src/app/zap-templates/templates/app/CHIPClusters-src.zapt
index 6b1e7da2919d78..5c49b83443ec4d 100644
--- a/src/app/zap-templates/templates/app/CHIPClusters-src.zapt
+++ b/src/app/zap-templates/templates/app/CHIPClusters-src.zapt
@@ -22,7 +22,7 @@ namespace Controller {
// {{asUpperCamelCase name}} Cluster Commands
{{#chip_cluster_commands}}
-CHIP_ERROR {{asUpperCamelCase clusterName}}Cluster::{{asUpperCamelCase name}}(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback{{#chip_cluster_command_arguments_with_structs_expanded}}, {{chipType}} {{asLowerCamelCase label}}{{/chip_cluster_command_arguments_with_structs_expanded}})
+CHIP_ERROR {{asUpperCamelCase clusterName}}Cluster::{{asUpperCamelCase name}}(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback{{#chip_cluster_command_arguments_with_structs_expanded}}{{#if_is_struct type}}{{else}}, {{chipType}} {{asLowerCamelCase label}}{{/if_is_struct}}{{/chip_cluster_command_arguments_with_structs_expanded}})
{
CHIP_ERROR err = CHIP_NO_ERROR;
TLV::TLVWriter * writer = nullptr;
@@ -44,6 +44,8 @@ CHIP_ERROR {{asUpperCamelCase clusterName}}Cluster::{{asUpperCamelCase name}}(Ca
SuccessOrExit(err = sender->PrepareCommand(cmdParams));
{{#chip_cluster_command_arguments_with_structs_expanded}}
+{{#if_is_struct type}}
+{{else}}
{{#first}}
VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
{{/first}}
@@ -53,6 +55,7 @@ CHIP_ERROR {{asUpperCamelCase clusterName}}Cluster::{{asUpperCamelCase name}}(Ca
{{else}}
SuccessOrExit(err = writer->Put(TLV::ContextTag(argSeqNumber++), {{asLowerCamelCase label}}));
{{/if}}
+{{/if_is_struct}}
{{else}}
// Command takes no arguments.
{{/chip_cluster_command_arguments_with_structs_expanded}}
diff --git a/src/app/zap-templates/templates/app/CHIPClusters.zapt b/src/app/zap-templates/templates/app/CHIPClusters.zapt
index c74ab861a2caa0..77da2fa5450716 100644
--- a/src/app/zap-templates/templates/app/CHIPClusters.zapt
+++ b/src/app/zap-templates/templates/app/CHIPClusters.zapt
@@ -25,7 +25,7 @@ public:
// Cluster Commands
{{/first}}
- CHIP_ERROR {{asUpperCamelCase name}}(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback{{#chip_cluster_command_arguments_with_structs_expanded}}, {{chipType}} {{asLowerCamelCase label}}{{/chip_cluster_command_arguments_with_structs_expanded}});
+ CHIP_ERROR {{asUpperCamelCase name}}(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback{{#chip_cluster_command_arguments_with_structs_expanded}}{{#if_is_struct type}}{{else}}, {{chipType}} {{asLowerCamelCase label}}{{/if_is_struct}}{{/chip_cluster_command_arguments_with_structs_expanded}});
{{/chip_cluster_commands}}
// Cluster Attributes
diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
index cc7077484a7e70..78715c6b13ba2e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
@@ -272,7 +272,7 @@ limitations under the License.
-
+
Command that takes an argument which is a list of Nested Struct List.
The response returns false if there is some struct in arg1 (either
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 16561f3198789f..72ef81e0dd91d3 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -11520,7 +11520,7 @@
"mfgCode": null,
"source": "client",
"incoming": 0,
- "outgoing": 0
+ "outgoing": 1
},
{
"name": "TestListStructArgumentRequest",
@@ -11544,7 +11544,7 @@
"mfgCode": null,
"source": "client",
"incoming": 0,
- "outgoing": 0
+ "outgoing": 1
},
{
"name": "TestListNestedStructListArgumentRequest",
@@ -11552,7 +11552,7 @@
"mfgCode": null,
"source": "client",
"incoming": 0,
- "outgoing": 0
+ "outgoing": 1
},
{
"name": "TestListInt8UReverseRequest",
diff --git a/src/controller/java/templates/ChipClusters-java.zapt b/src/controller/java/templates/ChipClusters-java.zapt
index 0d625aaf5b78df..a85fd0be71039e 100644
--- a/src/controller/java/templates/ChipClusters-java.zapt
+++ b/src/controller/java/templates/ChipClusters-java.zapt
@@ -79,14 +79,14 @@ public class ChipClusters {
{{#chip_cluster_commands}}
public void {{asLowerCamelCase name}}({{#if hasSpecificResponse}}{{asUpperCamelCase responseName}}Callback{{else}}DefaultClusterCallback{{/if}} callback
- {{#chip_cluster_command_arguments_with_structs_expanded}}{{>java_type_for_argument}} {{asLowerCamelCase label}}{{/chip_cluster_command_arguments_with_structs_expanded}}) {
- {{asLowerCamelCase name}}(chipClusterPtr, callback{{#chip_cluster_command_arguments_with_structs_expanded}}, {{asLowerCamelCase label}}{{/chip_cluster_command_arguments_with_structs_expanded}});
+ {{#chip_cluster_command_arguments_with_structs_expanded}}{{#if_is_struct type}}{{else}}{{>java_type_for_argument}} {{asLowerCamelCase label}}{{/if_is_struct}}{{/chip_cluster_command_arguments_with_structs_expanded}}) {
+ {{asLowerCamelCase name}}(chipClusterPtr, callback{{#chip_cluster_command_arguments_with_structs_expanded}}{{#if_is_struct type}}{{else}}, {{asLowerCamelCase label}}{{/if_is_struct}}{{/chip_cluster_command_arguments_with_structs_expanded}});
}
{{/chip_cluster_commands}}
{{#chip_cluster_commands}}
private native void {{asLowerCamelCase name}}(long chipClusterPtr, {{#if hasSpecificResponse}}{{asUpperCamelCase responseName}}Callback{{else}}DefaultClusterCallback{{/if}} Callback
- {{#chip_cluster_command_arguments_with_structs_expanded}}{{>java_type_for_argument}} {{asLowerCamelCase label}}{{/chip_cluster_command_arguments_with_structs_expanded}});
+ {{#chip_cluster_command_arguments_with_structs_expanded}}{{#if_is_struct type}}{{else}}{{>java_type_for_argument}} {{asLowerCamelCase label}}{{/if_is_struct}}{{/chip_cluster_command_arguments_with_structs_expanded}});
{{/chip_cluster_commands}}
{{#chip_cluster_responses}}
public interface {{asUpperCamelCase name}}Callback {
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 6d6c37d83d49ed..e3d42f80092542 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -271,9 +271,12 @@ public class ClusterInfoMapping {
{{! TODO: fill out parameter types }}
{{#if (zcl_command_arguments_count this.id)}}
{{#chip_cluster_command_arguments_with_structs_expanded}}
+ {{#if_is_struct type}}
+ {{else}}
CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
{{#not_last}} {{/not_last}}
+ {{/if_is_struct}}
{{/chip_cluster_command_arguments_with_structs_expanded}}
{{else}}
{{/if}}
@@ -283,9 +286,10 @@ public class ClusterInfoMapping {
(cluster, callback, commandArguments) -> {
((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
.{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
- {{#chip_cluster_command_arguments_with_structs_expanded}},
+ {{#chip_cluster_command_arguments_with_structs_expanded}}{{#if_is_struct type}}{{else}},
({{#if isOptional}}Optional<{{/if}}{{asJavaBoxedType type}}{{#if isOptional}}>{{/if}})
commandArguments.get("{{asLowerCamelCase label}}")
+ {{/if_is_struct}}
{{/chip_cluster_command_arguments_with_structs_expanded}}
);
},
diff --git a/src/controller/java/templates/partials/java_type_for_argument.zapt b/src/controller/java/templates/partials/java_type_for_argument.zapt
index 6944bc8df648e6..7b8f65d10bacf8 100644
--- a/src/controller/java/templates/partials/java_type_for_argument.zapt
+++ b/src/controller/java/templates/partials/java_type_for_argument.zapt
@@ -1 +1 @@
-, {{#if isOptional}}Optional<{{else if isNullable}}@Nullable {{/if}}{{asJavaBoxedType type}}{{#if isOptional}}>{{/if}}
\ No newline at end of file
+{{#if_is_struct type}}{{else}}, {{#if isOptional}}Optional<{{else if isNullable}}@Nullable {{/if}}{{asJavaBoxedType type}}{{#if isOptional}}>{{/if}}{{/if_is_struct}}
\ No newline at end of file
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index 6856f592e17723..fd633a08d910ba 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -24458,6 +24458,47 @@ JNI_METHOD(void, TestClusterCluster, testListInt8UReverseRequest)
onSuccess.release();
onFailure.release();
}
+JNI_METHOD(void, TestClusterCluster, testListNestedStructListArgumentRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject a, jobject b, jobject c, jobject d, jobject e,
+ jbyteArray f, jobject g)
+{
+ chip::DeviceLayer::StackLock lock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ TestClusterCluster * cppCluster;
+
+ chip::app::Clusters::TestCluster::Commands::TestListNestedStructListArgumentRequest::Type request;
+
+ request.arg1 = chip::app::DataModel::List();
+
+ std::unique_ptr
+ onSuccess(Platform::New(callback),
+ Platform::Delete);
+ std::unique_ptr onFailure(
+ Platform::New(callback), Platform::Delete);
+ VerifyOrReturn(onSuccess.get() != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+ VerifyOrReturn(onFailure.get() != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+
+ cppCluster = reinterpret_cast(clusterPtr);
+ VerifyOrReturn(cppCluster != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+ auto successFn =
+ chip::Callback::Callback::FromCancelable(onSuccess->Cancel());
+ auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel());
+
+ err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+ VerifyOrReturn(err == CHIP_NO_ERROR,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command",
+ CHIP_ERROR_INCORRECT_STATE));
+
+ onSuccess.release();
+ onFailure.release();
+}
JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)
(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject a, jobject b, jobject c, jbyteArray d, jstring e,
jobject f, jobject g, jobject h)
@@ -24499,6 +24540,87 @@ JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)
onSuccess.release();
onFailure.release();
}
+JNI_METHOD(void, TestClusterCluster, testNestedStructArgumentRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject a, jobject b, jobject c)
+{
+ chip::DeviceLayer::StackLock lock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ TestClusterCluster * cppCluster;
+
+ chip::app::Clusters::TestCluster::Commands::TestNestedStructArgumentRequest::Type request;
+
+ request.arg1 = chip::app::Clusters::TestCluster::Structs::NestedStruct::Type();
+
+ std::unique_ptr
+ onSuccess(Platform::New(callback),
+ Platform::Delete);
+ std::unique_ptr onFailure(
+ Platform::New(callback), Platform::Delete);
+ VerifyOrReturn(onSuccess.get() != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+ VerifyOrReturn(onFailure.get() != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+
+ cppCluster = reinterpret_cast(clusterPtr);
+ VerifyOrReturn(cppCluster != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+ auto successFn =
+ chip::Callback::Callback::FromCancelable(onSuccess->Cancel());
+ auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel());
+
+ err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+ VerifyOrReturn(err == CHIP_NO_ERROR,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command",
+ CHIP_ERROR_INCORRECT_STATE));
+
+ onSuccess.release();
+ onFailure.release();
+}
+JNI_METHOD(void, TestClusterCluster, testNestedStructListArgumentRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject a, jobject b, jobject c, jobject d, jobject e,
+ jbyteArray f, jobject g)
+{
+ chip::DeviceLayer::StackLock lock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ TestClusterCluster * cppCluster;
+
+ chip::app::Clusters::TestCluster::Commands::TestNestedStructListArgumentRequest::Type request;
+
+ request.arg1 = chip::app::Clusters::TestCluster::Structs::NestedStructList::Type();
+
+ std::unique_ptr
+ onSuccess(Platform::New(callback),
+ Platform::Delete);
+ std::unique_ptr onFailure(
+ Platform::New(callback), Platform::Delete);
+ VerifyOrReturn(onSuccess.get() != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+ VerifyOrReturn(onFailure.get() != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+
+ cppCluster = reinterpret_cast(clusterPtr);
+ VerifyOrReturn(cppCluster != nullptr,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
+ env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+ auto successFn =
+ chip::Callback::Callback::FromCancelable(onSuccess->Cancel());
+ auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel());
+
+ err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+ VerifyOrReturn(err == CHIP_NO_ERROR,
+ AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command",
+ CHIP_ERROR_INCORRECT_STATE));
+
+ onSuccess.release();
+ onFailure.release();
+}
JNI_METHOD(void, TestClusterCluster, testNotHandled)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
{
chip::DeviceLayer::StackLock lock;
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index bba7968edb445f..8071305635fa7a 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -10727,6 +10727,11 @@ public void testListInt8UReverseRequest(
testListInt8UReverseRequest(chipClusterPtr, callback, arg1);
}
+ public void testListNestedStructListArgumentRequest(
+ BooleanResponseCallback callback, Integer a, Boolean b, Long e, byte[] f, Integer g) {
+ testListNestedStructListArgumentRequest(chipClusterPtr, callback, a, b, e, f, g);
+ }
+
public void testListStructArgumentRequest(
BooleanResponseCallback callback,
Integer a,
@@ -10740,6 +10745,16 @@ public void testListStructArgumentRequest(
testListStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f, g, h);
}
+ public void testNestedStructArgumentRequest(
+ BooleanResponseCallback callback, Integer a, Boolean b) {
+ testNestedStructArgumentRequest(chipClusterPtr, callback, a, b);
+ }
+
+ public void testNestedStructListArgumentRequest(
+ BooleanResponseCallback callback, Integer a, Boolean b, Long e, byte[] f, Integer g) {
+ testNestedStructListArgumentRequest(chipClusterPtr, callback, a, b, e, f, g);
+ }
+
public void testNotHandled(DefaultClusterCallback callback) {
testNotHandled(chipClusterPtr, callback);
}
@@ -10796,6 +10811,15 @@ private native void testListInt8UArgumentRequest(
private native void testListInt8UReverseRequest(
long chipClusterPtr, TestListInt8UReverseResponseCallback Callback, Integer arg1);
+ private native void testListNestedStructListArgumentRequest(
+ long chipClusterPtr,
+ BooleanResponseCallback Callback,
+ Integer a,
+ Boolean b,
+ Long e,
+ byte[] f,
+ Integer g);
+
private native void testListStructArgumentRequest(
long chipClusterPtr,
BooleanResponseCallback Callback,
@@ -10808,6 +10832,18 @@ private native void testListStructArgumentRequest(
Float g,
Double h);
+ private native void testNestedStructArgumentRequest(
+ long chipClusterPtr, BooleanResponseCallback Callback, Integer a, Boolean b);
+
+ private native void testNestedStructListArgumentRequest(
+ long chipClusterPtr,
+ BooleanResponseCallback Callback,
+ Integer a,
+ Boolean b,
+ Long e,
+ byte[] f,
+ Integer g);
+
private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback Callback);
private native void testNullableOptionalRequest(
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 672bf418bbe006..75d4634ad9ef13 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -7917,6 +7917,52 @@ public Map> getCommandMap() {
testClustertestListInt8UReverseRequestCommandParams);
testClusterClusterInteractionInfoMap.put(
"testListInt8UReverseRequest", testClustertestListInt8UReverseRequestInteractionInfo);
+ Map
+ testClustertestListNestedStructListArgumentRequestCommandParams =
+ new LinkedHashMap();
+ CommandParameterInfo testClustertestListNestedStructListArgumentRequestaCommandParameterInfo =
+ new CommandParameterInfo("a", int.class);
+ testClustertestListNestedStructListArgumentRequestCommandParams.put(
+ "a", testClustertestListNestedStructListArgumentRequestaCommandParameterInfo);
+
+ CommandParameterInfo testClustertestListNestedStructListArgumentRequestbCommandParameterInfo =
+ new CommandParameterInfo("b", boolean.class);
+ testClustertestListNestedStructListArgumentRequestCommandParams.put(
+ "b", testClustertestListNestedStructListArgumentRequestbCommandParameterInfo);
+
+ CommandParameterInfo testClustertestListNestedStructListArgumentRequesteCommandParameterInfo =
+ new CommandParameterInfo("e", long.class);
+ testClustertestListNestedStructListArgumentRequestCommandParams.put(
+ "e", testClustertestListNestedStructListArgumentRequesteCommandParameterInfo);
+
+ CommandParameterInfo testClustertestListNestedStructListArgumentRequestfCommandParameterInfo =
+ new CommandParameterInfo("f", byte[].class);
+ testClustertestListNestedStructListArgumentRequestCommandParams.put(
+ "f", testClustertestListNestedStructListArgumentRequestfCommandParameterInfo);
+
+ CommandParameterInfo testClustertestListNestedStructListArgumentRequestgCommandParameterInfo =
+ new CommandParameterInfo("g", int.class);
+ testClustertestListNestedStructListArgumentRequestCommandParams.put(
+ "g", testClustertestListNestedStructListArgumentRequestgCommandParameterInfo);
+
+ // Populate commands
+ InteractionInfo testClustertestListNestedStructListArgumentRequestInteractionInfo =
+ new InteractionInfo(
+ (cluster, callback, commandArguments) -> {
+ ((ChipClusters.TestClusterCluster) cluster)
+ .testListNestedStructListArgumentRequest(
+ (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+ (Integer) commandArguments.get("a"),
+ (Boolean) commandArguments.get("b"),
+ (Long) commandArguments.get("e"),
+ (byte[]) commandArguments.get("f"),
+ (Integer) commandArguments.get("g"));
+ },
+ () -> new DelegatedBooleanResponseCallback(),
+ testClustertestListNestedStructListArgumentRequestCommandParams);
+ testClusterClusterInteractionInfoMap.put(
+ "testListNestedStructListArgumentRequest",
+ testClustertestListNestedStructListArgumentRequestInteractionInfo);
Map testClustertestListStructArgumentRequestCommandParams =
new LinkedHashMap();
CommandParameterInfo testClustertestListStructArgumentRequestaCommandParameterInfo =
@@ -7979,6 +8025,78 @@ public Map> getCommandMap() {
testClustertestListStructArgumentRequestCommandParams);
testClusterClusterInteractionInfoMap.put(
"testListStructArgumentRequest", testClustertestListStructArgumentRequestInteractionInfo);
+ Map testClustertestNestedStructArgumentRequestCommandParams =
+ new LinkedHashMap();
+ CommandParameterInfo testClustertestNestedStructArgumentRequestaCommandParameterInfo =
+ new CommandParameterInfo("a", int.class);
+ testClustertestNestedStructArgumentRequestCommandParams.put(
+ "a", testClustertestNestedStructArgumentRequestaCommandParameterInfo);
+
+ CommandParameterInfo testClustertestNestedStructArgumentRequestbCommandParameterInfo =
+ new CommandParameterInfo("b", boolean.class);
+ testClustertestNestedStructArgumentRequestCommandParams.put(
+ "b", testClustertestNestedStructArgumentRequestbCommandParameterInfo);
+
+ // Populate commands
+ InteractionInfo testClustertestNestedStructArgumentRequestInteractionInfo =
+ new InteractionInfo(
+ (cluster, callback, commandArguments) -> {
+ ((ChipClusters.TestClusterCluster) cluster)
+ .testNestedStructArgumentRequest(
+ (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+ (Integer) commandArguments.get("a"),
+ (Boolean) commandArguments.get("b"));
+ },
+ () -> new DelegatedBooleanResponseCallback(),
+ testClustertestNestedStructArgumentRequestCommandParams);
+ testClusterClusterInteractionInfoMap.put(
+ "testNestedStructArgumentRequest",
+ testClustertestNestedStructArgumentRequestInteractionInfo);
+ Map testClustertestNestedStructListArgumentRequestCommandParams =
+ new LinkedHashMap();
+ CommandParameterInfo testClustertestNestedStructListArgumentRequestaCommandParameterInfo =
+ new CommandParameterInfo("a", int.class);
+ testClustertestNestedStructListArgumentRequestCommandParams.put(
+ "a", testClustertestNestedStructListArgumentRequestaCommandParameterInfo);
+
+ CommandParameterInfo testClustertestNestedStructListArgumentRequestbCommandParameterInfo =
+ new CommandParameterInfo("b", boolean.class);
+ testClustertestNestedStructListArgumentRequestCommandParams.put(
+ "b", testClustertestNestedStructListArgumentRequestbCommandParameterInfo);
+
+ CommandParameterInfo testClustertestNestedStructListArgumentRequesteCommandParameterInfo =
+ new CommandParameterInfo("e", long.class);
+ testClustertestNestedStructListArgumentRequestCommandParams.put(
+ "e", testClustertestNestedStructListArgumentRequesteCommandParameterInfo);
+
+ CommandParameterInfo testClustertestNestedStructListArgumentRequestfCommandParameterInfo =
+ new CommandParameterInfo("f", byte[].class);
+ testClustertestNestedStructListArgumentRequestCommandParams.put(
+ "f", testClustertestNestedStructListArgumentRequestfCommandParameterInfo);
+
+ CommandParameterInfo testClustertestNestedStructListArgumentRequestgCommandParameterInfo =
+ new CommandParameterInfo("g", int.class);
+ testClustertestNestedStructListArgumentRequestCommandParams.put(
+ "g", testClustertestNestedStructListArgumentRequestgCommandParameterInfo);
+
+ // Populate commands
+ InteractionInfo testClustertestNestedStructListArgumentRequestInteractionInfo =
+ new InteractionInfo(
+ (cluster, callback, commandArguments) -> {
+ ((ChipClusters.TestClusterCluster) cluster)
+ .testNestedStructListArgumentRequest(
+ (ChipClusters.TestClusterCluster.BooleanResponseCallback) callback,
+ (Integer) commandArguments.get("a"),
+ (Boolean) commandArguments.get("b"),
+ (Long) commandArguments.get("e"),
+ (byte[]) commandArguments.get("f"),
+ (Integer) commandArguments.get("g"));
+ },
+ () -> new DelegatedBooleanResponseCallback(),
+ testClustertestNestedStructListArgumentRequestCommandParams);
+ testClusterClusterInteractionInfoMap.put(
+ "testNestedStructListArgumentRequest",
+ testClustertestNestedStructListArgumentRequestInteractionInfo);
Map testClustertestNotHandledCommandParams =
new LinkedHashMap();
// Populate commands
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index fc1e66f46b50c8..7061df2e9d6e38 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -3687,6 +3687,19 @@ class ChipClusters:
"arg1": "int",
},
},
+ 0x0000000C: {
+ "commandId": 0x0000000C,
+ "commandName": "TestListNestedStructListArgumentRequest",
+ "args": {
+ "a": "int",
+ "b": "bool",
+ "c": "",
+ "d": "",
+ "e": "int",
+ "f": "bytes",
+ "g": "int",
+ },
+ },
0x00000009: {
"commandId": 0x00000009,
"commandName": "TestListStructArgumentRequest",
@@ -3701,6 +3714,28 @@ class ChipClusters:
"h": "",
},
},
+ 0x00000008: {
+ "commandId": 0x00000008,
+ "commandName": "TestNestedStructArgumentRequest",
+ "args": {
+ "a": "int",
+ "b": "bool",
+ "c": "",
+ },
+ },
+ 0x0000000B: {
+ "commandId": 0x0000000B,
+ "commandName": "TestNestedStructListArgumentRequest",
+ "args": {
+ "a": "int",
+ "b": "bool",
+ "c": "",
+ "d": "",
+ "e": "int",
+ "f": "bytes",
+ "g": "int",
+ },
+ },
0x00000001: {
"commandId": 0x00000001,
"commandName": "TestNotHandled",
diff --git a/src/darwin/Framework/CHIP/templates/partials/encode_value.zapt b/src/darwin/Framework/CHIP/templates/partials/encode_value.zapt
index 5e198542e10b7d..fb3bfea4be65e2 100644
--- a/src/darwin/Framework/CHIP/templates/partials/encode_value.zapt
+++ b/src/darwin/Framework/CHIP/templates/partials/encode_value.zapt
@@ -18,25 +18,25 @@
we are right now it may not (e.g. for a nullable list we're
inside an "else" block here). }}
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_{{depth}} = std::remove_reference_t;
+ using ListMemberType_{{depth}} = ListMemberTypeGetter::Type;
if ({{source}}.count != 0) {
- auto * listHolder_{{depth}} = new ListHolder({{source}}.count);
+ auto * listHolder_{{depth}} = new ListHolder({{source}}.count);
if (listHolder_{{depth}} == nullptr || listHolder_{{depth}}->mList == nullptr) {
{{errorCode}}
}
listFreer.add(listHolder_{{depth}});
- for (size_t i = 0; i < {{source}}.count; ++i) {
- if (![{{source}}[i] isKindOfClass:[{{asObjectiveCClass type cluster forceNotList=true}} class]]) {
+ for (size_t i_{{depth}} = 0; i_{{depth}} < {{source}}.count; ++i_{{depth}}) {
+ if (![{{source}}[i_{{depth}}] isKindOfClass:[{{asObjectiveCClass type cluster forceNotList=true}} class]]) {
// Wrong kind of value.
{{errorCode}}
}
- auto element_{{depth}} = ({{asObjectiveCClass type cluster forceNotList=true}} *){{source}}[i];
- {{>encode_value target=(concat "listHolder_" depth "->mList[i]") source=(concat "element_" depth) cluster=cluster errorCode=errorCode depth=(incrementDepth depth) isArray=false}}
+ auto element_{{depth}} = ({{asObjectiveCClass type cluster forceNotList=true}} *){{source}}[i_{{depth}}];
+ {{>encode_value target=(concat "listHolder_" depth "->mList[i_" depth "]") source=(concat "element_" depth) cluster=cluster errorCode=errorCode depth=(incrementDepth depth) isArray=false}}
}
- {{target}} = ListType(listHolder_{{depth}}->mList, {{source}}.count);
+ {{target}} = ListType_{{depth}}(listHolder_{{depth}}->mList, {{source}}.count);
} else {
- {{target}} = ListType();
+ {{target}} = ListType_{{depth}}();
}
}
{{else if (isOctetString type)}}
diff --git a/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt b/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt
index 163650e05e568e..3ba5976acaf0d9 100644
--- a/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt
+++ b/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt
@@ -28,7 +28,7 @@ bool testSendCluster{{parent.filename}}_{{asTestIndex index}}_{{asUpperCamelCase
__auto_type * params = [[CHIP{{asUpperCamelCase cluster}}Cluster{{asUpperCamelCase command}}Params alloc] init];
{{/if}}
{{#chip_tests_item_parameters}}
- {{>test_value target=(concat "params." (asStructPropertyName label)) definedValue=definedValue cluster=parent.cluster}}
+ {{>test_value target=(concat "params." (asStructPropertyName label)) definedValue=definedValue cluster=parent.cluster depth=0}}
{{/chip_tests_item_parameters}}
[cluster {{asLowerCamelCase command}}With
{{~#if commandObject.arguments.length~}}
@@ -63,7 +63,7 @@ bool testSendCluster{{parent.filename}}_{{asTestIndex index}}_{{asUpperCamelCase
{{else if isWriteAttribute}}
{{#chip_tests_item_parameters}}
id {{asLowerCamelCase name}}Argument;
- {{>test_value target=(concat (asLowerCamelCase name) "Argument") definedValue=definedValue cluster=parent.cluster}}
+ {{>test_value target=(concat (asLowerCamelCase name) "Argument") definedValue=definedValue cluster=parent.cluster depth=0}}
{{/chip_tests_item_parameters}}
[cluster writeAttribute{{asUpperCamelCase attribute}}WithValue:{{#chip_tests_item_parameters}}{{asLowerCamelCase name}}Argument{{/chip_tests_item_parameters}} completionHandler:^(NSError * _Nullable err) {
{{/if}}
diff --git a/src/darwin/Framework/CHIP/templates/partials/test_value.zapt b/src/darwin/Framework/CHIP/templates/partials/test_value.zapt
index 4ba3752ee15bcf..ed0ce1a6a9c292 100644
--- a/src/darwin/Framework/CHIP/templates/partials/test_value.zapt
+++ b/src/darwin/Framework/CHIP/templates/partials/test_value.zapt
@@ -1,19 +1,19 @@
{{#if isOptional}}
{{! Just go ahead and assign to the value, stripping the optionality bit off. }}
- {{>test_value target=target definedValue=definedValue cluster=cluster isOptional=false}}
+ {{>test_value target=target definedValue=definedValue cluster=cluster isOptional=false depth=(incrementDepth depth)}}
{{else if isNullable}}
{{#if (isLiteralNull definedValue)}}
{{target}} = nil;
{{else}}
- {{>test_value target=target definedValue=definedValue cluster=cluster isNullable=false}}
+ {{>test_value target=target definedValue=definedValue cluster=cluster isNullable=false depth=(incrementDepth depth)}}
{{/if}}
{{else if isArray}}
{
- NSMutableArray * temp = [[NSMutableArray alloc] init];
+ NSMutableArray * temp_{{depth}} = [[NSMutableArray alloc] init];
{{#each definedValue}}
- {{>test_value target=(concat "temp[" @index "]") definedValue=this cluster=../cluster type=../type isArray=false}}
+ {{>test_value target=(concat "temp_" ../depth "[" @index "]") definedValue=this cluster=../cluster depth=(incrementDepth ../depth) type=../type isArray=false}}
{{/each}}
- {{target}} = temp;
+ {{target}} = temp_{{depth}};
}
{{else}}
{{#if_is_struct type}}
@@ -21,7 +21,7 @@
{{#zcl_struct_items_by_struct_name type}}
{{! target may be some place where we lost type information (e.g. an id),
so add explicit cast when trying to assign to our properties. }}
- {{>test_value target=(concat "((CHIP" (asUpperCamelCase ../cluster) "Cluster" (asUpperCamelCase ../type) " *)" ../target ")." (asStructPropertyName label)) definedValue=(lookup ../definedValue name) cluster=../cluster}}
+ {{>test_value target=(concat "((CHIP" (asUpperCamelCase ../cluster) "Cluster" (asUpperCamelCase ../type) " *)" ../target ")." (asStructPropertyName label)) definedValue=(lookup ../definedValue name) cluster=../cluster depth=(incrementDepth ../depth)}}
{{/zcl_struct_items_by_struct_name}}
{{else if (isCharString type)}}
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
index 99f67f66c8caba..8575601940f36f 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
@@ -3271,9 +3271,19 @@ NS_ASSUME_NONNULL_BEGIN
- (void)testListInt8UReverseRequestWithParams:(CHIPTestClusterClusterTestListInt8UReverseRequestParams *)params
completionHandler:(void (^)(CHIPTestClusterClusterTestListInt8UReverseResponseParams * _Nullable data,
NSError * _Nullable error))completionHandler;
+- (void)testListNestedStructListArgumentRequestWithParams:
+ (CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams *)params
+ completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+ NSError * _Nullable error))completionHandler;
- (void)testListStructArgumentRequestWithParams:(CHIPTestClusterClusterTestListStructArgumentRequestParams *)params
completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
NSError * _Nullable error))completionHandler;
+- (void)testNestedStructArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructArgumentRequestParams *)params
+ completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+ NSError * _Nullable error))completionHandler;
+- (void)testNestedStructListArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructListArgumentRequestParams *)params
+ completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+ NSError * _Nullable error))completionHandler;
- (void)testNotHandledWithCompletionHandler:(StatusCompletion)completionHandler;
- (void)testNullableOptionalRequestWithParams:(CHIPTestClusterClusterTestNullableOptionalRequestParams * _Nullable)params
completionHandler:(void (^)(CHIPTestClusterClusterTestNullableOptionalResponseParams * _Nullable data,
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
index 79056f5aecd3b3..76fd6d24667d38 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
@@ -8725,25 +8725,25 @@ - (void)getGroupMembershipWithParams:(CHIPGroupsClusterGetGroupMembershipParams
ListFreer listFreer;
Groups::Commands::GetGroupMembership::Type request;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (params.groupList.count != 0) {
- auto * listHolder_0 = new ListHolder(params.groupList.count);
+ auto * listHolder_0 = new ListHolder(params.groupList.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < params.groupList.count; ++i) {
- if (![params.groupList[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < params.groupList.count; ++i_0) {
+ if (![params.groupList[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return;
}
- auto element_0 = (NSNumber *) params.groupList[i];
- listHolder_0->mList[i] = element_0.unsignedShortValue;
+ auto element_0 = (NSNumber *) params.groupList[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedShortValue;
}
- request.groupList = ListType(listHolder_0->mList, params.groupList.count);
+ request.groupList = ListType_0(listHolder_0->mList, params.groupList.count);
} else {
- request.groupList = ListType();
+ request.groupList = ListType_0();
}
}
@@ -11668,26 +11668,26 @@ - (void)queryImageWithParams:(CHIPOtaSoftwareUpdateProviderClusterQueryImagePara
request.productId = params.productId.unsignedShortValue;
request.softwareVersion = params.softwareVersion.unsignedIntValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (params.protocolsSupported.count != 0) {
- auto * listHolder_0 = new ListHolder(params.protocolsSupported.count);
+ auto * listHolder_0 = new ListHolder(params.protocolsSupported.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < params.protocolsSupported.count; ++i) {
- if (![params.protocolsSupported[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < params.protocolsSupported.count; ++i_0) {
+ if (![params.protocolsSupported[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return;
}
- auto element_0 = (NSNumber *) params.protocolsSupported[i];
- listHolder_0->mList[i]
- = static_castmList[i])>>(element_0.unsignedCharValue);
+ auto element_0 = (NSNumber *) params.protocolsSupported[i_0];
+ listHolder_0->mList[i_0]
+ = static_castmList[i_0])>>(element_0.unsignedCharValue);
}
- request.protocolsSupported = ListType(listHolder_0->mList, params.protocolsSupported.count);
+ request.protocolsSupported = ListType_0(listHolder_0->mList, params.protocolsSupported.count);
} else {
- request.protocolsSupported = ListType();
+ request.protocolsSupported = ListType_0();
}
}
if (params.hardwareVersion != nil) {
@@ -14951,27 +14951,27 @@ - (void)addSceneWithParams:(CHIPScenesClusterAddSceneParams *)params
request.transitionTime = params.transitionTime.unsignedShortValue;
request.sceneName = [self asCharSpan:params.sceneName];
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (params.extensionFieldSets.count != 0) {
- auto * listHolder_0 = new ListHolder(params.extensionFieldSets.count);
+ auto * listHolder_0 = new ListHolder(params.extensionFieldSets.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < params.extensionFieldSets.count; ++i) {
- if (![params.extensionFieldSets[i] isKindOfClass:[CHIPScenesClusterSceneExtensionFieldSet class]]) {
+ for (size_t i_0 = 0; i_0 < params.extensionFieldSets.count; ++i_0) {
+ if (![params.extensionFieldSets[i_0] isKindOfClass:[CHIPScenesClusterSceneExtensionFieldSet class]]) {
// Wrong kind of value.
return;
}
- auto element_0 = (CHIPScenesClusterSceneExtensionFieldSet *) params.extensionFieldSets[i];
- listHolder_0->mList[i].clusterId = element_0.clusterId.unsignedIntValue;
- listHolder_0->mList[i].length = element_0.length.unsignedCharValue;
- listHolder_0->mList[i].value = element_0.value.unsignedCharValue;
+ auto element_0 = (CHIPScenesClusterSceneExtensionFieldSet *) params.extensionFieldSets[i_0];
+ listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue;
+ listHolder_0->mList[i_0].length = element_0.length.unsignedCharValue;
+ listHolder_0->mList[i_0].value = element_0.value.unsignedCharValue;
}
- request.extensionFieldSets = ListType(listHolder_0->mList, params.extensionFieldSets.count);
+ request.extensionFieldSets = ListType_0(listHolder_0->mList, params.extensionFieldSets.count);
} else {
- request.extensionFieldSets = ListType();
+ request.extensionFieldSets = ListType_0();
}
}
@@ -16352,25 +16352,25 @@ - (void)testListInt8UArgumentRequestWithParams:(CHIPTestClusterClusterTestListIn
ListFreer listFreer;
TestCluster::Commands::TestListInt8UArgumentRequest::Type request;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (params.arg1.count != 0) {
- auto * listHolder_0 = new ListHolder(params.arg1.count);
+ auto * listHolder_0 = new ListHolder(params.arg1.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < params.arg1.count; ++i) {
- if (![params.arg1[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+ if (![params.arg1[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return;
}
- auto element_0 = (NSNumber *) params.arg1[i];
- listHolder_0->mList[i] = element_0.unsignedCharValue;
+ auto element_0 = (NSNumber *) params.arg1[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedCharValue;
}
- request.arg1 = ListType(listHolder_0->mList, params.arg1.count);
+ request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
} else {
- request.arg1 = ListType();
+ request.arg1 = ListType_0();
}
}
@@ -16393,25 +16393,25 @@ - (void)testListInt8UReverseRequestWithParams:(CHIPTestClusterClusterTestListInt
ListFreer listFreer;
TestCluster::Commands::TestListInt8UReverseRequest::Type request;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (params.arg1.count != 0) {
- auto * listHolder_0 = new ListHolder(params.arg1.count);
+ auto * listHolder_0 = new ListHolder(params.arg1.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < params.arg1.count; ++i) {
- if (![params.arg1[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+ if (![params.arg1[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return;
}
- auto element_0 = (NSNumber *) params.arg1[i];
- listHolder_0->mList[i] = element_0.unsignedCharValue;
+ auto element_0 = (NSNumber *) params.arg1[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedCharValue;
}
- request.arg1 = ListType(listHolder_0->mList, params.arg1.count);
+ request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
} else {
- request.arg1 = ListType();
+ request.arg1 = ListType_0();
}
}
@@ -16427,6 +16427,156 @@ new CHIPTestClusterClusterTestListInt8UReverseResponseCallbackBridge(
});
}
+- (void)testListNestedStructListArgumentRequestWithParams:
+ (CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams *)params
+ completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+ NSError * _Nullable error))completionHandler
+{
+ ListFreer listFreer;
+ TestCluster::Commands::TestListNestedStructListArgumentRequest::Type request;
+ {
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
+ if (params.arg1.count != 0) {
+ auto * listHolder_0 = new ListHolder(params.arg1.count);
+ if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_0);
+ for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+ if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterNestedStructList class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_0 = (CHIPTestClusterClusterNestedStructList *) params.arg1[i_0];
+ listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
+ listHolder_0->mList[i_0].b = element_0.b.boolValue;
+ listHolder_0->mList[i_0].c.a = element_0.c.a.unsignedCharValue;
+ listHolder_0->mList[i_0].c.b = element_0.c.b.boolValue;
+ listHolder_0->mList[i_0].c.c
+ = static_castmList[i_0].c.c)>>(element_0.c.c.unsignedCharValue);
+ listHolder_0->mList[i_0].c.d = [self asByteSpan:element_0.c.d];
+ listHolder_0->mList[i_0].c.e = [self asCharSpan:element_0.c.e];
+ listHolder_0->mList[i_0].c.f
+ = static_castmList[i_0].c.f)>>(element_0.c.f.unsignedCharValue);
+ listHolder_0->mList[i_0].c.g = element_0.c.g.floatValue;
+ listHolder_0->mList[i_0].c.h = element_0.c.h.doubleValue;
+ {
+ using ListType_2 = std::remove_reference_tmList[i_0].d)>;
+ using ListMemberType_2 = ListMemberTypeGetter::Type;
+ if (element_0.d.count != 0) {
+ auto * listHolder_2 = new ListHolder(element_0.d.count);
+ if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_2);
+ for (size_t i_2 = 0; i_2 < element_0.d.count; ++i_2) {
+ if (![element_0.d[i_2] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_2 = (CHIPTestClusterClusterSimpleStruct *) element_0.d[i_2];
+ listHolder_2->mList[i_2].a = element_2.a.unsignedCharValue;
+ listHolder_2->mList[i_2].b = element_2.b.boolValue;
+ listHolder_2->mList[i_2].c = static_castmList[i_2].c)>>(
+ element_2.c.unsignedCharValue);
+ listHolder_2->mList[i_2].d = [self asByteSpan:element_2.d];
+ listHolder_2->mList[i_2].e = [self asCharSpan:element_2.e];
+ listHolder_2->mList[i_2].f = static_castmList[i_2].f)>>(
+ element_2.f.unsignedCharValue);
+ listHolder_2->mList[i_2].g = element_2.g.floatValue;
+ listHolder_2->mList[i_2].h = element_2.h.doubleValue;
+ }
+ listHolder_0->mList[i_0].d = ListType_2(listHolder_2->mList, element_0.d.count);
+ } else {
+ listHolder_0->mList[i_0].d = ListType_2();
+ }
+ }
+ {
+ using ListType_2 = std::remove_reference_tmList[i_0].e)>;
+ using ListMemberType_2 = ListMemberTypeGetter::Type;
+ if (element_0.e.count != 0) {
+ auto * listHolder_2 = new ListHolder(element_0.e.count);
+ if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_2);
+ for (size_t i_2 = 0; i_2 < element_0.e.count; ++i_2) {
+ if (![element_0.e[i_2] isKindOfClass:[NSNumber class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_2 = (NSNumber *) element_0.e[i_2];
+ listHolder_2->mList[i_2] = element_2.unsignedIntValue;
+ }
+ listHolder_0->mList[i_0].e = ListType_2(listHolder_2->mList, element_0.e.count);
+ } else {
+ listHolder_0->mList[i_0].e = ListType_2();
+ }
+ }
+ {
+ using ListType_2 = std::remove_reference_tmList[i_0].f)>;
+ using ListMemberType_2 = ListMemberTypeGetter::Type;
+ if (element_0.f.count != 0) {
+ auto * listHolder_2 = new ListHolder(element_0.f.count);
+ if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_2);
+ for (size_t i_2 = 0; i_2 < element_0.f.count; ++i_2) {
+ if (![element_0.f[i_2] isKindOfClass:[NSData class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_2 = (NSData *) element_0.f[i_2];
+ listHolder_2->mList[i_2] = [self asByteSpan:element_2];
+ }
+ listHolder_0->mList[i_0].f = ListType_2(listHolder_2->mList, element_0.f.count);
+ } else {
+ listHolder_0->mList[i_0].f = ListType_2();
+ }
+ }
+ {
+ using ListType_2 = std::remove_reference_tmList[i_0].g)>;
+ using ListMemberType_2 = ListMemberTypeGetter::Type;
+ if (element_0.g.count != 0) {
+ auto * listHolder_2 = new ListHolder(element_0.g.count);
+ if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_2);
+ for (size_t i_2 = 0; i_2 < element_0.g.count; ++i_2) {
+ if (![element_0.g[i_2] isKindOfClass:[NSNumber class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_2 = (NSNumber *) element_0.g[i_2];
+ listHolder_2->mList[i_2] = element_2.unsignedCharValue;
+ }
+ listHolder_0->mList[i_0].g = ListType_2(listHolder_2->mList, element_0.g.count);
+ } else {
+ listHolder_0->mList[i_0].g = ListType_2();
+ }
+ }
+ }
+ request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
+ } else {
+ request.arg1 = ListType_0();
+ }
+ }
+
+ new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+ self.callbackQueue,
+ ^(NSError * _Nullable error, id _Nullable value) {
+ completionHandler(value, error);
+ },
+ ^(Cancelable * success, Cancelable * failure) {
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
+}
+
- (void)testListStructArgumentRequestWithParams:(CHIPTestClusterClusterTestListStructArgumentRequestParams *)params
completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
NSError * _Nullable error))completionHandler
@@ -16434,34 +16584,189 @@ - (void)testListStructArgumentRequestWithParams:(CHIPTestClusterClusterTestListS
ListFreer listFreer;
TestCluster::Commands::TestListStructArgumentRequest::Type request;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (params.arg1.count != 0) {
- auto * listHolder_0 = new ListHolder(params.arg1.count);
+ auto * listHolder_0 = new ListHolder(params.arg1.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < params.arg1.count; ++i) {
- if (![params.arg1[i] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+ for (size_t i_0 = 0; i_0 < params.arg1.count; ++i_0) {
+ if (![params.arg1[i_0] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_0 = (CHIPTestClusterClusterSimpleStruct *) params.arg1[i_0];
+ listHolder_0->mList[i_0].a = element_0.a.unsignedCharValue;
+ listHolder_0->mList[i_0].b = element_0.b.boolValue;
+ listHolder_0->mList[i_0].c
+ = static_castmList[i_0].c)>>(element_0.c.unsignedCharValue);
+ listHolder_0->mList[i_0].d = [self asByteSpan:element_0.d];
+ listHolder_0->mList[i_0].e = [self asCharSpan:element_0.e];
+ listHolder_0->mList[i_0].f
+ = static_castmList[i_0].f)>>(element_0.f.unsignedCharValue);
+ listHolder_0->mList[i_0].g = element_0.g.floatValue;
+ listHolder_0->mList[i_0].h = element_0.h.doubleValue;
+ }
+ request.arg1 = ListType_0(listHolder_0->mList, params.arg1.count);
+ } else {
+ request.arg1 = ListType_0();
+ }
+ }
+
+ new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+ self.callbackQueue,
+ ^(NSError * _Nullable error, id _Nullable value) {
+ completionHandler(value, error);
+ },
+ ^(Cancelable * success, Cancelable * failure) {
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
+}
+
+- (void)testNestedStructArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructArgumentRequestParams *)params
+ completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+ NSError * _Nullable error))completionHandler
+{
+ ListFreer listFreer;
+ TestCluster::Commands::TestNestedStructArgumentRequest::Type request;
+ request.arg1.a = params.arg1.a.unsignedCharValue;
+ request.arg1.b = params.arg1.b.boolValue;
+ request.arg1.c.a = params.arg1.c.a.unsignedCharValue;
+ request.arg1.c.b = params.arg1.c.b.boolValue;
+ request.arg1.c.c = static_cast>(params.arg1.c.c.unsignedCharValue);
+ request.arg1.c.d = [self asByteSpan:params.arg1.c.d];
+ request.arg1.c.e = [self asCharSpan:params.arg1.c.e];
+ request.arg1.c.f = static_cast>(params.arg1.c.f.unsignedCharValue);
+ request.arg1.c.g = params.arg1.c.g.floatValue;
+ request.arg1.c.h = params.arg1.c.h.doubleValue;
+
+ new CHIPTestClusterClusterBooleanResponseCallbackBridge(
+ self.callbackQueue,
+ ^(NSError * _Nullable error, id _Nullable value) {
+ completionHandler(value, error);
+ },
+ ^(Cancelable * success, Cancelable * failure) {
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
+}
+
+- (void)testNestedStructListArgumentRequestWithParams:(CHIPTestClusterClusterTestNestedStructListArgumentRequestParams *)params
+ completionHandler:(void (^)(CHIPTestClusterClusterBooleanResponseParams * _Nullable data,
+ NSError * _Nullable error))completionHandler
+{
+ ListFreer listFreer;
+ TestCluster::Commands::TestNestedStructListArgumentRequest::Type request;
+ request.arg1.a = params.arg1.a.unsignedCharValue;
+ request.arg1.b = params.arg1.b.boolValue;
+ request.arg1.c.a = params.arg1.c.a.unsignedCharValue;
+ request.arg1.c.b = params.arg1.c.b.boolValue;
+ request.arg1.c.c = static_cast>(params.arg1.c.c.unsignedCharValue);
+ request.arg1.c.d = [self asByteSpan:params.arg1.c.d];
+ request.arg1.c.e = [self asCharSpan:params.arg1.c.e];
+ request.arg1.c.f = static_cast>(params.arg1.c.f.unsignedCharValue);
+ request.arg1.c.g = params.arg1.c.g.floatValue;
+ request.arg1.c.h = params.arg1.c.h.doubleValue;
+ {
+ using ListType_1 = std::remove_reference_t;
+ using ListMemberType_1 = ListMemberTypeGetter::Type;
+ if (params.arg1.d.count != 0) {
+ auto * listHolder_1 = new ListHolder(params.arg1.d.count);
+ if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_1);
+ for (size_t i_1 = 0; i_1 < params.arg1.d.count; ++i_1) {
+ if (![params.arg1.d[i_1] isKindOfClass:[CHIPTestClusterClusterSimpleStruct class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_1 = (CHIPTestClusterClusterSimpleStruct *) params.arg1.d[i_1];
+ listHolder_1->mList[i_1].a = element_1.a.unsignedCharValue;
+ listHolder_1->mList[i_1].b = element_1.b.boolValue;
+ listHolder_1->mList[i_1].c
+ = static_castmList[i_1].c)>>(element_1.c.unsignedCharValue);
+ listHolder_1->mList[i_1].d = [self asByteSpan:element_1.d];
+ listHolder_1->mList[i_1].e = [self asCharSpan:element_1.e];
+ listHolder_1->mList[i_1].f
+ = static_castmList[i_1].f)>>(element_1.f.unsignedCharValue);
+ listHolder_1->mList[i_1].g = element_1.g.floatValue;
+ listHolder_1->mList[i_1].h = element_1.h.doubleValue;
+ }
+ request.arg1.d = ListType_1(listHolder_1->mList, params.arg1.d.count);
+ } else {
+ request.arg1.d = ListType_1();
+ }
+ }
+ {
+ using ListType_1 = std::remove_reference_t;
+ using ListMemberType_1 = ListMemberTypeGetter::Type;
+ if (params.arg1.e.count != 0) {
+ auto * listHolder_1 = new ListHolder(params.arg1.e.count);
+ if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_1);
+ for (size_t i_1 = 0; i_1 < params.arg1.e.count; ++i_1) {
+ if (![params.arg1.e[i_1] isKindOfClass:[NSNumber class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_1 = (NSNumber *) params.arg1.e[i_1];
+ listHolder_1->mList[i_1] = element_1.unsignedIntValue;
+ }
+ request.arg1.e = ListType_1(listHolder_1->mList, params.arg1.e.count);
+ } else {
+ request.arg1.e = ListType_1();
+ }
+ }
+ {
+ using ListType_1 = std::remove_reference_t;
+ using ListMemberType_1 = ListMemberTypeGetter::Type;
+ if (params.arg1.f.count != 0) {
+ auto * listHolder_1 = new ListHolder(params.arg1.f.count);
+ if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_1);
+ for (size_t i_1 = 0; i_1 < params.arg1.f.count; ++i_1) {
+ if (![params.arg1.f[i_1] isKindOfClass:[NSData class]]) {
+ // Wrong kind of value.
+ return;
+ }
+ auto element_1 = (NSData *) params.arg1.f[i_1];
+ listHolder_1->mList[i_1] = [self asByteSpan:element_1];
+ }
+ request.arg1.f = ListType_1(listHolder_1->mList, params.arg1.f.count);
+ } else {
+ request.arg1.f = ListType_1();
+ }
+ }
+ {
+ using ListType_1 = std::remove_reference_t;
+ using ListMemberType_1 = ListMemberTypeGetter::Type;
+ if (params.arg1.g.count != 0) {
+ auto * listHolder_1 = new ListHolder(params.arg1.g.count);
+ if (listHolder_1 == nullptr || listHolder_1->mList == nullptr) {
+ return;
+ }
+ listFreer.add(listHolder_1);
+ for (size_t i_1 = 0; i_1 < params.arg1.g.count; ++i_1) {
+ if (![params.arg1.g[i_1] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return;
}
- auto element_0 = (CHIPTestClusterClusterSimpleStruct *) params.arg1[i];
- listHolder_0->mList[i].a = element_0.a.unsignedCharValue;
- listHolder_0->mList[i].b = element_0.b.boolValue;
- listHolder_0->mList[i].c
- = static_castmList[i].c)>>(element_0.c.unsignedCharValue);
- listHolder_0->mList[i].d = [self asByteSpan:element_0.d];
- listHolder_0->mList[i].e = [self asCharSpan:element_0.e];
- listHolder_0->mList[i].f
- = static_castmList[i].f)>>(element_0.f.unsignedCharValue);
- listHolder_0->mList[i].g = element_0.g.floatValue;
- listHolder_0->mList[i].h = element_0.h.doubleValue;
+ auto element_1 = (NSNumber *) params.arg1.g[i_1];
+ listHolder_1->mList[i_1] = element_1.unsignedCharValue;
}
- request.arg1 = ListType(listHolder_0->mList, params.arg1.count);
+ request.arg1.g = ListType_1(listHolder_1->mList, params.arg1.g.count);
} else {
- request.arg1 = ListType();
+ request.arg1.g = ListType_1();
}
}
@@ -17498,25 +17803,25 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = TestCluster::Attributes::ListInt8u::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSNumber *) value[i];
- listHolder_0->mList[i] = element_0.unsignedCharValue;
+ auto element_0 = (NSNumber *) value[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedCharValue;
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -17553,25 +17858,25 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = TestCluster::Attributes::ListOctetString::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSData class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSData class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSData *) value[i];
- listHolder_0->mList[i] = [self asByteSpan:element_0];
+ auto element_0 = (NSData *) value[i_0];
+ listHolder_0->mList[i_0] = [self asByteSpan:element_0];
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -17608,26 +17913,26 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = TestCluster::Attributes::ListStructOctetString::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[CHIPTestClusterClusterTestListStructOctet class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[CHIPTestClusterClusterTestListStructOctet class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (CHIPTestClusterClusterTestListStructOctet *) value[i];
- listHolder_0->mList[i].fabricIndex = element_0.fabricIndex.unsignedLongLongValue;
- listHolder_0->mList[i].operationalCert = [self asByteSpan:element_0.operationalCert];
+ auto element_0 = (CHIPTestClusterClusterTestListStructOctet *) value[i_0];
+ listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedLongLongValue;
+ listHolder_0->mList[i_0].operationalCert = [self asByteSpan:element_0.operationalCert];
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -19232,25 +19537,25 @@ - (void)setWeeklyScheduleWithParams:(CHIPThermostatClusterSetWeeklyScheduleParam
request.modeForSequence
= static_cast>(params.modeForSequence.unsignedCharValue);
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (params.payload.count != 0) {
- auto * listHolder_0 = new ListHolder(params.payload.count);
+ auto * listHolder_0 = new ListHolder(params.payload.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < params.payload.count; ++i) {
- if (![params.payload[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < params.payload.count; ++i_0) {
+ if (![params.payload[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return;
}
- auto element_0 = (NSNumber *) params.payload[i];
- listHolder_0->mList[i] = element_0.unsignedCharValue;
+ auto element_0 = (NSNumber *) params.payload[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedCharValue;
}
- request.payload = ListType(listHolder_0->mList, params.payload.count);
+ request.payload = ListType_0(listHolder_0->mList, params.payload.count);
} else {
- request.payload = ListType();
+ request.payload = ListType_0();
}
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
index 3ca97c020c54f4..195c6bc4f5e12c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
@@ -276,25 +276,25 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = ApplicationLauncher::Attributes::ApplicationLauncherList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSNumber *) value[i];
- listHolder_0->mList[i] = element_0.unsignedShortValue;
+ auto element_0 = (NSNumber *) value[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedShortValue;
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -382,29 +382,29 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = AudioOutput::Attributes::AudioOutputList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[CHIPAudioOutputClusterAudioOutputInfo class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[CHIPAudioOutputClusterAudioOutputInfo class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (CHIPAudioOutputClusterAudioOutputInfo *) value[i];
- listHolder_0->mList[i].index = element_0.index.unsignedCharValue;
- listHolder_0->mList[i].outputType
- = static_castmList[i].outputType)>>(
+ auto element_0 = (CHIPAudioOutputClusterAudioOutputInfo *) value[i_0];
+ listHolder_0->mList[i_0].index = element_0.index.unsignedCharValue;
+ listHolder_0->mList[i_0].outputType
+ = static_castmList[i_0].outputType)>>(
element_0.outputType.unsignedCharValue);
- listHolder_0->mList[i].name = [self asCharSpan:element_0.name];
+ listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -1028,33 +1028,34 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[CHIPBridgedActionsClusterActionStruct class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[CHIPBridgedActionsClusterActionStruct class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (CHIPBridgedActionsClusterActionStruct *) value[i];
- listHolder_0->mList[i].actionID = element_0.actionID.unsignedShortValue;
- listHolder_0->mList[i].name = [self asCharSpan:element_0.name];
- listHolder_0->mList[i].type = static_castmList[i].type)>>(
- element_0.type.unsignedCharValue);
- listHolder_0->mList[i].endpointListID = element_0.endpointListID.unsignedShortValue;
- listHolder_0->mList[i].supportedCommands = element_0.supportedCommands.unsignedShortValue;
- listHolder_0->mList[i].status
- = static_castmList[i].status)>>(
+ auto element_0 = (CHIPBridgedActionsClusterActionStruct *) value[i_0];
+ listHolder_0->mList[i_0].actionID = element_0.actionID.unsignedShortValue;
+ listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
+ listHolder_0->mList[i_0].type
+ = static_castmList[i_0].type)>>(
+ element_0.type.unsignedCharValue);
+ listHolder_0->mList[i_0].endpointListID = element_0.endpointListID.unsignedShortValue;
+ listHolder_0->mList[i_0].supportedCommands = element_0.supportedCommands.unsignedShortValue;
+ listHolder_0->mList[i_0].status
+ = static_castmList[i_0].status)>>(
element_0.status.unsignedCharValue);
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -1075,50 +1076,51 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[CHIPBridgedActionsClusterEndpointListStruct class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[CHIPBridgedActionsClusterEndpointListStruct class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (CHIPBridgedActionsClusterEndpointListStruct *) value[i];
- listHolder_0->mList[i].endpointListID = element_0.endpointListID.unsignedShortValue;
- listHolder_0->mList[i].name = [self asCharSpan:element_0.name];
- listHolder_0->mList[i].type = static_castmList[i].type)>>(
- element_0.type.unsignedCharValue);
+ auto element_0 = (CHIPBridgedActionsClusterEndpointListStruct *) value[i_0];
+ listHolder_0->mList[i_0].endpointListID = element_0.endpointListID.unsignedShortValue;
+ listHolder_0->mList[i_0].name = [self asCharSpan:element_0.name];
+ listHolder_0->mList[i_0].type
+ = static_castmList[i_0].type)>>(
+ element_0.type.unsignedCharValue);
{
- using ListType = std::remove_reference_tmList[i].endpoints)>;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_2 = std::remove_reference_tmList[i_0].endpoints)>;
+ using ListMemberType_2 = ListMemberTypeGetter::Type;
if (element_0.endpoints.count != 0) {
- auto * listHolder_2 = new ListHolder(element_0.endpoints.count);
+ auto * listHolder_2 = new ListHolder(element_0.endpoints.count);
if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_2);
- for (size_t i = 0; i < element_0.endpoints.count; ++i) {
- if (![element_0.endpoints[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_2 = 0; i_2 < element_0.endpoints.count; ++i_2) {
+ if (![element_0.endpoints[i_2] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_2 = (NSNumber *) element_0.endpoints[i];
- listHolder_2->mList[i] = element_2.unsignedShortValue;
+ auto element_2 = (NSNumber *) element_0.endpoints[i_2];
+ listHolder_2->mList[i_2] = element_2.unsignedShortValue;
}
- listHolder_0->mList[i].endpoints = ListType(listHolder_2->mList, element_0.endpoints.count);
+ listHolder_0->mList[i_0].endpoints = ListType_2(listHolder_2->mList, element_0.endpoints.count);
} else {
- listHolder_0->mList[i].endpoints = ListType();
+ listHolder_0->mList[i_0].endpoints = ListType_2();
}
}
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -2191,25 +2193,25 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = ContentLauncher::Attributes::AcceptsHeaderList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSData class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSData class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSData *) value[i];
- listHolder_0->mList[i] = [self asByteSpan:element_0];
+ auto element_0 = (NSData *) value[i_0];
+ listHolder_0->mList[i_0] = [self asByteSpan:element_0];
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -2231,26 +2233,26 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = ContentLauncher::Attributes::SupportedStreamingTypes::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSNumber *) value[i];
- listHolder_0->mList[i]
- = static_castmList[i])>>(element_0.unsignedCharValue);
+ auto element_0 = (NSNumber *) value[i_0];
+ listHolder_0->mList[i_0]
+ = static_castmList[i_0])>>(element_0.unsignedCharValue);
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -2302,26 +2304,26 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = Descriptor::Attributes::DeviceList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[CHIPDescriptorClusterDeviceType class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[CHIPDescriptorClusterDeviceType class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (CHIPDescriptorClusterDeviceType *) value[i];
- listHolder_0->mList[i].type = element_0.type.unsignedIntValue;
- listHolder_0->mList[i].revision = element_0.revision.unsignedShortValue;
+ auto element_0 = (CHIPDescriptorClusterDeviceType *) value[i_0];
+ listHolder_0->mList[i_0].type = element_0.type.unsignedIntValue;
+ listHolder_0->mList[i_0].revision = element_0.revision.unsignedShortValue;
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -2342,25 +2344,25 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = Descriptor::Attributes::ServerList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSNumber *) value[i];
- listHolder_0->mList[i] = element_0.unsignedIntValue;
+ auto element_0 = (NSNumber *) value[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedIntValue;
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -2381,25 +2383,25 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = Descriptor::Attributes::ClientList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSNumber *) value[i];
- listHolder_0->mList[i] = element_0.unsignedIntValue;
+ auto element_0 = (NSNumber *) value[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedIntValue;
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -2420,25 +2422,25 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = Descriptor::Attributes::PartsList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[NSNumber class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[NSNumber class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (NSNumber *) value[i];
- listHolder_0->mList[i] = element_0.unsignedShortValue;
+ auto element_0 = (NSNumber *) value[i_0];
+ listHolder_0->mList[i_0] = element_0.unsignedShortValue;
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback::FromCancelable(success);
@@ -3028,26 +3030,26 @@ new CHIPDefaultSuccessCallbackBridge(
using TypeInfo = FixedLabel::Attributes::LabelList::TypeInfo;
TypeInfo::Type cppValue;
{
- using ListType = std::remove_reference_t;
- using ListMemberType = ListMemberTypeGetter::Type;
+ using ListType_0 = std::remove_reference_t;
+ using ListMemberType_0 = ListMemberTypeGetter::Type;
if (value.count != 0) {
- auto * listHolder_0 = new ListHolder(value.count);
+ auto * listHolder_0 = new ListHolder(value.count);
if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
return CHIP_ERROR_INVALID_ARGUMENT;
}
listFreer.add(listHolder_0);
- for (size_t i = 0; i < value.count; ++i) {
- if (![value[i] isKindOfClass:[CHIPFixedLabelClusterLabelStruct class]]) {
+ for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+ if (![value[i_0] isKindOfClass:[CHIPFixedLabelClusterLabelStruct class]]) {
// Wrong kind of value.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- auto element_0 = (CHIPFixedLabelClusterLabelStruct *) value[i];
- listHolder_0->mList[i].label = [self asCharSpan:element_0.label];
- listHolder_0->mList[i].value = [self asCharSpan:element_0.value];
+ auto element_0 = (CHIPFixedLabelClusterLabelStruct *) value[i_0];
+ listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label];
+ listHolder_0->mList[i_0].value = [self asCharSpan:element_0.value];
}
- cppValue = ListType(listHolder_0->mList, value.count);
+ cppValue = ListType_0(listHolder_0->mList, value.count);
} else {
- cppValue = ListType();
+ cppValue = ListType_0();
}
}
auto successFn = Callback