diff options
author | Tianjie Xu <xunchang@google.com> | 2016-10-18 02:15:29 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 02:15:29 +0200 |
commit | 430b7ae4699eb3685dcc0f7c736a9aebd76829a8 (patch) | |
tree | e237b84e2e6f4cd6a562f88ab3e491eca8767e9f /edify/expr.h | |
parent | Merge "init: move healthd to late-init" (diff) | |
parent | Merge "Change StringValue to use std::string" (diff) | |
download | android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.gz android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.bz2 android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.lz android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.xz android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.zst android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.zip |
Diffstat (limited to 'edify/expr.h')
-rw-r--r-- | edify/expr.h | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/edify/expr.h b/edify/expr.h index cd6139a18..85306542d 100644 --- a/edify/expr.h +++ b/edify/expr.h @@ -48,13 +48,19 @@ struct State { bool is_retry = false; }; -#define VAL_STRING 1 // data will be NULL-terminated; size doesn't count null -#define VAL_BLOB 2 +enum ValueType { + VAL_INVALID = -1, + VAL_STRING = 1, + VAL_BLOB = 2, +}; struct Value { - int type; - ssize_t size; - char* data; + ValueType type; + std::string data; + + Value(ValueType type, const std::string& str) : + type(type), + data(str) {} }; struct Expr; @@ -75,11 +81,11 @@ struct Expr { Value* EvaluateValue(State* state, Expr* expr); // Take one of the Expr*s passed to the function as an argument, -// evaluate it, assert that it is a string, and return the resulting -// char*. The caller takes ownership of the returned char*. This is -// a convenience function for older functions that want to deal only -// with strings. -char* Evaluate(State* state, Expr* expr); +// evaluate it, assert that it is a string, and update the result +// parameter. This function returns true if the evaluation succeeds. +// This is a convenience function for older functions that want to +// deal only with strings. +bool Evaluate(State* state, Expr* expr, std::string* result); // Glue to make an Expr out of a literal. Value* Literal(const char* name, State* state, int argc, Expr* argv[]); @@ -114,6 +120,17 @@ Function FindFunction(const std::string& name); // --- convenience functions for use in functions --- +// Evaluate the expressions in argv, and put the results of strings in +// args. If any expression evaluates to nullptr, free the rest and return +// false. Return true on success. +bool ReadArgs(State* state, int argc, Expr* argv[], std::vector<std::string>* args); + +// Evaluate the expressions in argv, and put the results of Value* in +// args. If any expression evaluate to nullptr, free the rest and return +// false. Return true on success. +bool ReadValueArgs(State* state, int argc, Expr* argv[], + std::vector<std::unique_ptr<Value>>* args); + // Evaluate the expressions in argv, giving 'count' char* (the ... is // zero or more char** to put them in). If any expression evaluates // to NULL, free the rest and return -1. Return 0 on success. @@ -146,11 +163,10 @@ Value* ErrorAbort(State* state, const char* format, ...) Value* ErrorAbort(State* state, CauseCode cause_code, const char* format, ...) __attribute__((format(printf, 3, 4))); -// Wrap a string into a Value, taking ownership of the string. -Value* StringValue(char* str); +// Copying the string into a Value. +Value* StringValue(const char* str); -// Free a Value object. -void FreeValue(Value* v); +Value* StringValue(const std::string& str); int parse_string(const char* str, Expr** root, int* error_count); |