Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2015 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | #include "ConfigDescription.h" |
Adam Lesinski | 769de98 | 2015-04-10 19:43:55 -0700 | [diff] [blame] | 18 | #include "NameMangler.h" |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 19 | #include "ResourceTable.h" |
| 20 | #include "ResourceValues.h" |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 21 | #include "ValueVisitor.h" |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 22 | |
| 23 | #include "util/Comparators.h" |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 24 | #include "util/Util.h" |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 25 | |
| 26 | #include <algorithm> |
| 27 | #include <androidfw/ResourceTypes.h> |
| 28 | #include <memory> |
| 29 | #include <string> |
| 30 | #include <tuple> |
| 31 | |
| 32 | namespace aapt { |
| 33 | |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 34 | static bool lessThanType(const std::unique_ptr<ResourceTableType>& lhs, ResourceType rhs) { |
| 35 | return lhs->type < rhs; |
| 36 | } |
| 37 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 38 | template <typename T> |
| 39 | static bool lessThanStructWithName(const std::unique_ptr<T>& lhs, |
| 40 | const StringPiece16& rhs) { |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 41 | return lhs->name.compare(0, lhs->name.size(), rhs.data(), rhs.size()) < 0; |
| 42 | } |
| 43 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 44 | ResourceTablePackage* ResourceTable::findPackage(const StringPiece16& name) { |
| 45 | const auto last = packages.end(); |
| 46 | auto iter = std::lower_bound(packages.begin(), last, name, |
| 47 | lessThanStructWithName<ResourceTablePackage>); |
| 48 | if (iter != last && name == (*iter)->name) { |
| 49 | return iter->get(); |
| 50 | } |
| 51 | return nullptr; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 52 | } |
| 53 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 54 | ResourceTablePackage* ResourceTable::findPackageById(uint8_t id) { |
| 55 | for (auto& package : packages) { |
| 56 | if (package->id && package->id.value() == id) { |
| 57 | return package.get(); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 58 | } |
| 59 | } |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 60 | return nullptr; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 61 | } |
| 62 | |
Adam Lesinski | 9ba47d8 | 2015-10-13 11:37:10 -0700 | [diff] [blame] | 63 | ResourceTablePackage* ResourceTable::createPackage(const StringPiece16& name, Maybe<uint8_t> id) { |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 64 | ResourceTablePackage* package = findOrCreatePackage(name); |
Adam Lesinski | 9ba47d8 | 2015-10-13 11:37:10 -0700 | [diff] [blame] | 65 | if (id && !package->id) { |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 66 | package->id = id; |
| 67 | return package; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 68 | } |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 69 | |
Adam Lesinski | 9ba47d8 | 2015-10-13 11:37:10 -0700 | [diff] [blame] | 70 | if (id && package->id && package->id.value() != id.value()) { |
| 71 | return nullptr; |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 72 | } |
Adam Lesinski | 9ba47d8 | 2015-10-13 11:37:10 -0700 | [diff] [blame] | 73 | return package; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 74 | } |
| 75 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 76 | ResourceTablePackage* ResourceTable::findOrCreatePackage(const StringPiece16& name) { |
| 77 | const auto last = packages.end(); |
| 78 | auto iter = std::lower_bound(packages.begin(), last, name, |
| 79 | lessThanStructWithName<ResourceTablePackage>); |
| 80 | if (iter != last && name == (*iter)->name) { |
| 81 | return iter->get(); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 82 | } |
| 83 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 84 | std::unique_ptr<ResourceTablePackage> newPackage = util::make_unique<ResourceTablePackage>(); |
| 85 | newPackage->name = name.toString(); |
| 86 | return packages.emplace(iter, std::move(newPackage))->get(); |
| 87 | } |
| 88 | |
| 89 | ResourceTableType* ResourceTablePackage::findType(ResourceType type) { |
| 90 | const auto last = types.end(); |
| 91 | auto iter = std::lower_bound(types.begin(), last, type, lessThanType); |
| 92 | if (iter != last && (*iter)->type == type) { |
| 93 | return iter->get(); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 94 | } |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 95 | return nullptr; |
| 96 | } |
| 97 | |
| 98 | ResourceTableType* ResourceTablePackage::findOrCreateType(ResourceType type) { |
| 99 | const auto last = types.end(); |
| 100 | auto iter = std::lower_bound(types.begin(), last, type, lessThanType); |
| 101 | if (iter != last && (*iter)->type == type) { |
| 102 | return iter->get(); |
| 103 | } |
| 104 | return types.emplace(iter, new ResourceTableType{ type })->get(); |
| 105 | } |
| 106 | |
| 107 | ResourceEntry* ResourceTableType::findEntry(const StringPiece16& name) { |
| 108 | const auto last = entries.end(); |
| 109 | auto iter = std::lower_bound(entries.begin(), last, name, |
| 110 | lessThanStructWithName<ResourceEntry>); |
| 111 | if (iter != last && name == (*iter)->name) { |
| 112 | return iter->get(); |
| 113 | } |
| 114 | return nullptr; |
| 115 | } |
| 116 | |
| 117 | ResourceEntry* ResourceTableType::findOrCreateEntry(const StringPiece16& name) { |
| 118 | auto last = entries.end(); |
| 119 | auto iter = std::lower_bound(entries.begin(), last, name, |
| 120 | lessThanStructWithName<ResourceEntry>); |
| 121 | if (iter != last && name == (*iter)->name) { |
| 122 | return iter->get(); |
| 123 | } |
| 124 | return entries.emplace(iter, new ResourceEntry{ name })->get(); |
| 125 | } |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 126 | |
| 127 | /** |
| 128 | * The default handler for collisions. A return value of -1 means keep the |
| 129 | * existing value, 0 means fail, and +1 means take the incoming value. |
| 130 | */ |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 131 | int ResourceTable::resolveValueCollision(Value* existing, Value* incoming) { |
| 132 | Attribute* existingAttr = valueCast<Attribute>(existing); |
| 133 | Attribute* incomingAttr = valueCast<Attribute>(incoming); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 134 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 135 | if (!incomingAttr) { |
| 136 | if (incoming->isWeak()) { |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 137 | // We're trying to add a weak resource but a resource |
| 138 | // already exists. Keep the existing. |
| 139 | return -1; |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 140 | } else if (existing->isWeak()) { |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 141 | // Override the weak resource with the new strong resource. |
| 142 | return 1; |
| 143 | } |
| 144 | // The existing and incoming values are strong, this is an error |
| 145 | // if the values are not both attributes. |
| 146 | return 0; |
| 147 | } |
| 148 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 149 | if (!existingAttr) { |
| 150 | if (existing->isWeak()) { |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 151 | // The existing value is not an attribute and it is weak, |
| 152 | // so take the incoming attribute value. |
| 153 | return 1; |
| 154 | } |
| 155 | // The existing value is not an attribute and it is strong, |
| 156 | // so the incoming attribute value is an error. |
| 157 | return 0; |
| 158 | } |
| 159 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 160 | assert(incomingAttr && existingAttr); |
| 161 | |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 162 | // |
| 163 | // Attribute specific handling. At this point we know both |
| 164 | // values are attributes. Since we can declare and define |
| 165 | // attributes all-over, we do special handling to see |
| 166 | // which definition sticks. |
| 167 | // |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 168 | if (existingAttr->typeMask == incomingAttr->typeMask) { |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 169 | // The two attributes are both DECLs, but they are plain attributes |
| 170 | // with the same formats. |
| 171 | // Keep the strongest one. |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 172 | return existingAttr->isWeak() ? 1 : -1; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 173 | } |
| 174 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 175 | if (existingAttr->isWeak() && existingAttr->typeMask == android::ResTable_map::TYPE_ANY) { |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 176 | // Any incoming attribute is better than this. |
| 177 | return 1; |
| 178 | } |
| 179 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 180 | if (incomingAttr->isWeak() && incomingAttr->typeMask == android::ResTable_map::TYPE_ANY) { |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 181 | // The incoming attribute may be a USE instead of a DECL. |
| 182 | // Keep the existing attribute. |
| 183 | return -1; |
| 184 | } |
| 185 | return 0; |
| 186 | } |
| 187 | |
| 188 | static constexpr const char16_t* kValidNameChars = u"._-"; |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 189 | static constexpr const char16_t* kValidNameMangledChars = u"._-$"; |
| 190 | |
| 191 | bool ResourceTable::addResource(const ResourceNameRef& name, const ConfigDescription& config, |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 192 | std::unique_ptr<Value> value, IDiagnostics* diag) { |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 193 | return addResourceImpl(name, {}, config, std::move(value), kValidNameChars, |
| 194 | resolveValueCollision, diag); |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 195 | } |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 196 | |
| 197 | bool ResourceTable::addResource(const ResourceNameRef& name, const ResourceId resId, |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 198 | const ConfigDescription& config, std::unique_ptr<Value> value, |
| 199 | IDiagnostics* diag) { |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 200 | return addResourceImpl(name, resId, config, std::move(value), kValidNameChars, |
| 201 | resolveValueCollision, diag); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 202 | } |
| 203 | |
| 204 | bool ResourceTable::addFileReference(const ResourceNameRef& name, const ConfigDescription& config, |
| 205 | const Source& source, const StringPiece16& path, |
| 206 | IDiagnostics* diag) { |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 207 | return addFileReference(name, config, source, path, resolveValueCollision, diag); |
| 208 | } |
| 209 | |
| 210 | bool ResourceTable::addFileReference(const ResourceNameRef& name, const ConfigDescription& config, |
| 211 | const Source& source, const StringPiece16& path, |
| 212 | std::function<int(Value*,Value*)> conflictResolver, |
| 213 | IDiagnostics* diag) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 214 | std::unique_ptr<FileReference> fileRef = util::make_unique<FileReference>( |
| 215 | stringPool.makeRef(path)); |
| 216 | fileRef->setSource(source); |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 217 | return addResourceImpl(name, ResourceId{}, config, std::move(fileRef), kValidNameChars, |
| 218 | conflictResolver, diag); |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 219 | } |
| 220 | |
| 221 | bool ResourceTable::addResourceAllowMangled(const ResourceNameRef& name, |
| 222 | const ConfigDescription& config, |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 223 | std::unique_ptr<Value> value, |
| 224 | IDiagnostics* diag) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 225 | return addResourceImpl(name, ResourceId{}, config, std::move(value), kValidNameMangledChars, |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 226 | resolveValueCollision, diag); |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 227 | } |
| 228 | |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 229 | bool ResourceTable::addResourceAllowMangled(const ResourceNameRef& name, |
| 230 | const ResourceId id, |
| 231 | const ConfigDescription& config, |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 232 | std::unique_ptr<Value> value, |
| 233 | IDiagnostics* diag) { |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 234 | return addResourceImpl(name, id, config, std::move(value), kValidNameMangledChars, |
| 235 | resolveValueCollision, diag); |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 236 | } |
| 237 | |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 238 | bool ResourceTable::addResourceImpl(const ResourceNameRef& name, |
| 239 | const ResourceId resId, |
| 240 | const ConfigDescription& config, |
| 241 | std::unique_ptr<Value> value, |
| 242 | const char16_t* validChars, |
| 243 | std::function<int(Value*,Value*)> conflictResolver, |
| 244 | IDiagnostics* diag) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 245 | assert(value && "value can't be nullptr"); |
| 246 | assert(diag && "diagnostics can't be nullptr"); |
| 247 | |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 248 | auto badCharIter = util::findNonAlphaNumericAndNotInSet(name.entry, validChars); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 249 | if (badCharIter != name.entry.end()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 250 | diag->error(DiagMessage(value->getSource()) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 251 | << "resource '" |
| 252 | << name |
| 253 | << "' has invalid entry name '" |
| 254 | << name.entry |
| 255 | << "'. Invalid character '" |
| 256 | << StringPiece16(badCharIter, 1) |
| 257 | << "'"); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 258 | return false; |
| 259 | } |
| 260 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 261 | ResourceTablePackage* package = findOrCreatePackage(name.package); |
| 262 | if (resId.isValid() && package->id && package->id.value() != resId.packageId()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 263 | diag->error(DiagMessage(value->getSource()) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 264 | << "trying to add resource '" |
| 265 | << name |
| 266 | << "' with ID " |
| 267 | << resId |
| 268 | << " but package '" |
| 269 | << package->name |
| 270 | << "' already has ID " |
| 271 | << std::hex << (int) package->id.value() << std::dec); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 272 | return false; |
| 273 | } |
| 274 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 275 | ResourceTableType* type = package->findOrCreateType(name.type); |
| 276 | if (resId.isValid() && type->id && type->id.value() != resId.typeId()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 277 | diag->error(DiagMessage(value->getSource()) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 278 | << "trying to add resource '" |
| 279 | << name |
| 280 | << "' with ID " |
| 281 | << resId |
| 282 | << " but type '" |
| 283 | << type->type |
| 284 | << "' already has ID " |
| 285 | << std::hex << (int) type->id.value() << std::dec); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 286 | return false; |
| 287 | } |
| 288 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 289 | ResourceEntry* entry = type->findOrCreateEntry(name.entry); |
| 290 | if (resId.isValid() && entry->id && entry->id.value() != resId.entryId()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 291 | diag->error(DiagMessage(value->getSource()) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 292 | << "trying to add resource '" |
| 293 | << name |
| 294 | << "' with ID " |
| 295 | << resId |
| 296 | << " but resource already has ID " |
| 297 | << ResourceId(package->id.value(), type->id.value(), entry->id.value())); |
| 298 | return false; |
| 299 | } |
| 300 | |
| 301 | const auto endIter = entry->values.end(); |
Adam Lesinski | b274e35 | 2015-11-06 15:14:35 -0800 | [diff] [blame] | 302 | auto iter = std::lower_bound(entry->values.begin(), endIter, config, cmp::lessThanConfig); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 303 | if (iter == endIter || iter->config != config) { |
| 304 | // This resource did not exist before, add it. |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 305 | entry->values.insert(iter, ResourceConfigValue{ config, std::move(value) }); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 306 | } else { |
Adam Lesinski | fb48d29 | 2015-11-07 15:52:13 -0800 | [diff] [blame^] | 307 | int collisionResult = conflictResolver(iter->value.get(), value.get()); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 308 | if (collisionResult > 0) { |
| 309 | // Take the incoming value. |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 310 | iter->value = std::move(value); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 311 | } else if (collisionResult == 0) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 312 | diag->error(DiagMessage(value->getSource()) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 313 | << "duplicate value for resource '" << name << "' " |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 314 | << "with config '" << config << "'"); |
| 315 | diag->error(DiagMessage(iter->value->getSource()) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 316 | << "resource previously defined here"); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 317 | return false; |
| 318 | } |
| 319 | } |
| 320 | |
| 321 | if (resId.isValid()) { |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 322 | package->id = resId.packageId(); |
| 323 | type->id = resId.typeId(); |
| 324 | entry->id = resId.entryId(); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 325 | } |
| 326 | return true; |
| 327 | } |
| 328 | |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 329 | bool ResourceTable::setSymbolState(const ResourceNameRef& name, const ResourceId resId, |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 330 | const Symbol& symbol, IDiagnostics* diag) { |
| 331 | return setSymbolStateImpl(name, resId, symbol, kValidNameChars, diag); |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 332 | } |
| 333 | |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 334 | bool ResourceTable::setSymbolStateAllowMangled(const ResourceNameRef& name, |
| 335 | const ResourceId resId, |
| 336 | const Symbol& symbol, IDiagnostics* diag) { |
| 337 | return setSymbolStateImpl(name, resId, symbol, kValidNameMangledChars, diag); |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 338 | } |
| 339 | |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 340 | bool ResourceTable::setSymbolStateImpl(const ResourceNameRef& name, const ResourceId resId, |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 341 | const Symbol& symbol, const char16_t* validChars, |
| 342 | IDiagnostics* diag) { |
| 343 | assert(diag && "diagnostics can't be nullptr"); |
| 344 | |
| 345 | if (symbol.state == SymbolState::kUndefined) { |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 346 | // Nothing to do. |
| 347 | return true; |
| 348 | } |
| 349 | |
Adam Lesinski | 330edcd | 2015-05-04 17:40:56 -0700 | [diff] [blame] | 350 | auto badCharIter = util::findNonAlphaNumericAndNotInSet(name.entry, validChars); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 351 | if (badCharIter != name.entry.end()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 352 | diag->error(DiagMessage(symbol.source) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 353 | << "resource '" |
| 354 | << name |
| 355 | << "' has invalid entry name '" |
| 356 | << name.entry |
| 357 | << "'. Invalid character '" |
| 358 | << StringPiece16(badCharIter, 1) |
| 359 | << "'"); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 360 | return false; |
| 361 | } |
| 362 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 363 | ResourceTablePackage* package = findOrCreatePackage(name.package); |
| 364 | if (resId.isValid() && package->id && package->id.value() != resId.packageId()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 365 | diag->error(DiagMessage(symbol.source) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 366 | << "trying to add resource '" |
| 367 | << name |
| 368 | << "' with ID " |
| 369 | << resId |
| 370 | << " but package '" |
| 371 | << package->name |
| 372 | << "' already has ID " |
| 373 | << std::hex << (int) package->id.value() << std::dec); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 374 | return false; |
| 375 | } |
| 376 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 377 | ResourceTableType* type = package->findOrCreateType(name.type); |
| 378 | if (resId.isValid() && type->id && type->id.value() != resId.typeId()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 379 | diag->error(DiagMessage(symbol.source) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 380 | << "trying to add resource '" |
| 381 | << name |
| 382 | << "' with ID " |
| 383 | << resId |
| 384 | << " but type '" |
| 385 | << type->type |
| 386 | << "' already has ID " |
| 387 | << std::hex << (int) type->id.value() << std::dec); |
| 388 | return false; |
| 389 | } |
| 390 | |
| 391 | ResourceEntry* entry = type->findOrCreateEntry(name.entry); |
| 392 | if (resId.isValid() && entry->id && entry->id.value() != resId.entryId()) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 393 | diag->error(DiagMessage(symbol.source) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 394 | << "trying to add resource '" |
| 395 | << name |
| 396 | << "' with ID " |
| 397 | << resId |
| 398 | << " but resource already has ID " |
| 399 | << ResourceId(package->id.value(), type->id.value(), entry->id.value())); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 400 | return false; |
| 401 | } |
| 402 | |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 403 | // Only mark the type state as public, it doesn't care about being private. |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 404 | if (symbol.state == SymbolState::kPublic) { |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 405 | type->symbolStatus.state = SymbolState::kPublic; |
| 406 | } |
| 407 | |
| 408 | // Downgrading to a private symbol from a public one is not allowed. |
| 409 | if (entry->symbolStatus.state != SymbolState::kPublic) { |
Adam Lesinski | e78fd61 | 2015-10-22 12:48:43 -0700 | [diff] [blame] | 410 | if (entry->symbolStatus.state != symbol.state) { |
| 411 | entry->symbolStatus = std::move(symbol); |
Adam Lesinski | 9e10ac7 | 2015-10-16 14:37:48 -0700 | [diff] [blame] | 412 | } |
| 413 | } |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 414 | |
| 415 | if (resId.isValid()) { |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 416 | package->id = resId.packageId(); |
| 417 | type->id = resId.typeId(); |
| 418 | entry->id = resId.entryId(); |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 419 | } |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 420 | return true; |
| 421 | } |
| 422 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 423 | Maybe<ResourceTable::SearchResult> |
| 424 | ResourceTable::findResource(const ResourceNameRef& name) { |
| 425 | ResourceTablePackage* package = findPackage(name.package); |
| 426 | if (!package) { |
Adam Lesinski | ca2fc35 | 2015-04-03 12:08:26 -0700 | [diff] [blame] | 427 | return {}; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 428 | } |
| 429 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 430 | ResourceTableType* type = package->findType(name.type); |
| 431 | if (!type) { |
Adam Lesinski | ca2fc35 | 2015-04-03 12:08:26 -0700 | [diff] [blame] | 432 | return {}; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 433 | } |
| 434 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 435 | ResourceEntry* entry = type->findEntry(name.entry); |
| 436 | if (!entry) { |
Adam Lesinski | ca2fc35 | 2015-04-03 12:08:26 -0700 | [diff] [blame] | 437 | return {}; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 438 | } |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 439 | return SearchResult{ package, type, entry }; |
Adam Lesinski | 6f6ceb7 | 2014-11-14 14:48:12 -0800 | [diff] [blame] | 440 | } |
| 441 | |
| 442 | } // namespace aapt |