summaryrefslogtreecommitdiffstats
path: root/edify/expr.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-07-10 19:05:39 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-07-10 19:05:39 +0200
commit6f60263d5ee8008d2f611cb6c49d7b70d0077431 (patch)
tree28768203f70081c7d5a76e872618ac0da67b735d /edify/expr.cpp
parentMerge "applypatch: Restrict applypatch_check to eMMC targets." am: e02cbaaa62 am: 254d43a3b9 (diff)
parentMerge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043 (diff)
downloadandroid_bootable_recovery-6f60263d5ee8008d2f611cb6c49d7b70d0077431.tar
android_bootable_recovery-6f60263d5ee8008d2f611cb6c49d7b70d0077431.tar.gz
android_bootable_recovery-6f60263d5ee8008d2f611cb6c49d7b70d0077431.tar.bz2
android_bootable_recovery-6f60263d5ee8008d2f611cb6c49d7b70d0077431.tar.lz
android_bootable_recovery-6f60263d5ee8008d2f611cb6c49d7b70d0077431.tar.xz
android_bootable_recovery-6f60263d5ee8008d2f611cb6c49d7b70d0077431.tar.zst
android_bootable_recovery-6f60263d5ee8008d2f611cb6c49d7b70d0077431.zip
Diffstat (limited to 'edify/expr.cpp')
-rw-r--r--edify/expr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/edify/expr.cpp b/edify/expr.cpp
index 6823b7339..c090eb28a 100644
--- a/edify/expr.cpp
+++ b/edify/expr.cpp
@@ -51,9 +51,9 @@ bool Evaluate(State* state, const std::unique_ptr<Expr>& expr, std::string* resu
if (!v) {
return false;
}
- if (v->type != VAL_STRING) {
- ErrorAbort(state, kArgsParsingFailure, "expecting string, got value type %d", v->type);
- return false;
+ if (v->type != Value::Type::STRING) {
+ ErrorAbort(state, kArgsParsingFailure, "expecting string, got value type %d", v->type);
+ return false;
}
*result = v->data;
@@ -68,7 +68,7 @@ Value* StringValue(const char* str) {
if (str == nullptr) {
return nullptr;
}
- return new Value(VAL_STRING, str);
+ return new Value(Value::Type::STRING, str);
}
Value* StringValue(const std::string& str) {