diff options
| author | Tao Bao <tbao@google.com> | 2018-07-10 18:38:08 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-10 18:38:08 +0200 |
| commit | 6b18eb706e626e432b3d0a2846cdc124b7ff1b94 (patch) | |
| tree | 8c57252a6e8fe6e20966402ac1675562082407d8 /edify | |
| parent | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." (diff) | |
| parent | edify: Rename parse_string to ParseString and let it take std::string. (diff) | |
| download | android_bootable_recovery-6b18eb706e626e432b3d0a2846cdc124b7ff1b94.tar android_bootable_recovery-6b18eb706e626e432b3d0a2846cdc124b7ff1b94.tar.gz android_bootable_recovery-6b18eb706e626e432b3d0a2846cdc124b7ff1b94.tar.bz2 android_bootable_recovery-6b18eb706e626e432b3d0a2846cdc124b7ff1b94.tar.lz android_bootable_recovery-6b18eb706e626e432b3d0a2846cdc124b7ff1b94.tar.xz android_bootable_recovery-6b18eb706e626e432b3d0a2846cdc124b7ff1b94.tar.zst android_bootable_recovery-6b18eb706e626e432b3d0a2846cdc124b7ff1b94.zip | |
Diffstat (limited to 'edify')
| -rw-r--r-- | edify/include/edify/expr.h | 2 | ||||
| -rw-r--r-- | edify/parser.yy | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/edify/include/edify/expr.h b/edify/include/edify/expr.h index ccd200778..5cbd5e15d 100644 --- a/edify/include/edify/expr.h +++ b/edify/include/edify/expr.h @@ -153,6 +153,6 @@ Value* StringValue(const char* str); Value* StringValue(const std::string& str); -int parse_string(const char* str, std::unique_ptr<Expr>* root, int* error_count); +int ParseString(const std::string& str, std::unique_ptr<Expr>* root, int* error_count); #endif // _EXPRESSION_H diff --git a/edify/parser.yy b/edify/parser.yy index bd2e0105f..3a63c37f8 100644 --- a/edify/parser.yy +++ b/edify/parser.yy @@ -138,7 +138,7 @@ void yyerror(std::unique_ptr<Expr>* root, int* error_count, const char* s) { ++*error_count; } -int parse_string(const char* str, std::unique_ptr<Expr>* root, int* error_count) { - yy_switch_to_buffer(yy_scan_string(str)); - return yyparse(root, error_count); +int ParseString(const std::string& str, std::unique_ptr<Expr>* root, int* error_count) { + yy_switch_to_buffer(yy_scan_string(str.c_str())); + return yyparse(root, error_count); } |