summaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-07-10 19:12:09 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-07-10 19:12:09 +0200
commit0a2916b96a6d9cc6c3c71adab971373183d697b2 (patch)
treee69d95fe4e282125295a9103f7c82517273c7728 /edify
parentMerge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043 am: d8a2c2682a (diff)
parentMerge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e (diff)
downloadandroid_bootable_recovery-0a2916b96a6d9cc6c3c71adab971373183d697b2.tar
android_bootable_recovery-0a2916b96a6d9cc6c3c71adab971373183d697b2.tar.gz
android_bootable_recovery-0a2916b96a6d9cc6c3c71adab971373183d697b2.tar.bz2
android_bootable_recovery-0a2916b96a6d9cc6c3c71adab971373183d697b2.tar.lz
android_bootable_recovery-0a2916b96a6d9cc6c3c71adab971373183d697b2.tar.xz
android_bootable_recovery-0a2916b96a6d9cc6c3c71adab971373183d697b2.tar.zst
android_bootable_recovery-0a2916b96a6d9cc6c3c71adab971373183d697b2.zip
Diffstat (limited to 'edify')
-rw-r--r--edify/include/edify/expr.h2
-rw-r--r--edify/parser.yy6
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);
}