diff options
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
| -rw-r--r-- | tools/aapt2/java/JavaClassGenerator.cpp | 933 | 
1 files changed, 486 insertions, 447 deletions
| diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index 84df0b429fc5..6e7c707847b9 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -14,60 +14,57 @@   * limitations under the License.   */ +#include "java/JavaClassGenerator.h" + +#include <algorithm> +#include <ostream> +#include <set> +#include <sstream> +#include <tuple> + +#include "android-base/logging.h" +  #include "NameMangler.h"  #include "Resource.h"  #include "ResourceTable.h"  #include "ResourceValues.h"  #include "ValueVisitor.h" -  #include "java/AnnotationProcessor.h"  #include "java/ClassDefinition.h" -#include "java/JavaClassGenerator.h"  #include "process/SymbolTable.h"  #include "util/StringPiece.h" -#include <algorithm> -#include <ostream> -#include <set> -#include <sstream> -#include <tuple> -  namespace aapt { -JavaClassGenerator::JavaClassGenerator(IAaptContext* context, ResourceTable* table, -                                       const JavaClassGeneratorOptions& options) : -        mContext(context), mTable(table), mOptions(options) { -} - -static const std::set<StringPiece16> sJavaIdentifiers = { -    u"abstract", u"assert", u"boolean", u"break", u"byte", -    u"case", u"catch", u"char", u"class", u"const", u"continue", -    u"default", u"do", u"double", u"else", u"enum", u"extends", -    u"final", u"finally", u"float", u"for", u"goto", u"if", -    u"implements", u"import", u"instanceof", u"int", u"interface", -    u"long", u"native", u"new", u"package", u"private", u"protected", -    u"public", u"return", u"short", u"static", u"strictfp", u"super", -    u"switch", u"synchronized", u"this", u"throw", u"throws", -    u"transient", u"try", u"void", u"volatile", u"while", u"true", -    u"false", u"null" -}; - -static bool isValidSymbol(const StringPiece16& symbol) { -    return sJavaIdentifiers.find(symbol) == sJavaIdentifiers.end(); +static const std::set<StringPiece> sJavaIdentifiers = { +    "abstract",   "assert",       "boolean",   "break",      "byte", +    "case",       "catch",        "char",      "class",      "const", +    "continue",   "default",      "do",        "double",     "else", +    "enum",       "extends",      "final",     "finally",    "float", +    "for",        "goto",         "if",        "implements", "import", +    "instanceof", "int",          "interface", "long",       "native", +    "new",        "package",      "private",   "protected",  "public", +    "return",     "short",        "static",    "strictfp",   "super", +    "switch",     "synchronized", "this",      "throw",      "throws", +    "transient",  "try",          "void",      "volatile",   "while", +    "true",       "false",        "null"}; + +static bool IsValidSymbol(const StringPiece& symbol) { +  return sJavaIdentifiers.find(symbol) == sJavaIdentifiers.end();  }  /*   * Java symbols can not contain . or -, but those are valid in a resource name.   * Replace those with '_'.   */ -static std::string transform(const StringPiece16& symbol) { -    std::string output = util::utf16ToUtf8(symbol); -    for (char& c : output) { -        if (c == '.' || c == '-') { -            c = '_'; -        } +static std::string Transform(const StringPiece& symbol) { +  std::string output = symbol.ToString(); +  for (char& c : output) { +    if (c == '.' || c == '-') { +      c = '_';      } -    return output; +  } +  return output;  }  /** @@ -81,477 +78,519 @@ static std::string transform(const StringPiece16& symbol) {   * Foo_android_bar   * Foo_bar   */ -static std::string transformNestedAttr(const ResourceNameRef& attrName, -                                       const std::string& styleableClassName, -                                       const StringPiece16& packageNameToGenerate) { -    std::string output = styleableClassName; - -    // We may reference IDs from other packages, so prefix the entry name with -    // the package. -    if (!attrName.package.empty() && packageNameToGenerate != attrName.package) { -        output += "_" + transform(attrName.package); -    } -    output += "_" + transform(attrName.entry); -    return output; +static std::string TransformNestedAttr( +    const ResourceNameRef& attr_name, const std::string& styleable_class_name, +    const StringPiece& package_name_to_generate) { +  std::string output = styleable_class_name; + +  // We may reference IDs from other packages, so prefix the entry name with +  // the package. +  if (!attr_name.package.empty() && +      package_name_to_generate != attr_name.package) { +    output += "_" + Transform(attr_name.package); +  } +  output += "_" + Transform(attr_name.entry); +  return output;  } -static void addAttributeFormatDoc(AnnotationProcessor* processor, Attribute* attr) { -    const uint32_t typeMask = attr->typeMask; -    if (typeMask & android::ResTable_map::TYPE_REFERENCE) { -        processor->appendComment( -                "<p>May be a reference to another resource, in the form\n" -                "\"<code>@[+][<i>package</i>:]<i>type</i>/<i>name</i></code>\" or a theme\n" -                "attribute in the form\n" -                "\"<code>?[<i>package</i>:]<i>type</i>/<i>name</i></code>\"."); +static void AddAttributeFormatDoc(AnnotationProcessor* processor, +                                  Attribute* attr) { +  const uint32_t type_mask = attr->type_mask; +  if (type_mask & android::ResTable_map::TYPE_REFERENCE) { +    processor->AppendComment( +        "<p>May be a reference to another resource, in the form\n" +        "\"<code>@[+][<i>package</i>:]<i>type</i>/<i>name</i></code>\" or a " +        "theme\n" +        "attribute in the form\n" +        "\"<code>?[<i>package</i>:]<i>type</i>/<i>name</i></code>\"."); +  } + +  if (type_mask & android::ResTable_map::TYPE_STRING) { +    processor->AppendComment( +        "<p>May be a string value, using '\\\\;' to escape characters such as\n" +        "'\\\\n' or '\\\\uxxxx' for a unicode character;"); +  } + +  if (type_mask & android::ResTable_map::TYPE_INTEGER) { +    processor->AppendComment( +        "<p>May be an integer value, such as \"<code>100</code>\"."); +  } + +  if (type_mask & android::ResTable_map::TYPE_BOOLEAN) { +    processor->AppendComment( +        "<p>May be a boolean value, such as \"<code>true</code>\" or\n" +        "\"<code>false</code>\"."); +  } + +  if (type_mask & android::ResTable_map::TYPE_COLOR) { +    processor->AppendComment( +        "<p>May be a color value, in the form of " +        "\"<code>#<i>rgb</i></code>\",\n" +        "\"<code>#<i>argb</i></code>\", \"<code>#<i>rrggbb</i></code\", or \n" +        "\"<code>#<i>aarrggbb</i></code>\"."); +  } + +  if (type_mask & android::ResTable_map::TYPE_FLOAT) { +    processor->AppendComment( +        "<p>May be a floating point value, such as \"<code>1.2</code>\"."); +  } + +  if (type_mask & android::ResTable_map::TYPE_DIMENSION) { +    processor->AppendComment( +        "<p>May be a dimension value, which is a floating point number " +        "appended with a\n" +        "unit such as \"<code>14.5sp</code>\".\n" +        "Available units are: px (pixels), dp (density-independent pixels),\n" +        "sp (scaled pixels based on preferred font size), in (inches), and\n" +        "mm (millimeters)."); +  } + +  if (type_mask & android::ResTable_map::TYPE_FRACTION) { +    processor->AppendComment( +        "<p>May be a fractional value, which is a floating point number " +        "appended with\n" +        "either % or %p, such as \"<code>14.5%</code>\".\n" +        "The % suffix always means a percentage of the base size;\n" +        "the optional %p suffix provides a size relative to some parent " +        "container."); +  } + +  if (type_mask & +      (android::ResTable_map::TYPE_FLAGS | android::ResTable_map::TYPE_ENUM)) { +    if (type_mask & android::ResTable_map::TYPE_FLAGS) { +      processor->AppendComment( +          "<p>Must be one or more (separated by '|') of the following " +          "constant values.</p>"); +    } else { +      processor->AppendComment( +          "<p>Must be one of the following constant values.</p>");      } -    if (typeMask & android::ResTable_map::TYPE_STRING) { -        processor->appendComment( -                "<p>May be a string value, using '\\\\;' to escape characters such as\n" -                "'\\\\n' or '\\\\uxxxx' for a unicode character;"); +    processor->AppendComment( +        "<table>\n<colgroup align=\"left\" />\n" +        "<colgroup align=\"left\" />\n" +        "<colgroup align=\"left\" />\n" +        "<tr><th>Constant</th><th>Value</th><th>Description</th></tr>\n"); +    for (const Attribute::Symbol& symbol : attr->symbols) { +      std::stringstream line; +      line << "<tr><td>" << symbol.symbol.name.value().entry << "</td>" +           << "<td>" << std::hex << symbol.value << std::dec << "</td>" +           << "<td>" << util::TrimWhitespace(symbol.symbol.GetComment()) +           << "</td></tr>"; +      processor->AppendComment(line.str());      } +    processor->AppendComment("</table>"); +  } +} -    if (typeMask & android::ResTable_map::TYPE_INTEGER) { -        processor->appendComment("<p>May be an integer value, such as \"<code>100</code>\"."); -    } +JavaClassGenerator::JavaClassGenerator(IAaptContext* context, +                                       ResourceTable* table, +                                       const JavaClassGeneratorOptions& options) +    : context_(context), table_(table), options_(options) {} -    if (typeMask & android::ResTable_map::TYPE_BOOLEAN) { -        processor->appendComment( -                "<p>May be a boolean value, such as \"<code>true</code>\" or\n" -                "\"<code>false</code>\"."); -    } +bool JavaClassGenerator::SkipSymbol(SymbolState state) { +  switch (options_.types) { +    case JavaClassGeneratorOptions::SymbolTypes::kAll: +      return false; +    case JavaClassGeneratorOptions::SymbolTypes::kPublicPrivate: +      return state == SymbolState::kUndefined; +    case JavaClassGeneratorOptions::SymbolTypes::kPublic: +      return state != SymbolState::kPublic; +  } +  return true; +} -    if (typeMask & android::ResTable_map::TYPE_COLOR) { -        processor->appendComment( -                "<p>May be a color value, in the form of \"<code>#<i>rgb</i></code>\",\n" -                "\"<code>#<i>argb</i></code>\", \"<code>#<i>rrggbb</i></code\", or \n" -                "\"<code>#<i>aarrggbb</i></code>\"."); -    } +struct StyleableAttr { +  const Reference* attr_ref; +  std::string field_name; +  std::unique_ptr<SymbolTable::Symbol> symbol; +}; -    if (typeMask & android::ResTable_map::TYPE_FLOAT) { -        processor->appendComment( -                "<p>May be a floating point value, such as \"<code>1.2</code>\"."); -    } +static bool less_styleable_attr(const StyleableAttr& lhs, +                                const StyleableAttr& rhs) { +  const ResourceId lhs_id = +      lhs.attr_ref->id ? lhs.attr_ref->id.value() : ResourceId(0); +  const ResourceId rhs_id = +      rhs.attr_ref->id ? rhs.attr_ref->id.value() : ResourceId(0); +  if (lhs_id < rhs_id) { +    return true; +  } else if (lhs_id > rhs_id) { +    return false; +  } else { +    return lhs.attr_ref->name.value() < rhs.attr_ref->name.value(); +  } +} -    if (typeMask & android::ResTable_map::TYPE_DIMENSION) { -        processor->appendComment( -                "<p>May be a dimension value, which is a floating point number appended with a\n" -                "unit such as \"<code>14.5sp</code>\".\n" -                "Available units are: px (pixels), dp (density-independent pixels),\n" -                "sp (scaled pixels based on preferred font size), in (inches), and\n" -                "mm (millimeters)."); +void JavaClassGenerator::AddMembersToStyleableClass( +    const StringPiece& package_name_to_generate, const std::string& entry_name, +    const Styleable* styleable, ClassDefinition* out_styleable_class_def) { +  const std::string class_name = Transform(entry_name); + +  std::unique_ptr<ResourceArrayMember> styleable_array_def = +      util::make_unique<ResourceArrayMember>(class_name); + +  // This must be sorted by resource ID. +  std::vector<StyleableAttr> sorted_attributes; +  sorted_attributes.reserve(styleable->entries.size()); +  for (const auto& attr : styleable->entries) { +    // If we are not encoding final attributes, the styleable entry may have no +    // ID if we are building a static library. +    CHECK(!options_.use_final || attr.id) << "no ID set for Styleable entry"; +    CHECK(bool(attr.name)) << "no name set for Styleable entry"; + +    // We will need the unmangled, transformed name in the comments and the +    // field, +    // so create it once and cache it in this StyleableAttr data structure. +    StyleableAttr styleable_attr = {}; +    styleable_attr.attr_ref = &attr; +    styleable_attr.field_name = TransformNestedAttr( +        attr.name.value(), class_name, package_name_to_generate); + +    Reference mangled_reference; +    mangled_reference.id = attr.id; +    mangled_reference.name = attr.name; +    if (mangled_reference.name.value().package.empty()) { +      mangled_reference.name.value().package = +          context_->GetCompilationPackage();      } -    if (typeMask & android::ResTable_map::TYPE_FRACTION) { -        processor->appendComment( -                "<p>May be a fractional value, which is a floating point number appended with\n" -                "either % or %p, such as \"<code>14.5%</code>\".\n" -                "The % suffix always means a percentage of the base size;\n" -                "the optional %p suffix provides a size relative to some parent container."); +    if (Maybe<ResourceName> mangled_name = +            context_->GetNameMangler()->MangleName( +                mangled_reference.name.value())) { +      mangled_reference.name = mangled_name;      } -    if (typeMask & (android::ResTable_map::TYPE_FLAGS | android::ResTable_map::TYPE_ENUM)) { -        if (typeMask & android::ResTable_map::TYPE_FLAGS) { -            processor->appendComment( -                    "<p>Must be one or more (separated by '|') of the following " -                    "constant values.</p>"); -        } else { -            processor->appendComment("<p>Must be one of the following constant values.</p>"); -        } - -        processor->appendComment("<table>\n<colgroup align=\"left\" />\n" -                                 "<colgroup align=\"left\" />\n" -                                 "<colgroup align=\"left\" />\n" -                                 "<tr><th>Constant</th><th>Value</th><th>Description</th></tr>\n"); -        for (const Attribute::Symbol& symbol : attr->symbols) { -            std::stringstream line; -            line << "<tr><td>" << symbol.symbol.name.value().entry << "</td>" -            << "<td>" << std::hex << symbol.value << std::dec << "</td>" -            << "<td>" << util::trimWhitespace(symbol.symbol.getComment()) << "</td></tr>"; -            processor->appendComment(line.str()); -        } -        processor->appendComment("</table>"); +    // Look up the symbol so that we can write out in the comments what are +    // possible +    // legal values for this attribute. +    const SymbolTable::Symbol* symbol = +        context_->GetExternalSymbols()->FindByReference(mangled_reference); +    if (symbol && symbol->attribute) { +      // Copy the symbol data structure because the returned instance can be +      // destroyed. +      styleable_attr.symbol = util::make_unique<SymbolTable::Symbol>(*symbol);      } -} - -bool JavaClassGenerator::skipSymbol(SymbolState state) { -    switch (mOptions.types) { -    case JavaClassGeneratorOptions::SymbolTypes::kAll: -        return false; -    case JavaClassGeneratorOptions::SymbolTypes::kPublicPrivate: -        return state == SymbolState::kUndefined; -    case JavaClassGeneratorOptions::SymbolTypes::kPublic: -        return state != SymbolState::kPublic; +    sorted_attributes.push_back(std::move(styleable_attr)); +  } + +  // Sort the attributes by ID. +  std::sort(sorted_attributes.begin(), sorted_attributes.end(), +            less_styleable_attr); + +  const size_t attr_count = sorted_attributes.size(); +  if (attr_count > 0) { +    // Build the comment string for the Styleable. It includes details about the +    // child attributes. +    std::stringstream styleable_comment; +    if (!styleable->GetComment().empty()) { +      styleable_comment << styleable->GetComment() << "\n"; +    } else { +      styleable_comment << "Attributes that can be used with a " << class_name +                        << ".\n";      } -    return true; -} -struct StyleableAttr { -    const Reference* attrRef; -    std::string fieldName; -    std::unique_ptr<SymbolTable::Symbol> symbol; -}; - -static bool lessStyleableAttr(const StyleableAttr& lhs, const StyleableAttr& rhs) { -    const ResourceId lhsId = lhs.attrRef->id ? lhs.attrRef->id.value() : ResourceId(0); -    const ResourceId rhsId = rhs.attrRef->id ? rhs.attrRef->id.value() : ResourceId(0); -    if (lhsId < rhsId) { -        return true; -    } else if (lhsId > rhsId) { -        return false; -    } else { -        return lhs.attrRef->name.value() < rhs.attrRef->name.value(); +    styleable_comment << "<p>Includes the following attributes:</p>\n" +                         "<table>\n" +                         "<colgroup align=\"left\" />\n" +                         "<colgroup align=\"left\" />\n" +                         "<tr><th>Attribute</th><th>Description</th></tr>\n"; + +    for (const StyleableAttr& entry : sorted_attributes) { +      if (!entry.symbol) { +        continue; +      } + +      if (options_.types == JavaClassGeneratorOptions::SymbolTypes::kPublic && +          !entry.symbol->is_public) { +        // Don't write entries for non-public attributes. +        continue; +      } + +      StringPiece attr_comment_line = entry.symbol->attribute->GetComment(); +      if (attr_comment_line.contains("@removed")) { +        // Removed attributes are public but hidden from the documentation, so +        // don't emit +        // them as part of the class documentation. +        continue; +      } + +      const ResourceName& attr_name = entry.attr_ref->name.value(); +      styleable_comment << "<tr><td>"; +      styleable_comment << "<code>{@link #" << entry.field_name << " " +                        << (!attr_name.package.empty() +                                ? attr_name.package +                                : context_->GetCompilationPackage()) +                        << ":" << attr_name.entry << "}</code>"; +      styleable_comment << "</td>"; + +      styleable_comment << "<td>"; + +      // Only use the comment up until the first '.'. This is to stay compatible +      // with +      // the way old AAPT did it (presumably to keep it short and to avoid +      // including +      // annotations like @hide which would affect this Styleable). +      auto iter = +          std::find(attr_comment_line.begin(), attr_comment_line.end(), u'.'); +      if (iter != attr_comment_line.end()) { +        attr_comment_line = +            attr_comment_line.substr(0, (iter - attr_comment_line.begin()) + 1); +      } +      styleable_comment << attr_comment_line << "</td></tr>\n"; +    } +    styleable_comment << "</table>\n"; + +    for (const StyleableAttr& entry : sorted_attributes) { +      if (!entry.symbol) { +        continue; +      } + +      if (options_.types == JavaClassGeneratorOptions::SymbolTypes::kPublic && +          !entry.symbol->is_public) { +        // Don't write entries for non-public attributes. +        continue; +      } +      styleable_comment << "@see #" << entry.field_name << "\n";      } -} -void JavaClassGenerator::addMembersToStyleableClass(const StringPiece16& packageNameToGenerate, -                                                    const std::u16string& entryName, -                                                    const Styleable* styleable, -                                                    ClassDefinition* outStyleableClassDef) { -    const std::string className = transform(entryName); - -    std::unique_ptr<ResourceArrayMember> styleableArrayDef = -            util::make_unique<ResourceArrayMember>(className); - -    // This must be sorted by resource ID. -    std::vector<StyleableAttr> sortedAttributes; -    sortedAttributes.reserve(styleable->entries.size()); -    for (const auto& attr : styleable->entries) { -        // If we are not encoding final attributes, the styleable entry may have no ID -        // if we are building a static library. -        assert((!mOptions.useFinal || attr.id) && "no ID set for Styleable entry"); -        assert(attr.name && "no name set for Styleable entry"); - -        // We will need the unmangled, transformed name in the comments and the field, -        // so create it once and cache it in this StyleableAttr data structure. -        StyleableAttr styleableAttr = {}; -        styleableAttr.attrRef = &attr; -        styleableAttr.fieldName = transformNestedAttr(attr.name.value(), className, -                                                      packageNameToGenerate); - -        Reference mangledReference; -        mangledReference.id = attr.id; -        mangledReference.name = attr.name; -        if (mangledReference.name.value().package.empty()) { -            mangledReference.name.value().package = mContext->getCompilationPackage(); -        } +    styleable_array_def->GetCommentBuilder()->AppendComment( +        styleable_comment.str()); +  } -        if (Maybe<ResourceName> mangledName = -                mContext->getNameMangler()->mangleName(mangledReference.name.value())) { -            mangledReference.name = mangledName; -        } +  // Add the ResourceIds to the array member. +  for (const StyleableAttr& styleable_attr : sorted_attributes) { +    styleable_array_def->AddElement(styleable_attr.attr_ref->id +                                        ? styleable_attr.attr_ref->id.value() +                                        : ResourceId(0)); +  } -        // Look up the symbol so that we can write out in the comments what are possible -        // legal values for this attribute. -        const SymbolTable::Symbol* symbol = mContext->getExternalSymbols()->findByReference( -                mangledReference); -        if (symbol && symbol->attribute) { -            // Copy the symbol data structure because the returned instance can be destroyed. -            styleableAttr.symbol = util::make_unique<SymbolTable::Symbol>(*symbol); -        } -        sortedAttributes.push_back(std::move(styleableAttr)); -    } +  // Add the Styleable array to the Styleable class. +  out_styleable_class_def->AddMember(std::move(styleable_array_def)); -    // Sort the attributes by ID. -    std::sort(sortedAttributes.begin(), sortedAttributes.end(), lessStyleableAttr); - -    const size_t attrCount = sortedAttributes.size(); -    if (attrCount > 0) { -        // Build the comment string for the Styleable. It includes details about the -        // child attributes. -        std::stringstream styleableComment; -        if (!styleable->getComment().empty()) { -            styleableComment << styleable->getComment() << "\n"; -        } else { -            styleableComment << "Attributes that can be used with a " << className << ".\n"; -        } +  // Now we emit the indices into the array. +  for (size_t i = 0; i < attr_count; i++) { +    const StyleableAttr& styleable_attr = sorted_attributes[i]; -        styleableComment << -                "<p>Includes the following attributes:</p>\n" -                "<table>\n" -                "<colgroup align=\"left\" />\n" -                "<colgroup align=\"left\" />\n" -                "<tr><th>Attribute</th><th>Description</th></tr>\n"; - -        for (const StyleableAttr& entry : sortedAttributes) { -            if (!entry.symbol) { -                continue; -            } - -            if (mOptions.types == JavaClassGeneratorOptions::SymbolTypes::kPublic && -                    !entry.symbol->isPublic) { -                // Don't write entries for non-public attributes. -                continue; -            } - -            StringPiece16 attrCommentLine = entry.symbol->attribute->getComment(); -            if (attrCommentLine.contains(StringPiece16(u"@removed"))) { -                // Removed attributes are public but hidden from the documentation, so don't emit -                // them as part of the class documentation. -                continue; -            } - -            const ResourceName& attrName = entry.attrRef->name.value(); -            styleableComment << "<tr><td>"; -            styleableComment << "<code>{@link #" -                             << entry.fieldName << " " -                             << (!attrName.package.empty() -                                    ? attrName.package : mContext->getCompilationPackage()) -                             << ":" << attrName.entry -                             << "}</code>"; -            styleableComment << "</td>"; - -            styleableComment << "<td>"; - -            // Only use the comment up until the first '.'. This is to stay compatible with -            // the way old AAPT did it (presumably to keep it short and to avoid including -            // annotations like @hide which would affect this Styleable). -            auto iter = std::find(attrCommentLine.begin(), attrCommentLine.end(), u'.'); -            if (iter != attrCommentLine.end()) { -                attrCommentLine = attrCommentLine.substr( -                        0, (iter - attrCommentLine.begin()) + 1); -            } -            styleableComment << attrCommentLine << "</td></tr>\n"; -        } -        styleableComment << "</table>\n"; - -        for (const StyleableAttr& entry : sortedAttributes) { -            if (!entry.symbol) { -                continue; -            } - -            if (mOptions.types == JavaClassGeneratorOptions::SymbolTypes::kPublic && -                    !entry.symbol->isPublic) { -                // Don't write entries for non-public attributes. -                continue; -            } -            styleableComment << "@see #" << entry.fieldName << "\n"; -        } +    if (!styleable_attr.symbol) { +      continue; +    } -        styleableArrayDef->getCommentBuilder()->appendComment(styleableComment.str()); +    if (options_.types == JavaClassGeneratorOptions::SymbolTypes::kPublic && +        !styleable_attr.symbol->is_public) { +      // Don't write entries for non-public attributes. +      continue;      } -    // Add the ResourceIds to the array member. -    for (const StyleableAttr& styleableAttr : sortedAttributes) { -        styleableArrayDef->addElement( -                styleableAttr.attrRef->id ? styleableAttr.attrRef->id.value() : ResourceId(0)); +    StringPiece comment = styleable_attr.attr_ref->GetComment(); +    if (styleable_attr.symbol->attribute && comment.empty()) { +      comment = styleable_attr.symbol->attribute->GetComment();      } -    // Add the Styleable array to the Styleable class. -    outStyleableClassDef->addMember(std::move(styleableArrayDef)); +    if (comment.contains("@removed")) { +      // Removed attributes are public but hidden from the documentation, so +      // don't emit them +      // as part of the class documentation. +      continue; +    } -    // Now we emit the indices into the array. -    for (size_t i = 0; i < attrCount; i++) { -        const StyleableAttr& styleableAttr = sortedAttributes[i]; +    const ResourceName& attr_name = styleable_attr.attr_ref->name.value(); -        if (!styleableAttr.symbol) { -            continue; -        } +    StringPiece package_name = attr_name.package; +    if (package_name.empty()) { +      package_name = context_->GetCompilationPackage(); +    } -        if (mOptions.types == JavaClassGeneratorOptions::SymbolTypes::kPublic && -                !styleableAttr.symbol->isPublic) { -            // Don't write entries for non-public attributes. -            continue; -        } +    std::unique_ptr<IntMember> index_member = util::make_unique<IntMember>( +        sorted_attributes[i].field_name, static_cast<uint32_t>(i)); -        StringPiece16 comment = styleableAttr.attrRef->getComment(); -        if (styleableAttr.symbol->attribute && comment.empty()) { -            comment = styleableAttr.symbol->attribute->getComment(); -        } +    AnnotationProcessor* attr_processor = index_member->GetCommentBuilder(); -        if (comment.contains(StringPiece16(u"@removed"))) { -            // Removed attributes are public but hidden from the documentation, so don't emit them -            // as part of the class documentation. -            continue; -        } +    if (!comment.empty()) { +      attr_processor->AppendComment("<p>\n@attr description"); +      attr_processor->AppendComment(comment); +    } else { +      std::stringstream default_comment; +      default_comment << "<p>This symbol is the offset where the " +                      << "{@link " << package_name << ".R.attr#" +                      << Transform(attr_name.entry) << "}\n" +                      << "attribute's value can be found in the " +                      << "{@link #" << class_name << "} array."; +      attr_processor->AppendComment(default_comment.str()); +    } -        const ResourceName& attrName = styleableAttr.attrRef->name.value(); +    attr_processor->AppendNewLine(); -        StringPiece16 packageName = attrName.package; -        if (packageName.empty()) { -            packageName = mContext->getCompilationPackage(); -        } +    AddAttributeFormatDoc(attr_processor, +                          styleable_attr.symbol->attribute.get()); +    attr_processor->AppendNewLine(); -        std::unique_ptr<IntMember> indexMember = util::make_unique<IntMember>( -                sortedAttributes[i].fieldName, static_cast<uint32_t>(i)); - -        AnnotationProcessor* attrProcessor = indexMember->getCommentBuilder(); - -        if (!comment.empty()) { -            attrProcessor->appendComment("<p>\n@attr description"); -            attrProcessor->appendComment(comment); -        } else { -            std::stringstream defaultComment; -            defaultComment -                    << "<p>This symbol is the offset where the " -                    << "{@link " << packageName << ".R.attr#" << transform(attrName.entry) << "}\n" -                    << "attribute's value can be found in the " -                    << "{@link #" << className << "} array."; -            attrProcessor->appendComment(defaultComment.str()); -        } +    std::stringstream doclava_name; +    doclava_name << "@attr name " << package_name << ":" << attr_name.entry; -        attrProcessor->appendNewLine(); +    attr_processor->AppendComment(doclava_name.str()); -        addAttributeFormatDoc(attrProcessor, styleableAttr.symbol->attribute.get()); -        attrProcessor->appendNewLine(); +    out_styleable_class_def->AddMember(std::move(index_member)); +  } +} -        std::stringstream doclavaName; -        doclavaName << "@attr name " << packageName << ":" << attrName.entry;; -        attrProcessor->appendComment(doclavaName.str()); +bool JavaClassGenerator::AddMembersToTypeClass( +    const StringPiece& package_name_to_generate, +    const ResourceTablePackage* package, const ResourceTableType* type, +    ClassDefinition* out_type_class_def) { +  for (const auto& entry : type->entries) { +    if (SkipSymbol(entry->symbol_status.state)) { +      continue; +    } -        outStyleableClassDef->addMember(std::move(indexMember)); +    ResourceId id; +    if (package->id && type->id && entry->id) { +      id = ResourceId(package->id.value(), type->id.value(), entry->id.value());      } -} -bool JavaClassGenerator::addMembersToTypeClass(const StringPiece16& packageNameToGenerate, -                                               const ResourceTablePackage* package, -                                               const ResourceTableType* type, -                                               ClassDefinition* outTypeClassDef) { +    std::string unmangled_package; +    std::string unmangled_name = entry->name; +    if (NameMangler::Unmangle(&unmangled_name, &unmangled_package)) { +      // The entry name was mangled, and we successfully unmangled it. +      // Check that we want to emit this symbol. +      if (package->name != unmangled_package) { +        // Skip the entry if it doesn't belong to the package we're writing. +        continue; +      } +    } else if (package_name_to_generate != package->name) { +      // We are processing a mangled package name, +      // but this is a non-mangled resource. +      continue; +    } -    for (const auto& entry : type->entries) { -        if (skipSymbol(entry->symbolStatus.state)) { -            continue; -        } +    if (!IsValidSymbol(unmangled_name)) { +      ResourceNameRef resource_name(package_name_to_generate, type->type, +                                    unmangled_name); +      std::stringstream err; +      err << "invalid symbol name '" << resource_name << "'"; +      error_ = err.str(); +      return false; +    } -        ResourceId id; -        if (package->id && type->id && entry->id) { -            id = ResourceId(package->id.value(), type->id.value(), entry->id.value()); -        } +    if (type->type == ResourceType::kStyleable) { +      CHECK(!entry->values.empty()); -        std::u16string unmangledPackage; -        std::u16string unmangledName = entry->name; -        if (NameMangler::unmangle(&unmangledName, &unmangledPackage)) { -            // The entry name was mangled, and we successfully unmangled it. -            // Check that we want to emit this symbol. -            if (package->name != unmangledPackage) { -                // Skip the entry if it doesn't belong to the package we're writing. -                continue; -            } -        } else if (packageNameToGenerate != package->name) { -            // We are processing a mangled package name, -            // but this is a non-mangled resource. -            continue; -        } +      const Styleable* styleable = +          static_cast<const Styleable*>(entry->values.front()->value.get()); -        if (!isValidSymbol(unmangledName)) { -            ResourceNameRef resourceName(packageNameToGenerate, type->type, unmangledName); -            std::stringstream err; -            err << "invalid symbol name '" << resourceName << "'"; -            mError = err.str(); -            return false; +      // Comments are handled within this method. +      AddMembersToStyleableClass(package_name_to_generate, unmangled_name, +                                 styleable, out_type_class_def); +    } else { +      std::unique_ptr<ResourceMember> resource_member = +          util::make_unique<ResourceMember>(Transform(unmangled_name), id); + +      // Build the comments and annotations for this entry. +      AnnotationProcessor* processor = resource_member->GetCommentBuilder(); + +      // Add the comments from any <public> tags. +      if (entry->symbol_status.state != SymbolState::kUndefined) { +        processor->AppendComment(entry->symbol_status.comment); +      } + +      // Add the comments from all configurations of this entry. +      for (const auto& config_value : entry->values) { +        processor->AppendComment(config_value->value->GetComment()); +      } + +      // If this is an Attribute, append the format Javadoc. +      if (!entry->values.empty()) { +        if (Attribute* attr = +                ValueCast<Attribute>(entry->values.front()->value.get())) { +          // We list out the available values for the given attribute. +          AddAttributeFormatDoc(processor, attr);          } +      } -        if (type->type == ResourceType::kStyleable) { -            assert(!entry->values.empty()); - -            const Styleable* styleable = static_cast<const Styleable*>( -                    entry->values.front()->value.get()); - -            // Comments are handled within this method. -            addMembersToStyleableClass(packageNameToGenerate, unmangledName, styleable, -                                       outTypeClassDef); -        } else { -            std::unique_ptr<ResourceMember> resourceMember = -                    util::make_unique<ResourceMember>(transform(unmangledName), id); - -            // Build the comments and annotations for this entry. -            AnnotationProcessor* processor = resourceMember->getCommentBuilder(); - -            // Add the comments from any <public> tags. -            if (entry->symbolStatus.state != SymbolState::kUndefined) { -                processor->appendComment(entry->symbolStatus.comment); -            } - -            // Add the comments from all configurations of this entry. -            for (const auto& configValue : entry->values) { -                processor->appendComment(configValue->value->getComment()); -            } - -            // If this is an Attribute, append the format Javadoc. -            if (!entry->values.empty()) { -                if (Attribute* attr = valueCast<Attribute>(entry->values.front()->value.get())) { -                    // We list out the available values for the given attribute. -                    addAttributeFormatDoc(processor, attr); -                } -            } - -            outTypeClassDef->addMember(std::move(resourceMember)); -        } +      out_type_class_def->AddMember(std::move(resource_member));      } -    return true; +  } +  return true;  } -bool JavaClassGenerator::generate(const StringPiece16& packageNameToGenerate, std::ostream* out) { -    return generate(packageNameToGenerate, packageNameToGenerate, out); +bool JavaClassGenerator::Generate(const StringPiece& package_name_to_generate, +                                  std::ostream* out) { +  return Generate(package_name_to_generate, package_name_to_generate, out);  } -static void appendJavaDocAnnotations(const std::vector<std::string>& annotations, -                                     AnnotationProcessor* processor) { -    for (const std::string& annotation : annotations) { -        std::string properAnnotation = "@"; -        properAnnotation += annotation; -        processor->appendComment(properAnnotation); -    } +static void AppendJavaDocAnnotations( +    const std::vector<std::string>& annotations, +    AnnotationProcessor* processor) { +  for (const std::string& annotation : annotations) { +    std::string proper_annotation = "@"; +    proper_annotation += annotation; +    processor->AppendComment(proper_annotation); +  }  } -bool JavaClassGenerator::generate(const StringPiece16& packageNameToGenerate, -                                  const StringPiece16& outPackageName, std::ostream* out) { - -    ClassDefinition rClass("R", ClassQualifier::None, true); - -    for (const auto& package : mTable->packages) { -        for (const auto& type : package->types) { -            if (type->type == ResourceType::kAttrPrivate) { -                continue; -            } - -            const bool forceCreationIfEmpty = -                    (mOptions.types == JavaClassGeneratorOptions::SymbolTypes::kPublic); - -            std::unique_ptr<ClassDefinition> classDef = util::make_unique<ClassDefinition>( -                    util::utf16ToUtf8(toString(type->type)), ClassQualifier::Static, -                    forceCreationIfEmpty); - -            bool result = addMembersToTypeClass(packageNameToGenerate, package.get(), type.get(), -                                                classDef.get()); -            if (!result) { -                return false; -            } - -            if (type->type == ResourceType::kAttr) { -                // Also include private attributes in this same class. -                ResourceTableType* privType = package->findType(ResourceType::kAttrPrivate); -                if (privType) { -                    result = addMembersToTypeClass(packageNameToGenerate, package.get(), privType, -                                                   classDef.get()); -                    if (!result) { -                        return false; -                    } -                } -            } - -            if (type->type == ResourceType::kStyleable && -                    mOptions.types == JavaClassGeneratorOptions::SymbolTypes::kPublic) { -                // When generating a public R class, we don't want Styleable to be part of the API. -                // It is only emitted for documentation purposes. -                classDef->getCommentBuilder()->appendComment("@doconly"); -            } - -            appendJavaDocAnnotations(mOptions.javadocAnnotations, classDef->getCommentBuilder()); - -            rClass.addMember(std::move(classDef)); -        } -    } +bool JavaClassGenerator::Generate(const StringPiece& package_name_to_generate, +                                  const StringPiece& out_package_name, +                                  std::ostream* out) { +  ClassDefinition r_class("R", ClassQualifier::None, true); + +  for (const auto& package : table_->packages) { +    for (const auto& type : package->types) { +      if (type->type == ResourceType::kAttrPrivate) { +        continue; +      } -    appendJavaDocAnnotations(mOptions.javadocAnnotations, rClass.getCommentBuilder()); +      const bool force_creation_if_empty = +          (options_.types == JavaClassGeneratorOptions::SymbolTypes::kPublic); -    if (!ClassDefinition::writeJavaFile(&rClass, util::utf16ToUtf8(outPackageName), -                                        mOptions.useFinal, out)) { +      std::unique_ptr<ClassDefinition> class_def = +          util::make_unique<ClassDefinition>(ToString(type->type), +                                             ClassQualifier::Static, +                                             force_creation_if_empty); + +      bool result = AddMembersToTypeClass( +          package_name_to_generate, package.get(), type.get(), class_def.get()); +      if (!result) {          return false; +      } + +      if (type->type == ResourceType::kAttr) { +        // Also include private attributes in this same class. +        ResourceTableType* priv_type = +            package->FindType(ResourceType::kAttrPrivate); +        if (priv_type) { +          result = +              AddMembersToTypeClass(package_name_to_generate, package.get(), +                                    priv_type, class_def.get()); +          if (!result) { +            return false; +          } +        } +      } + +      if (type->type == ResourceType::kStyleable && +          options_.types == JavaClassGeneratorOptions::SymbolTypes::kPublic) { +        // When generating a public R class, we don't want Styleable to be part +        // of the API. +        // It is only emitted for documentation purposes. +        class_def->GetCommentBuilder()->AppendComment("@doconly"); +      } + +      AppendJavaDocAnnotations(options_.javadoc_annotations, +                               class_def->GetCommentBuilder()); + +      r_class.AddMember(std::move(class_def));      } +  } -    out->flush(); -    return true; +  AppendJavaDocAnnotations(options_.javadoc_annotations, +                           r_class.GetCommentBuilder()); + +  if (!ClassDefinition::WriteJavaFile(&r_class, out_package_name, +                                      options_.use_final, out)) { +    return false; +  } + +  out->flush(); +  return true;  } -} // namespace aapt +}  // namespace aapt | 
