[Demangle] Add support for D Array and associative array literals

[ljmf00]

Summary

Signed-off-by: Luís Ferreira <[e-mail]>

llvm/lib/Demangle/DLangDemangle.cpp

private:
   /// \param Type mangled type character in which the type should be
   ///             represented as
   ///
   /// \return the remaining string on success or nullptr on failure
   ///
   /// \see https://dlang.org/spec/abi.html#Value
   const char *parseInteger(OutputString *Decl, const char *Mangled, char Type);
 
+  /// Extract and demangle an array literal value from a given mangled symbol
+  /// append it to the output string
+  ///
+  /// \param Decl output buffer to write the demangled name
+  /// \param Mangled mangled symbol to be demangled
+  ///
+  /// \return the remaining string on success or nullptr on failure
+  ///
+  /// \see https://dlang.org/spec/abi.html#Value
+  const char *parseArrayLiteral(OutputString *Decl, const char *Mangled);
+
+  /// Extract and demangle an associative array value from a given mangled
+  /// symbol append it to the output string
+  ///
+  /// \param Decl output buffer to write the demangled name
+  /// \param Mangled mangled symbol to be demangled
+  ///
+  /// \return the remaining string on success or nullptr on failure
+  ///
+  /// \see https://dlang.org/spec/abi.html#Value
+  const char *parseAssocArray(OutputString *Decl, const char *Mangled);
+
   /// Extract and demangle a string value from a given mangled symbol append it
   /// to the output string
   ///
   /// \param Decl output buffer to write the demangled name
   /// \param Mangled mangled symbol to be demangled
   ///
   /// \return the remaining string on success or nullptr on failure
   ///
const char *Demangler::parseValue(OutputString *Decl, const char *Mangled,
 
   // String values
   case 'a': /* UTF8 */
   case 'w': /* UTF16 */
   case 'd': /* UTF32 */
     Mangled = parseString(Decl, Mangled);
     break;
 
+  // Array values
+  case 'A':
+    Mangled++;
+    if (Type == 'H')
+      Mangled = parseAssocArray(Decl, Mangled);
+    else
+      Mangled = parseArrayLiteral(Decl, Mangled);
+    break;
+
   default:
     return nullptr;
   }
 
   return Mangled;
 }
 
 const char *Demangler::parseString(OutputString *Decl, const char *Mangled) {
const char *Demangler::parseReal(OutputString *Decl, const char *Mangled) {
   while (std::isdigit(*Mangled)) {
     Decl->append(Mangled, 1);
     Mangled++;
   }
 
   return Mangled;
 }
 
+const char *Demangler::parseArrayLiteral(OutputString *Decl,
+                                         const char *Mangled) {
+  unsigned long Elements;
+
+  Mangled = decodeNumber(Mangled, &Elements);
+  if (Mangled == nullptr)
+    return nullptr;
+
+  Decl->append('[');
+  while (Elements--) {
+    Mangled = parseValue(Decl, Mangled, '\0');
+    if (Mangled == nullptr)
+      return nullptr;
+
+    if (Elements != 0)
+      Decl->append(", ");
+  }
+
+  Decl->append(']');
+  return Mangled;
+}
+
+const char *Demangler::parseAssocArray(OutputString *Decl,
+                                       const char *Mangled) {
+  unsigned long Elements;
+
+  Mangled = decodeNumber(Mangled, &Elements);
+  if (Mangled == nullptr)
+    return nullptr;
+
+  Decl->append('[');
+  while (Elements--) {
+    Mangled = parseValue(Decl, Mangled, '\0');
+    if (Mangled == nullptr)
+      return nullptr;
+
+    Decl->append(':');
+    Mangled = parseValue(Decl, Mangled, '\0');
+    if (Mangled == nullptr)
+      return nullptr;
+
+    if (Elements != 0)
+      Decl->append(", ");
+  }
+
+  Decl->append(']');
+  return Mangled;
+}
+
 Demangler::Demangler(const char *Mangled)
     : Str(Mangled), LastBackref(strlen(Mangled)) {}
 
 const char *Demangler::parseMangle(OutputString *Decl) {
   return parseMangle(Decl, this->Str);
 }
 
 char *llvm::dlangDemangle(const char *MangledName) {

llvm/unittests/Demangle/DLangDemangleTest.cpp

ExpectedVal ExpectedArray[] = {
        "demangle.test!(0x0."
        "00111222333444555666777888999AAABBBCCCDDDEEEFFFp00011122233344455566677"
        "7888999)"},
       {"_D8demangle22__T4testVG3ua3_616263Zv", "demangle.test!(\"abc\")"},
       {"_D8demangle22__T4testVG3ud3_616263Zv", "demangle.test!(\"abc\"d)"},
       {"_D8demangle22__T4testVG3uw3_616263Zv", "demangle.test!(\"abc\"w)"},
       {"_D8demangle16__T4testVAyaa0_Zv", "demangle.test!(\"\")"},
       {"_D8demangle32__T4testVAyaa8_20090a0d0c0b00ffZv",
-       "demangle.test!(\" \\t\\n\\r\\f\\v\\x00\\xff\")"}
+       "demangle.test!(\" \\t\\n\\r\\f\\v\\x00\\xff\")"},
+      {"_D8demangle22__T4testVAiA4i1i2i3i4Zv", "demangle.test!([1, 2, 3, 4])"},
+      {"_D8demangle25__T4testVAdA2e08P1eN08P1Zv",
+       "demangle.test!([0x0.8p1, -0x0.8p1])"},
+      {"_D8demangle23__T4testVHiiA2i1i2i3i4Zv", "demangle.test!([1:2, 3:4])"},
+      {"_D8demangle39__T4testVHAxaiA2a3_616263i1a3_646566i2Zv",
+       "demangle.test!([\"abc\":1, \"def\":2])"}
   };
 
   for (ExpectedVal Val : ExpectedArray) {
     char *Demangled = llvm::dlangDemangle(Val.Mangled);
     EXPECT_STREQ(Demangled, Val.Expected);
     std::free(Demangled);
   }
 }