ConstantValue: Make assignment patterns for containers optional

MikePopoloski · Nov 4, 2022 · 04caea4 · 04caea4
1 parent 743873f
commit 04caea4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/include/slang/numeric/ConstantValue.h b/include/slang/numeric/ConstantValue.h
@@ -147,8 +147,8 @@ class SLANG_EXPORT ConstantValue {
     Variant& getVariant() { return value; }
     const Variant& getVariant() const { return value; }
 
-    std::string toString(bitwidth_t abbreviateThresholdBits =
-            SVInt::DefaultStringAbbreviationThresholdBits, bool exactUnknowns = false) const;
+    std::string toString(bitwidth_t abbreviateThresholdBits = SVInt::DefaultStringAbbreviationThresholdBits,
+                         bool exactUnknowns = false, bool useAssignmentPatterns = false) const;
     size_t hash() const;
 
     [[nodiscard]] bool empty() const;

diff --git a/source/numeric/ConstantValue.cpp b/source/numeric/ConstantValue.cpp
@@ -19,9 +19,10 @@ struct always_false : std::false_type {};
 
 const ConstantValue ConstantValue::Invalid;
 
-std::string ConstantValue::toString(bitwidth_t abbreviateThresholdBits, bool exactUnknowns) const {
+std::string ConstantValue::toString(bitwidth_t abbreviateThresholdBits, bool exactUnknowns,
+                                    bool useAssignmentPatterns) const {
     return std::visit(
-        [abbreviateThresholdBits, exactUnknowns](auto&& arg) {
+        [abbreviateThresholdBits, exactUnknowns, useAssignmentPatterns](auto&& arg) {
             using T = std::decay_t<decltype(arg)>;
             if constexpr (std::is_same_v<T, std::monostate>)
                 return "<unset>"s;
@@ -37,22 +38,22 @@ std::string ConstantValue::toString(bitwidth_t abbreviateThresholdBits, bool exa
                 return "$"s;
             else if constexpr (std::is_same_v<T, Elements>) {
                 FormatBuffer buffer;
-                buffer.append("'{");
+                buffer.append(useAssignmentPatterns ? "'{"sv : "["sv);
                 for (auto& element : arg) {
                     buffer.append(element.toString(abbreviateThresholdBits));
                     buffer.append(",");
                 }
 
                 if (!arg.empty())
                     buffer.pop_back();
-                buffer.append("}");
+                buffer.append(useAssignmentPatterns ? "}"sv : "]"sv;);
                 return buffer.str();
             }
             else if constexpr (std::is_same_v<T, std::string>)
                 return fmt::format("\"{}\"", arg);
             else if constexpr (std::is_same_v<T, Map>) {
                 FormatBuffer buffer;
-                buffer.append("'{");
+                buffer.append(useAssignmentPatterns ? "'{"sv : "["sv);
                 for (auto& [key, val] : *arg)
                     buffer.format("{}:{},", key.toString(abbreviateThresholdBits),
                                   val.toString(abbreviateThresholdBits));
@@ -63,20 +64,20 @@ std::string ConstantValue::toString(bitwidth_t abbreviateThresholdBits, bool exa
                 else if (!arg->empty())
                     buffer.pop_back();
 
-                buffer.append("}");
+                buffer.append(useAssignmentPatterns ? "}"sv : "]"sv;);
                 return buffer.str();
             }
             else if constexpr (std::is_same_v<T, Queue>) {
                 FormatBuffer buffer;
-                buffer.append("'{");
+                buffer.append(useAssignmentPatterns ? "'{"sv : "["sv);
                 for (auto& element : *arg) {
                     buffer.append(element.toString(abbreviateThresholdBits));
                     buffer.append(",");
                 }
 
                 if (!arg->empty())
                     buffer.pop_back();
-                buffer.append("}");
+                buffer.append(useAssignmentPatterns ? "}"sv : "]"sv;);
                 return buffer.str();
             }
             else if constexpr (std::is_same_v<T, Union>) {