Review comments and formatting.

zeroc-ice · Oct 31, 2024 · e03ffb1 · e03ffb1
1 parent 65bc834
commit e03ffb1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
@@ -218,7 +218,14 @@ namespace Slice
             void visitConst(const ConstPtr&) final;
 
         private:
-            MetadataList validate(const SyntaxTreeBasePtr&, MetadataList, const std::string&, bool = false);
+            /// Validates any 'cpp' specific metadata that's been applied to `cont`.
+            /// Additional metadata to validate can also be passed in with the `metadata` field.
+            /// For example, type metadata applied to a sequence where it's being used instead of just defined.
+            MetadataList validate(
+                const SyntaxTreeBasePtr& cont,
+                MetadataList metadata,
+                const std::string& file,
+                bool operation);
         };
 
         static void validateMetadata(const UnitPtr&);

diff --git a/cpp/src/slice2java/JavaUtil.cpp b/cpp/src/slice2java/JavaUtil.cpp
@@ -365,8 +365,7 @@ namespace
             return result;
         }
 
-        MetadataList
-        validateType(const SyntaxTreeBasePtr& p, const MetadataList& metadata, const string& file)
+        MetadataList validateType(const SyntaxTreeBasePtr& p, const MetadataList& metadata, const string& file)
         {
             const UnitPtr unt = p->unit();
             const DefinitionContextPtr dc = unt->findDefinitionContext(file);

diff --git a/cpp/src/slice2py/PythonUtil.cpp b/cpp/src/slice2py/PythonUtil.cpp
@@ -3056,7 +3056,8 @@ Slice::Python::MetadataVisitor::visitConst(const ConstPtr& p)
 }
 
 MetadataList
-Slice::Python::MetadataVisitor::validateSequence(const ContainedPtr& cont, const TypePtr& type) {
+Slice::Python::MetadataVisitor::validateSequence(const ContainedPtr& cont, const TypePtr& type)
+{
     const UnitPtr ut = type->unit();
     const DefinitionContextPtr dc = ut->findDefinitionContext(cont->file());
     assert(dc);

diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
@@ -2474,7 +2474,8 @@ SwiftGenerator::MetadataVisitor::visitConst(const ConstPtr& p)
 }
 
 MetadataList
-SwiftGenerator::MetadataVisitor::validate(const SyntaxTreeBasePtr& p, const ContainedPtr& cont) {
+SwiftGenerator::MetadataVisitor::validate(const SyntaxTreeBasePtr& p, const ContainedPtr& cont)
+{
     MetadataList newMetadata = cont->getMetadata();
     const UnitPtr ut = p->unit();
     const DefinitionContextPtr dc = ut->findDefinitionContext(cont->file());