Fix chip-tool support for nullable bitmaps. (project-chip#14473)

We're doing casting in the template, but we can just use our existing
AddArgument overloads instead.

examples/chip-tool/commands/common/Command.h

@@ -176,6 +176,14 @@ class Command
         return AddArgument(name, min, max, reinterpret_cast<std::underlying_type_t<T> *>(out), flags);
     }
 
+    template <typename T>
+    size_t AddArgument(const char * name, int64_t min, uint64_t max, chip::BitFlags<T> * out, uint8_t flags = 0)
+    {
+        // This is a terrible hack that relies on BitFlags only having the one
+        // mValue member.
+        return AddArgument(name, min, max, reinterpret_cast<T *>(out), flags);
+    }
+
     template <typename T>
     size_t AddArgument(const char * name, chip::Optional<T> * value)
     {

examples/chip-tool/templates/commands.zapt

@@ -33,15 +33,7 @@ public:
         {{else if (isString type)}}
         AddArgument("{{asUpperCamelCase label}}", &{{>field}});
         {{else}}
-        AddArgument("{{asUpperCamelCase label}}", {{asTypeMinValue type}}, {{asTypeMaxValue type}},
-          {{~#if isNullable}}&{{>field}}
-          {{else}}
-            {{~#if ./isEnum}}reinterpret_cast<std::underlying_type_t<decltype({{>field}})> *>(&{{>field}})
-            {{else ./isBitmap}}reinterpret_cast<std::underlying_type_t<chip::app::Clusters::{{asUpperCamelCase parent.clusterName}}::{{asUpperCamelCase type}}> *>(&{{>field}})
-            {{else}}&{{>field}}
-            {{/if~}}
-          {{/if~}}
-        );
+        AddArgument("{{asUpperCamelCase label}}", {{asTypeMinValue type}}, {{asTypeMaxValue type}}, &{{>field}});
         {{/if}}
         {{/chip_cluster_command_arguments}}
         ClusterCommand::AddArguments();