ConstantExpression: description included in value.
Now the value when it is used always includes the description which simplifies
code that wants to print values (they don't have to check if the description is
trivial and then create a comment themselves).
Bug: 37525755
Test: hidl_test
Test: run_all_host_tests.sh
Change-Id: I82ad50f45cc47095897a416bcbff4c886cfe1924
diff --git a/Annotation.cpp b/Annotation.cpp
index e5a66b0..438cff6 100644
--- a/Annotation.cpp
+++ b/Annotation.cpp
@@ -84,24 +84,17 @@
const std::string& name, std::vector<ConstantExpression*>* values)
: AnnotationParam(name), mValues(values) {}
-std::string convertToString(const ConstantExpression* value) {
- if (value->descriptionIsTrivial()) {
- return value->value();
- }
- return value->value() + " /* " + value->description() + " */";
-}
-
std::vector<std::string> ConstantExpressionAnnotationParam::getValues() const {
std::vector<std::string> ret;
for (const auto* value : *mValues) {
- ret.push_back(convertToString(value));
+ ret.push_back(value->value());
};
return ret;
}
std::string ConstantExpressionAnnotationParam::getSingleValue() const {
CHECK_EQ(mValues->size(), 1u) << mName << " requires one value but has multiple";
- return convertToString(mValues->at(0));
+ return mValues->at(0)->value();
}
std::vector<const ConstantExpression*> ConstantExpressionAnnotationParam::getConstantExpressions()