summaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-07-09 22:32:28 +0200
committerTao Bao <tbao@google.com>2018-07-10 08:27:50 +0200
commitd8d514fa33a2f2f9504732a19fdba81a6ccccbd7 (patch)
tree1b4ad7625bdb4f4b7a56fe855d8c5199b691dd88 /edify
parentMerge "applypatch: Restrict applypatch_check to eMMC targets." (diff)
downloadandroid_bootable_recovery-d8d514fa33a2f2f9504732a19fdba81a6ccccbd7.tar
android_bootable_recovery-d8d514fa33a2f2f9504732a19fdba81a6ccccbd7.tar.gz
android_bootable_recovery-d8d514fa33a2f2f9504732a19fdba81a6ccccbd7.tar.bz2
android_bootable_recovery-d8d514fa33a2f2f9504732a19fdba81a6ccccbd7.tar.lz
android_bootable_recovery-d8d514fa33a2f2f9504732a19fdba81a6ccccbd7.tar.xz
android_bootable_recovery-d8d514fa33a2f2f9504732a19fdba81a6ccccbd7.tar.zst
android_bootable_recovery-d8d514fa33a2f2f9504732a19fdba81a6ccccbd7.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 770d1cf0d..b922a9bd2 100644
--- a/edify/include/edify/expr.h
+++ b/edify/include/edify/expr.h
@@ -156,6 +156,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);
}