Andreas Huber | 1aec397 | 2016-08-26 09:26:32 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2016 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 | |
Andreas Huber | c9410c7 | 2016-07-28 12:18:40 -0700 | [diff] [blame] | 17 | #include "CompoundType.h" |
| 18 | |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 19 | #include "VectorType.h" |
Iliyan Malchev | a72e0d2 | 2016-09-09 11:03:08 -0700 | [diff] [blame] | 20 | #include <hidl-util/Formatter.h> |
Andreas Huber | 5a54544 | 2016-08-03 10:44:56 -0700 | [diff] [blame] | 21 | #include <android-base/logging.h> |
| 22 | |
Andreas Huber | c9410c7 | 2016-07-28 12:18:40 -0700 | [diff] [blame] | 23 | namespace android { |
| 24 | |
Andreas Huber | 9ed827c | 2016-08-22 12:31:13 -0700 | [diff] [blame] | 25 | CompoundType::CompoundType(Style style, const char *localName) |
| 26 | : Scope(localName), |
| 27 | mStyle(style), |
Andreas Huber | c9410c7 | 2016-07-28 12:18:40 -0700 | [diff] [blame] | 28 | mFields(NULL) { |
| 29 | } |
| 30 | |
Andreas Huber | 0d0f9a2 | 2016-08-17 10:26:11 -0700 | [diff] [blame] | 31 | bool CompoundType::setFields( |
| 32 | std::vector<CompoundField *> *fields, std::string *errorMsg) { |
Andreas Huber | c9410c7 | 2016-07-28 12:18:40 -0700 | [diff] [blame] | 33 | mFields = fields; |
Andreas Huber | 5a54544 | 2016-08-03 10:44:56 -0700 | [diff] [blame] | 34 | |
| 35 | for (const auto &field : *fields) { |
| 36 | const Type &type = field->type(); |
| 37 | |
Andreas Huber | 295ad30 | 2016-08-16 11:35:00 -0700 | [diff] [blame] | 38 | if (type.isBinder()) { |
Andreas Huber | 0d0f9a2 | 2016-08-17 10:26:11 -0700 | [diff] [blame] | 39 | *errorMsg = |
| 40 | "Structs/Unions must not contain references to interfaces."; |
Andreas Huber | b95ea8a | 2016-08-15 15:35:42 -0700 | [diff] [blame] | 41 | |
| 42 | return false; |
| 43 | } |
| 44 | |
Andreas Huber | 5a54544 | 2016-08-03 10:44:56 -0700 | [diff] [blame] | 45 | if (mStyle == STYLE_UNION) { |
| 46 | if (type.needsEmbeddedReadWrite()) { |
| 47 | // Can't have those in a union. |
| 48 | |
Andreas Huber | 0d0f9a2 | 2016-08-17 10:26:11 -0700 | [diff] [blame] | 49 | *errorMsg = |
| 50 | "Unions must not contain any types that need fixup."; |
Andreas Huber | 5a54544 | 2016-08-03 10:44:56 -0700 | [diff] [blame] | 51 | |
| 52 | return false; |
| 53 | } |
Andreas Huber | 5a54544 | 2016-08-03 10:44:56 -0700 | [diff] [blame] | 54 | } |
| 55 | } |
| 56 | |
| 57 | return true; |
Andreas Huber | c9410c7 | 2016-07-28 12:18:40 -0700 | [diff] [blame] | 58 | } |
| 59 | |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 60 | bool CompoundType::isCompoundType() const { |
| 61 | return true; |
| 62 | } |
| 63 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 64 | std::string CompoundType::getCppType( |
Steven Moreland | 979e099 | 2016-09-07 09:18:08 -0700 | [diff] [blame] | 65 | StorageMode mode, |
| 66 | std::string *extra, |
| 67 | bool specifyNamespaces) const { |
| 68 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 69 | extra->clear(); |
Steven Moreland | 979e099 | 2016-09-07 09:18:08 -0700 | [diff] [blame] | 70 | const std::string base = |
| 71 | specifyNamespaces ? fullName() : partialCppName(); |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 72 | |
| 73 | switch (mode) { |
| 74 | case StorageMode_Stack: |
| 75 | return base; |
| 76 | |
| 77 | case StorageMode_Argument: |
| 78 | return "const " + base + "&"; |
| 79 | |
| 80 | case StorageMode_Result: |
| 81 | return "const " + base + "*"; |
| 82 | } |
| 83 | } |
| 84 | |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 85 | std::string CompoundType::getJavaType( |
| 86 | std::string *extra, bool /* forInitializer */) const { |
| 87 | extra->clear(); |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 88 | return fullJavaName(); |
| 89 | } |
| 90 | |
Zhuoyao Zhang | c5ea9f5 | 2016-10-06 15:05:39 -0700 | [diff] [blame^] | 91 | std::string CompoundType::getVtsType() const { |
| 92 | switch (mStyle) { |
| 93 | case STYLE_STRUCT: |
| 94 | { |
| 95 | return "TYPE_STRUCT"; |
| 96 | } |
| 97 | case STYLE_UNION: |
| 98 | { |
| 99 | return "TYPE_UNION"; |
| 100 | } |
| 101 | } |
| 102 | } |
| 103 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 104 | void CompoundType::emitReaderWriter( |
| 105 | Formatter &out, |
| 106 | const std::string &name, |
| 107 | const std::string &parcelObj, |
| 108 | bool parcelObjIsPointer, |
| 109 | bool isReader, |
| 110 | ErrorMode mode) const { |
Iliyan Malchev | 549e259 | 2016-08-10 08:59:12 -0700 | [diff] [blame] | 111 | const std::string parentName = "_hidl_" + name + "_parent"; |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 112 | |
| 113 | out << "size_t " << parentName << ";\n\n"; |
| 114 | |
| 115 | const std::string parcelObjDeref = |
| 116 | parcelObj + (parcelObjIsPointer ? "->" : "."); |
| 117 | |
| 118 | if (isReader) { |
| 119 | out << name |
| 120 | << " = (const " |
Andreas Huber | 0e00de4 | 2016-08-03 09:56:02 -0700 | [diff] [blame] | 121 | << fullName() |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 122 | << " *)" |
| 123 | << parcelObjDeref |
| 124 | << "readBuffer(" |
| 125 | << "&" |
| 126 | << parentName |
| 127 | << ");\n"; |
| 128 | |
| 129 | out << "if (" |
| 130 | << name |
| 131 | << " == nullptr) {\n"; |
| 132 | |
| 133 | out.indent(); |
| 134 | |
Iliyan Malchev | 549e259 | 2016-08-10 08:59:12 -0700 | [diff] [blame] | 135 | out << "_hidl_err = ::android::UNKNOWN_ERROR;\n"; |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 136 | handleError2(out, mode); |
| 137 | |
| 138 | out.unindent(); |
| 139 | out << "}\n\n"; |
| 140 | } else { |
Iliyan Malchev | 549e259 | 2016-08-10 08:59:12 -0700 | [diff] [blame] | 141 | out << "_hidl_err = " |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 142 | << parcelObjDeref |
| 143 | << "writeBuffer(&" |
| 144 | << name |
| 145 | << ", sizeof(" |
| 146 | << name |
| 147 | << "), &" |
| 148 | << parentName |
| 149 | << ");\n"; |
| 150 | |
| 151 | handleError(out, mode); |
| 152 | } |
| 153 | |
| 154 | if (mStyle != STYLE_STRUCT || !needsEmbeddedReadWrite()) { |
| 155 | return; |
| 156 | } |
| 157 | |
| 158 | emitReaderWriterEmbedded( |
| 159 | out, |
Andreas Huber | f9d49f1 | 2016-09-12 14:58:36 -0700 | [diff] [blame] | 160 | 0 /* depth */, |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 161 | name, |
Yifan Hong | be2a373 | 2016-10-05 13:33:41 -0700 | [diff] [blame] | 162 | name, /* sanitizedName */ |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 163 | isReader /* nameIsPointer */, |
| 164 | parcelObj, |
| 165 | parcelObjIsPointer, |
| 166 | isReader, |
| 167 | mode, |
| 168 | parentName, |
| 169 | "0 /* parentOffset */"); |
| 170 | } |
| 171 | |
| 172 | void CompoundType::emitReaderWriterEmbedded( |
| 173 | Formatter &out, |
Andreas Huber | f9d49f1 | 2016-09-12 14:58:36 -0700 | [diff] [blame] | 174 | size_t /* depth */, |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 175 | const std::string &name, |
Yifan Hong | be2a373 | 2016-10-05 13:33:41 -0700 | [diff] [blame] | 176 | const std::string & /*sanitizedName */, |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 177 | bool nameIsPointer, |
| 178 | const std::string &parcelObj, |
| 179 | bool parcelObjIsPointer, |
| 180 | bool isReader, |
| 181 | ErrorMode mode, |
| 182 | const std::string &parentName, |
| 183 | const std::string &offsetText) const { |
| 184 | emitReaderWriterEmbeddedForTypeName( |
| 185 | out, |
| 186 | name, |
| 187 | nameIsPointer, |
| 188 | parcelObj, |
| 189 | parcelObjIsPointer, |
| 190 | isReader, |
| 191 | mode, |
| 192 | parentName, |
| 193 | offsetText, |
Andreas Huber | 0e00de4 | 2016-08-03 09:56:02 -0700 | [diff] [blame] | 194 | fullName(), |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 195 | "" /* childName */); |
| 196 | } |
| 197 | |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 198 | void CompoundType::emitJavaReaderWriter( |
| 199 | Formatter &out, |
| 200 | const std::string &parcelObj, |
| 201 | const std::string &argName, |
| 202 | bool isReader) const { |
| 203 | if (isReader) { |
| 204 | out << "new " << fullJavaName() << "();\n"; |
| 205 | } |
| 206 | |
| 207 | out << argName |
| 208 | << "." |
| 209 | << (isReader ? "readFromParcel" : "writeToParcel") |
| 210 | << "(" |
| 211 | << parcelObj |
| 212 | << ");\n"; |
| 213 | } |
| 214 | |
| 215 | void CompoundType::emitJavaFieldInitializer( |
| 216 | Formatter &out, const std::string &fieldName) const { |
| 217 | out << "final " |
| 218 | << fullJavaName() |
| 219 | << " " |
| 220 | << fieldName |
| 221 | << " = new " |
| 222 | << fullJavaName() |
| 223 | << "();\n"; |
| 224 | } |
| 225 | |
| 226 | void CompoundType::emitJavaFieldReaderWriter( |
| 227 | Formatter &out, |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 228 | size_t /* depth */, |
Andreas Huber | 709b62d | 2016-09-19 11:21:18 -0700 | [diff] [blame] | 229 | const std::string &parcelName, |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 230 | const std::string &blobName, |
| 231 | const std::string &fieldName, |
| 232 | const std::string &offset, |
| 233 | bool isReader) const { |
| 234 | if (isReader) { |
| 235 | out << fieldName |
Andreas Huber | 709b62d | 2016-09-19 11:21:18 -0700 | [diff] [blame] | 236 | << ".readEmbeddedFromParcel(" |
| 237 | << parcelName |
| 238 | << ", " |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 239 | << blobName |
| 240 | << ", " |
| 241 | << offset |
| 242 | << ");\n"; |
| 243 | |
| 244 | return; |
| 245 | } |
| 246 | |
| 247 | out << fieldName |
| 248 | << ".writeEmbeddedToBlob(" |
| 249 | << blobName |
| 250 | << ", " |
| 251 | << offset |
| 252 | << ");\n"; |
| 253 | } |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 254 | void CompoundType::emitResolveReferences( |
| 255 | Formatter &out, |
| 256 | const std::string &name, |
| 257 | bool nameIsPointer, |
| 258 | const std::string &parcelObj, |
| 259 | bool parcelObjIsPointer, |
| 260 | bool isReader, |
| 261 | ErrorMode mode) const { |
| 262 | emitResolveReferencesEmbedded( |
| 263 | out, |
| 264 | 0 /* depth */, |
| 265 | name, |
| 266 | name /* sanitizedName */, |
| 267 | nameIsPointer, |
| 268 | parcelObj, |
| 269 | parcelObjIsPointer, |
| 270 | isReader, |
| 271 | mode, |
| 272 | "_hidl_" + name + "_parent", |
| 273 | "0 /* parentOffset */"); |
| 274 | } |
| 275 | |
| 276 | void CompoundType::emitResolveReferencesEmbedded( |
| 277 | Formatter &out, |
| 278 | size_t /* depth */, |
| 279 | const std::string &name, |
| 280 | const std::string &/* sanitizedName */, |
| 281 | bool nameIsPointer, |
| 282 | const std::string &parcelObj, |
| 283 | bool parcelObjIsPointer, |
| 284 | bool isReader, |
| 285 | ErrorMode mode, |
| 286 | const std::string &parentName, |
| 287 | const std::string &offsetText) const { |
| 288 | CHECK(needsResolveReferences()); |
| 289 | |
| 290 | const std::string parcelObjDeref = |
| 291 | parcelObjIsPointer ? ("*" + parcelObj) : parcelObj; |
| 292 | |
| 293 | const std::string parcelObjPointer = |
| 294 | parcelObjIsPointer ? parcelObj : ("&" + parcelObj); |
| 295 | |
| 296 | const std::string nameDeref = name + (nameIsPointer ? "->" : "."); |
| 297 | const std::string namePointer = nameIsPointer ? name : ("&" + name); |
| 298 | |
| 299 | out << "_hidl_err = "; |
| 300 | |
| 301 | if (isReader) { |
| 302 | out << "const_cast<" |
| 303 | << fullName() |
| 304 | << " *" |
| 305 | << ">(" |
| 306 | << namePointer |
| 307 | << ")->readEmbeddedReferenceFromParcel(\n"; |
| 308 | } else { |
| 309 | out << nameDeref |
| 310 | << "writeEmbeddedReferenceToParcel(\n"; |
| 311 | } |
| 312 | |
| 313 | out.indent(); |
| 314 | out.indent(); |
| 315 | |
| 316 | out << (isReader ? parcelObjDeref : parcelObjPointer); |
| 317 | out << ",\n" |
| 318 | << parentName |
| 319 | << ",\n" |
| 320 | << offsetText; |
| 321 | |
| 322 | out << ");\n\n"; |
| 323 | |
| 324 | out.unindent(); |
| 325 | out.unindent(); |
| 326 | |
| 327 | handleError(out, mode); |
| 328 | } |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 329 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 330 | status_t CompoundType::emitTypeDeclarations(Formatter &out) const { |
| 331 | out << ((mStyle == STYLE_STRUCT) ? "struct" : "union") |
| 332 | << " " |
Andreas Huber | 0e00de4 | 2016-08-03 09:56:02 -0700 | [diff] [blame] | 333 | << localName() |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 334 | << " {\n"; |
| 335 | |
| 336 | out.indent(); |
| 337 | |
| 338 | Scope::emitTypeDeclarations(out); |
| 339 | |
| 340 | for (const auto &field : *mFields) { |
| 341 | std::string extra; |
| 342 | out << field->type().getCppType(&extra) |
| 343 | << " " |
| 344 | << field->name() |
| 345 | << extra |
| 346 | << ";\n"; |
| 347 | } |
| 348 | |
| 349 | if (needsEmbeddedReadWrite()) { |
| 350 | out << "\n::android::status_t readEmbeddedFromParcel(\n"; |
| 351 | |
| 352 | out.indent(); |
| 353 | out.indent(); |
| 354 | |
Andreas Huber | 8a82ff7 | 2016-08-04 10:29:39 -0700 | [diff] [blame] | 355 | out << "const ::android::hardware::Parcel &parcel,\n" |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 356 | << "size_t parentHandle,\n" |
| 357 | << "size_t parentOffset);\n\n"; |
| 358 | |
| 359 | out.unindent(); |
| 360 | out.unindent(); |
| 361 | |
| 362 | out << "::android::status_t writeEmbeddedToParcel(\n"; |
| 363 | |
| 364 | out.indent(); |
| 365 | out.indent(); |
| 366 | |
Andreas Huber | 8a82ff7 | 2016-08-04 10:29:39 -0700 | [diff] [blame] | 367 | out << "::android::hardware::Parcel *parcel,\n" |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 368 | << "size_t parentHandle,\n" |
| 369 | << "size_t parentOffset) const;\n"; |
| 370 | |
| 371 | out.unindent(); |
| 372 | out.unindent(); |
| 373 | } |
| 374 | |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 375 | if(needsResolveReferences()) { |
| 376 | out << "\n"; |
| 377 | out << "::android::status_t readEmbeddedReferenceFromParcel(\n"; |
| 378 | out.indent(); out.indent(); |
| 379 | out << "const ::android::hardware::Parcel &parcel,\n" |
| 380 | << "size_t parentHandle, size_t parentOffset);\n"; |
| 381 | out.unindent(); out.unindent(); |
| 382 | out << "::android::status_t writeEmbeddedReferenceToParcel(\n"; |
| 383 | out.indent(); out.indent(); |
| 384 | out << "::android::hardware::Parcel *,\n" |
| 385 | << "size_t parentHandle, size_t parentOffset) const;\n"; |
| 386 | out.unindent(); out.unindent(); |
| 387 | } |
| 388 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 389 | out.unindent(); |
| 390 | out << "};\n\n"; |
| 391 | |
| 392 | return OK; |
| 393 | } |
| 394 | |
| 395 | status_t CompoundType::emitTypeDefinitions( |
| 396 | Formatter &out, const std::string prefix) const { |
Andreas Huber | 0e00de4 | 2016-08-03 09:56:02 -0700 | [diff] [blame] | 397 | status_t err = Scope::emitTypeDefinitions(out, prefix + "::" + localName()); |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 398 | |
| 399 | if (err != OK) { |
| 400 | return err; |
| 401 | } |
| 402 | |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 403 | if (needsEmbeddedReadWrite()) { |
| 404 | emitStructReaderWriter(out, prefix, true /* isReader */); |
| 405 | emitStructReaderWriter(out, prefix, false /* isReader */); |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 406 | } |
| 407 | |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 408 | if (needsResolveReferences()) { |
| 409 | emitResolveReferenceDef(out, prefix, true /* isReader */); |
| 410 | emitResolveReferenceDef(out, prefix, false /* isReader */); |
| 411 | } |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 412 | |
| 413 | return OK; |
| 414 | } |
| 415 | |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 416 | status_t CompoundType::emitJavaTypeDeclarations( |
| 417 | Formatter &out, bool atTopLevel) const { |
| 418 | out << "public final "; |
| 419 | |
| 420 | if (!atTopLevel) { |
| 421 | out << "static "; |
| 422 | } |
| 423 | |
| 424 | out << "class " |
| 425 | << localName() |
| 426 | << " {\n"; |
| 427 | |
| 428 | out.indent(); |
| 429 | |
| 430 | Scope::emitJavaTypeDeclarations(out, false /* atTopLevel */); |
| 431 | |
| 432 | for (const auto &field : *mFields) { |
| 433 | const bool isScope = field->type().isScope(); // really isStruct... |
| 434 | |
| 435 | out << "public "; |
| 436 | |
| 437 | field->type().emitJavaFieldInitializer(out, field->name()); |
| 438 | } |
| 439 | |
| 440 | if (!mFields->empty()) { |
| 441 | out << "\n"; |
| 442 | } |
| 443 | |
| 444 | out << "public final void readFromParcel(HwParcel parcel) {\n"; |
| 445 | out.indent(); |
| 446 | out << "HwBlob blob = parcel.readBuffer();\n"; |
| 447 | out << "readEmbeddedFromParcel(parcel, blob, 0 /* parentOffset */);\n"; |
| 448 | out.unindent(); |
| 449 | out << "}\n\n"; |
| 450 | |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 451 | //////////////////////////////////////////////////////////////////////////// |
| 452 | |
| 453 | out << "public static final " |
| 454 | << localName() |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 455 | << "[] readVectorFromParcel(HwParcel parcel) {\n"; |
| 456 | out.indent(); |
| 457 | |
Andreas Huber | f1abc2a | 2016-09-28 09:14:43 -0700 | [diff] [blame] | 458 | out << "ArrayList<" |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 459 | << localName() |
Andreas Huber | f1abc2a | 2016-09-28 09:14:43 -0700 | [diff] [blame] | 460 | << "> _hidl_vec = new ArrayList();\n"; |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 461 | |
| 462 | out << "HwBlob _hidl_blob = parcel.readBuffer();\n\n"; |
| 463 | |
| 464 | VectorType::EmitJavaFieldReaderWriterForElementType( |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 465 | out, |
| 466 | 0 /* depth */, |
| 467 | this, |
Andreas Huber | 709b62d | 2016-09-19 11:21:18 -0700 | [diff] [blame] | 468 | "parcel", |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 469 | "_hidl_blob", |
| 470 | "_hidl_vec", |
| 471 | "0", |
| 472 | true /* isReader */); |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 473 | |
| 474 | out << "\nreturn _hidl_vec.toArray(new " |
| 475 | << localName() |
| 476 | << "[_hidl_vec.size()]);\n"; |
| 477 | |
| 478 | out.unindent(); |
| 479 | out << "}\n\n"; |
| 480 | |
| 481 | //////////////////////////////////////////////////////////////////////////// |
| 482 | |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 483 | out << "public final void readEmbeddedFromParcel(\n"; |
| 484 | out.indent(); |
| 485 | out.indent(); |
| 486 | out << "HwParcel parcel, HwBlob _hidl_blob, long _hidl_offset) {\n"; |
| 487 | out.unindent(); |
| 488 | |
| 489 | size_t offset = 0; |
| 490 | for (const auto &field : *mFields) { |
| 491 | size_t fieldAlign, fieldSize; |
| 492 | field->type().getAlignmentAndSize(&fieldAlign, &fieldSize); |
| 493 | |
| 494 | size_t pad = offset % fieldAlign; |
| 495 | if (pad > 0) { |
| 496 | offset += fieldAlign - pad; |
| 497 | } |
| 498 | |
| 499 | field->type().emitJavaFieldReaderWriter( |
| 500 | out, |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 501 | 0 /* depth */, |
Andreas Huber | 709b62d | 2016-09-19 11:21:18 -0700 | [diff] [blame] | 502 | "parcel", |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 503 | "_hidl_blob", |
| 504 | field->name(), |
| 505 | "_hidl_offset + " + std::to_string(offset), |
| 506 | true /* isReader */); |
| 507 | |
| 508 | offset += fieldSize; |
| 509 | } |
| 510 | |
| 511 | out.unindent(); |
| 512 | out << "}\n\n"; |
| 513 | |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 514 | //////////////////////////////////////////////////////////////////////////// |
| 515 | |
Andreas Huber | 709b62d | 2016-09-19 11:21:18 -0700 | [diff] [blame] | 516 | size_t structAlign, structSize; |
| 517 | getAlignmentAndSize(&structAlign, &structSize); |
| 518 | |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 519 | out << "public final void writeToParcel(HwParcel parcel) {\n"; |
| 520 | out.indent(); |
| 521 | |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 522 | out << "HwBlob _hidl_blob = new HwBlob(" |
| 523 | << structSize |
| 524 | << " /* size */);\n"; |
| 525 | |
| 526 | out << "writeEmbeddedToBlob(_hidl_blob, 0 /* parentOffset */);\n" |
| 527 | << "parcel.writeBuffer(_hidl_blob);\n"; |
| 528 | |
| 529 | out.unindent(); |
| 530 | out << "}\n\n"; |
| 531 | |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 532 | //////////////////////////////////////////////////////////////////////////// |
| 533 | |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 534 | out << "public static final void writeVectorToParcel(\n"; |
| 535 | out.indent(); |
| 536 | out.indent(); |
| 537 | out << "HwParcel parcel, " |
| 538 | << localName() |
| 539 | << "[] _hidl_array) {\n"; |
| 540 | out.unindent(); |
| 541 | |
Andreas Huber | f1abc2a | 2016-09-28 09:14:43 -0700 | [diff] [blame] | 542 | out << "ArrayList<" |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 543 | << localName() |
Andreas Huber | f1abc2a | 2016-09-28 09:14:43 -0700 | [diff] [blame] | 544 | << "> _hidl_vec = new ArrayList(Arrays.asList(_hidl_array));\n"; |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 545 | |
| 546 | out << "HwBlob _hidl_blob = new HwBlob(24 /* sizeof(hidl_vec<T>) */);\n"; |
| 547 | |
| 548 | VectorType::EmitJavaFieldReaderWriterForElementType( |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 549 | out, |
| 550 | 0 /* depth */, |
| 551 | this, |
Andreas Huber | 709b62d | 2016-09-19 11:21:18 -0700 | [diff] [blame] | 552 | "parcel", |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 553 | "_hidl_blob", |
| 554 | "_hidl_vec", |
| 555 | "0", |
| 556 | false /* isReader */); |
Andreas Huber | f630bc8 | 2016-09-09 14:52:25 -0700 | [diff] [blame] | 557 | |
| 558 | out << "\nparcel.writeBuffer(_hidl_blob);\n"; |
| 559 | |
| 560 | out.unindent(); |
| 561 | out << "}\n\n"; |
| 562 | |
| 563 | //////////////////////////////////////////////////////////////////////////// |
| 564 | |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 565 | out << "public final void writeEmbeddedToBlob(\n"; |
| 566 | out.indent(); |
| 567 | out.indent(); |
| 568 | out << "HwBlob _hidl_blob, long _hidl_offset) {\n"; |
| 569 | out.unindent(); |
| 570 | |
| 571 | offset = 0; |
| 572 | for (const auto &field : *mFields) { |
| 573 | size_t fieldAlign, fieldSize; |
| 574 | field->type().getAlignmentAndSize(&fieldAlign, &fieldSize); |
| 575 | |
| 576 | size_t pad = offset % fieldAlign; |
| 577 | if (pad > 0) { |
| 578 | offset += fieldAlign - pad; |
| 579 | } |
| 580 | |
| 581 | field->type().emitJavaFieldReaderWriter( |
| 582 | out, |
Andreas Huber | 4c865b7 | 2016-09-14 15:26:27 -0700 | [diff] [blame] | 583 | 0 /* depth */, |
Andreas Huber | 709b62d | 2016-09-19 11:21:18 -0700 | [diff] [blame] | 584 | "parcel", |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 585 | "_hidl_blob", |
| 586 | field->name(), |
| 587 | "_hidl_offset + " + std::to_string(offset), |
| 588 | false /* isReader */); |
| 589 | |
| 590 | offset += fieldSize; |
| 591 | } |
| 592 | |
| 593 | out.unindent(); |
| 594 | out << "}\n"; |
| 595 | |
| 596 | out.unindent(); |
| 597 | out << "};\n\n"; |
| 598 | |
| 599 | return OK; |
| 600 | } |
| 601 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 602 | void CompoundType::emitStructReaderWriter( |
| 603 | Formatter &out, const std::string &prefix, bool isReader) const { |
| 604 | out << "::android::status_t " |
| 605 | << (prefix.empty() ? "" : (prefix + "::")) |
Andreas Huber | 0e00de4 | 2016-08-03 09:56:02 -0700 | [diff] [blame] | 606 | << localName() |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 607 | << (isReader ? "::readEmbeddedFromParcel" |
| 608 | : "::writeEmbeddedToParcel") |
| 609 | << "(\n"; |
| 610 | |
| 611 | out.indent(); |
| 612 | out.indent(); |
| 613 | |
| 614 | if (isReader) { |
Andreas Huber | 8a82ff7 | 2016-08-04 10:29:39 -0700 | [diff] [blame] | 615 | out << "const ::android::hardware::Parcel &parcel,\n"; |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 616 | } else { |
Andreas Huber | 8a82ff7 | 2016-08-04 10:29:39 -0700 | [diff] [blame] | 617 | out << "::android::hardware::Parcel *parcel,\n"; |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 618 | } |
| 619 | |
| 620 | out << "size_t parentHandle,\n" |
| 621 | << "size_t parentOffset)"; |
| 622 | |
| 623 | if (!isReader) { |
| 624 | out << " const"; |
| 625 | } |
| 626 | |
| 627 | out << " {\n"; |
| 628 | |
| 629 | out.unindent(); |
| 630 | out.unindent(); |
| 631 | out.indent(); |
| 632 | |
Iliyan Malchev | 549e259 | 2016-08-10 08:59:12 -0700 | [diff] [blame] | 633 | out << "::android::status_t _hidl_err = ::android::OK;\n\n"; |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 634 | |
| 635 | for (const auto &field : *mFields) { |
| 636 | if (!field->type().needsEmbeddedReadWrite()) { |
| 637 | continue; |
| 638 | } |
| 639 | |
| 640 | field->type().emitReaderWriterEmbedded( |
| 641 | out, |
Andreas Huber | f9d49f1 | 2016-09-12 14:58:36 -0700 | [diff] [blame] | 642 | 0 /* depth */, |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 643 | field->name(), |
Yifan Hong | be2a373 | 2016-10-05 13:33:41 -0700 | [diff] [blame] | 644 | field->name() /* sanitizedName */, |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 645 | false /* nameIsPointer */, |
| 646 | "parcel", |
| 647 | !isReader /* parcelObjIsPointer */, |
| 648 | isReader, |
Andreas Huber | 737080b | 2016-08-02 15:38:04 -0700 | [diff] [blame] | 649 | ErrorMode_Return, |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 650 | "parentHandle", |
Andreas Huber | 0e00de4 | 2016-08-03 09:56:02 -0700 | [diff] [blame] | 651 | "parentOffset + offsetof(" |
| 652 | + fullName() |
| 653 | + ", " |
| 654 | + field->name() |
| 655 | + ")"); |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 656 | } |
| 657 | |
| 658 | out.unindent(); |
Iliyan Malchev | 549e259 | 2016-08-10 08:59:12 -0700 | [diff] [blame] | 659 | out << "_hidl_error:\n"; |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 660 | out.indent(); |
Iliyan Malchev | 549e259 | 2016-08-10 08:59:12 -0700 | [diff] [blame] | 661 | out << "return _hidl_err;\n"; |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 662 | |
| 663 | out.unindent(); |
| 664 | out << "}\n\n"; |
| 665 | } |
| 666 | |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 667 | void CompoundType::emitResolveReferenceDef( |
| 668 | Formatter &out, const std::string prefix, bool isReader) const { |
| 669 | out << "::android::status_t " |
| 670 | << (prefix.empty() ? "" : (prefix + "::")) |
| 671 | << localName(); |
| 672 | |
Yifan Hong | 00f4717 | 2016-09-30 14:40:45 -0700 | [diff] [blame] | 673 | |
| 674 | bool useParent = false; |
| 675 | for (const auto &field : *mFields) { |
| 676 | if (field->type().useParentInEmitResolveReferencesEmbedded()) { |
| 677 | useParent = true; |
| 678 | break; |
| 679 | } |
| 680 | } |
| 681 | |
| 682 | std::string parentHandleName = useParent ? "parentHandle" : "/* parentHandle */"; |
| 683 | std::string parentOffsetName = useParent ? "parentOffset" : "/* parentOffset */"; |
| 684 | |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 685 | if (isReader) { |
| 686 | out << "::readEmbeddedReferenceFromParcel(\n"; |
| 687 | out.indent(); out.indent(); |
| 688 | out << "const ::android::hardware::Parcel &parcel,\n" |
Yifan Hong | 00f4717 | 2016-09-30 14:40:45 -0700 | [diff] [blame] | 689 | << "size_t " << parentHandleName << ", " |
| 690 | << "size_t " << parentOffsetName << ")\n"; |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 691 | out.unindent(); out.unindent(); |
| 692 | } else { |
| 693 | out << "::writeEmbeddedReferenceToParcel(\n"; |
| 694 | out.indent(); out.indent(); |
| 695 | out << "::android::hardware::Parcel *parcel,\n" |
Yifan Hong | 00f4717 | 2016-09-30 14:40:45 -0700 | [diff] [blame] | 696 | << "size_t " << parentHandleName << ", " |
| 697 | << "size_t " << parentOffsetName << ") const\n"; |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 698 | out.unindent(); out.unindent(); |
| 699 | } |
| 700 | |
| 701 | out << " {\n"; |
| 702 | |
| 703 | out.indent(); |
| 704 | |
| 705 | out << "::android::status_t _hidl_err = ::android::OK;\n\n"; |
| 706 | |
Yifan Hong | 00f4717 | 2016-09-30 14:40:45 -0700 | [diff] [blame] | 707 | // if not useParent, then parentName and offsetText |
| 708 | // should not be used at all, then the #error should not be emitted. |
| 709 | std::string error = useParent ? "" : "\n#error\n"; |
| 710 | |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 711 | for (const auto &field : *mFields) { |
| 712 | if (!field->type().needsResolveReferences()) { |
| 713 | continue; |
| 714 | } |
| 715 | |
| 716 | field->type().emitResolveReferencesEmbedded( |
| 717 | out, |
| 718 | 0 /* depth */, |
| 719 | field->name(), |
| 720 | field->name() /* sanitizedName */, |
| 721 | false, // nameIsPointer |
| 722 | "parcel", // const std::string &parcelObj, |
| 723 | !isReader, // bool parcelObjIsPointer, |
| 724 | isReader, // bool isReader, |
| 725 | ErrorMode_Return, |
Yifan Hong | 00f4717 | 2016-09-30 14:40:45 -0700 | [diff] [blame] | 726 | parentHandleName + error, |
| 727 | parentOffsetName |
| 728 | + " + offsetof(" |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 729 | + fullName() |
| 730 | + ", " |
| 731 | + field->name() |
Yifan Hong | 00f4717 | 2016-09-30 14:40:45 -0700 | [diff] [blame] | 732 | + ")" |
| 733 | + error); |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 734 | } |
| 735 | |
| 736 | out.unindent(); |
| 737 | out << "_hidl_error:\n"; |
| 738 | out.indent(); |
| 739 | out << "return _hidl_err;\n"; |
| 740 | |
| 741 | out.unindent(); |
| 742 | out << "}\n\n"; |
| 743 | } |
| 744 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 745 | bool CompoundType::needsEmbeddedReadWrite() const { |
| 746 | if (mStyle != STYLE_STRUCT) { |
| 747 | return false; |
| 748 | } |
| 749 | |
| 750 | for (const auto &field : *mFields) { |
| 751 | if (field->type().needsEmbeddedReadWrite()) { |
| 752 | return true; |
| 753 | } |
| 754 | } |
| 755 | |
| 756 | return false; |
| 757 | } |
| 758 | |
Yifan Hong | bf459bc | 2016-08-23 16:50:37 -0700 | [diff] [blame] | 759 | bool CompoundType::needsResolveReferences() const { |
| 760 | if (mStyle != STYLE_STRUCT) { |
| 761 | return false; |
| 762 | } |
| 763 | |
| 764 | for (const auto &field : *mFields) { |
| 765 | if (field->type().needsResolveReferences()) { |
| 766 | return true; |
| 767 | } |
| 768 | } |
| 769 | |
| 770 | return false; |
| 771 | } |
| 772 | |
Andreas Huber | 881227d | 2016-08-02 14:20:21 -0700 | [diff] [blame] | 773 | bool CompoundType::resultNeedsDeref() const { |
| 774 | return true; |
| 775 | } |
| 776 | |
Zhuoyao Zhang | 5158db4 | 2016-08-10 10:25:20 -0700 | [diff] [blame] | 777 | status_t CompoundType::emitVtsTypeDeclarations(Formatter &out) const { |
| 778 | out << "name: \"" << localName() << "\"\n"; |
Zhuoyao Zhang | c5ea9f5 | 2016-10-06 15:05:39 -0700 | [diff] [blame^] | 779 | out << "type: " << getVtsType() << "\n"; |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 780 | |
| 781 | // Emit declaration for each subtype. |
| 782 | for (const auto &type : getSubTypes()) { |
| 783 | switch (mStyle) { |
| 784 | case STYLE_STRUCT: |
| 785 | { |
Zhuoyao Zhang | c5ea9f5 | 2016-10-06 15:05:39 -0700 | [diff] [blame^] | 786 | out << "sub_struct: {\n"; |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 787 | break; |
| 788 | } |
| 789 | case STYLE_UNION: |
| 790 | { |
Zhuoyao Zhang | c5ea9f5 | 2016-10-06 15:05:39 -0700 | [diff] [blame^] | 791 | out << "sub_union: {\n"; |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 792 | break; |
| 793 | } |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 794 | } |
| 795 | out.indent(); |
| 796 | status_t status(type->emitVtsTypeDeclarations(out)); |
Zhuoyao Zhang | 5158db4 | 2016-08-10 10:25:20 -0700 | [diff] [blame] | 797 | if (status != OK) { |
| 798 | return status; |
| 799 | } |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 800 | out.unindent(); |
| 801 | out << "}\n"; |
Zhuoyao Zhang | 5158db4 | 2016-08-10 10:25:20 -0700 | [diff] [blame] | 802 | } |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 803 | |
| 804 | // Emit declaration for each field. |
| 805 | for (const auto &field : *mFields) { |
| 806 | switch (mStyle) { |
| 807 | case STYLE_STRUCT: |
| 808 | { |
| 809 | out << "struct_value: {\n"; |
| 810 | break; |
| 811 | } |
| 812 | case STYLE_UNION: |
| 813 | { |
| 814 | out << "union_value: {\n"; |
| 815 | break; |
| 816 | } |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 817 | } |
| 818 | out.indent(); |
| 819 | out << "name: \"" << field->name() << "\"\n"; |
| 820 | status_t status = field->type().emitVtsAttributeType(out); |
| 821 | if (status != OK) { |
| 822 | return status; |
| 823 | } |
| 824 | out.unindent(); |
| 825 | out << "}\n"; |
| 826 | } |
Zhuoyao Zhang | 5158db4 | 2016-08-10 10:25:20 -0700 | [diff] [blame] | 827 | |
| 828 | return OK; |
| 829 | } |
| 830 | |
Zhuoyao Zhang | 864c771 | 2016-08-16 15:35:28 -0700 | [diff] [blame] | 831 | status_t CompoundType::emitVtsAttributeType(Formatter &out) const { |
Zhuoyao Zhang | c5ea9f5 | 2016-10-06 15:05:39 -0700 | [diff] [blame^] | 832 | out << "type: " << getVtsType() << "\n"; |
Zhuoyao Zhang | 5158db4 | 2016-08-10 10:25:20 -0700 | [diff] [blame] | 833 | out << "predefined_type: \"" << localName() << "\"\n"; |
| 834 | return OK; |
| 835 | } |
| 836 | |
Andreas Huber | 70a59e1 | 2016-08-16 12:57:01 -0700 | [diff] [blame] | 837 | bool CompoundType::isJavaCompatible() const { |
Andreas Huber | 0fa9e39 | 2016-08-31 09:05:44 -0700 | [diff] [blame] | 838 | if (mStyle != STYLE_STRUCT || !Scope::isJavaCompatible()) { |
| 839 | return false; |
| 840 | } |
| 841 | |
| 842 | for (const auto &field : *mFields) { |
| 843 | if (!field->type().isJavaCompatible()) { |
| 844 | return false; |
| 845 | } |
| 846 | } |
| 847 | |
| 848 | return true; |
Andreas Huber | 85eabdb | 2016-08-25 11:24:49 -0700 | [diff] [blame] | 849 | } |
| 850 | |
| 851 | void CompoundType::getAlignmentAndSize(size_t *align, size_t *size) const { |
| 852 | *align = 1; |
| 853 | |
| 854 | size_t offset = 0; |
| 855 | for (const auto &field : *mFields) { |
| 856 | // Each field is aligned according to its alignment requirement. |
| 857 | // The surrounding structure's alignment is the maximum of its |
| 858 | // fields' aligments. |
| 859 | |
| 860 | size_t fieldAlign, fieldSize; |
| 861 | field->type().getAlignmentAndSize(&fieldAlign, &fieldSize); |
| 862 | |
| 863 | size_t pad = offset % fieldAlign; |
| 864 | if (pad > 0) { |
| 865 | offset += fieldAlign - pad; |
| 866 | } |
| 867 | |
| 868 | offset += fieldSize; |
| 869 | |
| 870 | if (fieldAlign > (*align)) { |
| 871 | *align = fieldAlign; |
| 872 | } |
| 873 | } |
| 874 | |
| 875 | // Final padding to account for the structure's alignment. |
| 876 | size_t pad = offset % (*align); |
| 877 | if (pad > 0) { |
| 878 | offset += (*align) - pad; |
| 879 | } |
| 880 | |
| 881 | *size = offset; |
Andreas Huber | 70a59e1 | 2016-08-16 12:57:01 -0700 | [diff] [blame] | 882 | } |
| 883 | |
Andreas Huber | 31629bc | 2016-08-03 09:06:40 -0700 | [diff] [blame] | 884 | //////////////////////////////////////////////////////////////////////////////// |
| 885 | |
| 886 | CompoundField::CompoundField(const char *name, Type *type) |
| 887 | : mName(name), |
| 888 | mType(type) { |
| 889 | } |
| 890 | |
| 891 | std::string CompoundField::name() const { |
| 892 | return mName; |
| 893 | } |
| 894 | |
| 895 | const Type &CompoundField::type() const { |
| 896 | return *mType; |
| 897 | } |
| 898 | |
Andreas Huber | c9410c7 | 2016-07-28 12:18:40 -0700 | [diff] [blame] | 899 | } // namespace android |
| 900 | |