Merge "edify: update for bison 3.5" am: 1477c867f7 am: 1dccf9c474 am: eeeac0514b

Change-Id: I8a8d2454a1f429b64beaa9067c96c679b679a93b
diff --git a/edify/parser.yy b/edify/parser.yy
index 3a63c37..37bcdd0 100644
--- a/edify/parser.yy
+++ b/edify/parser.yy
@@ -72,7 +72,7 @@
 
 %parse-param {std::unique_ptr<Expr>* root}
 %parse-param {int* error_count}
-%error-verbose
+%define parse.error verbose
 
 /* declarations in increasing order of precedence */
 %left ';'