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

Change-Id: Ieccbcd941d6cf811628a33c81175ecf8b3c48b12

edify/parser.yy

@@ -72,7 +72,7 @@ static Expr* Build(Function fn, YYLTYPE loc, size_t count, ...) {
 
 %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 ';'