Formatting...

zeroc-ice · Dec 16, 2024 · bbe9493 · bbe9493
1 parent 3ed45ad
commit bbe9493
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
@@ -1869,18 +1869,18 @@ Slice::CsGenerator::validateMetadata(const UnitPtr& u)
 
     // "cs:attribute"
     MetadataInfo attributeInfo = {
-        .validOn = {
-            typeid(Unit),
-            typeid(Module),
-            typeid(InterfaceDecl),
-            typeid(ClassDecl),
-            typeid(Operation),
-            typeid(Slice::Exception),
-            typeid(Struct),
-            typeid(Enum),
-            typeid(Const),
-            typeid(Parameter),
-            typeid(DataMember)},
+        .validOn =
+            {typeid(Unit),
+             typeid(Module),
+             typeid(InterfaceDecl),
+             typeid(ClassDecl),
+             typeid(Operation),
+             typeid(Slice::Exception),
+             typeid(Struct),
+             typeid(Enum),
+             typeid(Const),
+             typeid(Parameter),
+             typeid(DataMember)},
         .acceptedArgumentKind = MetadataArgumentKind::RequiredTextArgument,
         .mustBeUnique = false,
     };
@@ -1905,15 +1905,15 @@ Slice::CsGenerator::validateMetadata(const UnitPtr& u)
                 if (argument == "LinkedList" || argument == "Queue" || argument == "Stack")
                 {
                     return "'cs:generic:" + argument +
-                        "' is not supported on sequences of objects; only 'List' is supported for object sequences";
+                           "' is not supported on sequences of objects; only 'List' is supported for object sequences";
                 }
             }
             else if (dynamic_pointer_cast<Dictionary>(p))
             {
                 if (argument != "SortedDictionary" && argument != "SortedList")
                 {
                     return "the 'cs:generic' metadata only supports 'SortedDictionary' and 'SortedList' as arguments "
-                        "when applied to a dictionary";
+                           "when applied to a dictionary";
                 }
             }
             return nullopt;

diff --git a/cpp/src/slice2java/JavaUtil.cpp b/cpp/src/slice2java/JavaUtil.cpp
@@ -172,6 +172,16 @@ Slice::isValidMethodParameterList(const DataMemberList& members, int additionalU
     return length <= 255;
 }
 
+bool
+Slice::mapsToJavaBuiltinType(const TypePtr& p)
+{
+    if (auto builtin = dynamic_pointer_cast<Builtin>(p))
+    {
+        return builtin->kind() < Builtin::KindObject;
+    }
+    return false;
+}
+
 Slice::JavaOutput::JavaOutput() {}
 
 Slice::JavaOutput::JavaOutput(ostream& os) : Output(os) {}
@@ -1991,12 +2001,13 @@ Slice::JavaGenerator::validateMetadata(const UnitPtr& u)
             const string& value = meta->arguments();
             try
             {
-                std::stoll(value, nullptr, 0);
+                [[maybe_unused]] auto _ = std::stoll(value, nullptr, 0);
             }
             catch (const std::exception&)
             {
                 return "serialVersionUID '" + value + "' is not a valid integer literal; using default value instead";
             }
+            return nullopt;
         },
     };
     knownMetadata.emplace("java:serialVersionUID", std::move(serialVersionUIDInfo));
@@ -2013,7 +2024,7 @@ Slice::JavaGenerator::validateMetadata(const UnitPtr& u)
                 if (seq->hasMetadata("java:serializable"))
                 {
                     return "the 'java:type' metadata cannot be used alongside 'java:serializable' - both change the "
-                        "mapped type of this sequence";
+                           "mapped type of this sequence";
                 }
             }
             // This metadata conflicts with 'java:buffer', but we let the validation functions for that metadata

diff --git a/cpp/src/slice2java/JavaUtil.h b/cpp/src/slice2java/JavaUtil.h
@@ -27,14 +27,7 @@ namespace Slice
     bool isValidMethodParameterList(const DataMemberList&, int additionalUnits = 0);
 
     /// Returns true if and only if 'p' maps to one of the builtin Java types (ie. a primitive type or a string).
-    bool mapsToJavaBuiltinType(const TypePtr& p)
-    {
-        if (auto builtin = dynamic_pointer_cast<Builtin>(p))
-        {
-            return builtin->kind() < Builtin::KindObject;
-        }
-        return false;
-    }
+    bool mapsToJavaBuiltinType(const TypePtr& p);
 
     class JavaOutput final : public ::IceInternal::Output
     {