Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at 20.09 1.6 kB view raw
1From acab088fd6af0b2ef2df1396aeb93bfc2e020fa5 Mon Sep 17 00:00:00 2001 2From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp> 3Date: Mon, 27 Apr 2020 18:52:43 +0900 4Subject: [PATCH 1/2] Updating `parse.y for recent `bison` (retry). 5 6--- 7 mrbgems/mruby-compiler/core/parse.y | 2 +- 8 1 file changed, 1 insertion(+), 1 deletion(-) 9 10diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y 11index 6a1faf4e..2a4f740e 100644 12--- a/mrbgems/mruby-compiler/core/parse.y 13+++ b/mrbgems/mruby-compiler/core/parse.y 14@@ -1323,7 +1323,7 @@ heredoc_end(parser_state *p) 15 16 %} 17 18-%pure-parser 19+%define api.pure 20 %parse-param {parser_state *p} 21 %lex-param {parser_state *p} 22 23-- 242.27.0 25 26From 3cc682d943b29e84928a847a23f411ddbace74b7 Mon Sep 17 00:00:00 2001 27From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp> 28Date: Fri, 15 May 2020 12:30:13 +0900 29Subject: [PATCH 2/2] Remove `YYERROR_VERBOSE` which no longer supported since 30 `bison 3.6`. 31 32Instead we added `%define parse.error verbose`. 33--- 34 mrbgems/mruby-compiler/core/parse.y | 2 +- 35 1 file changed, 1 insertion(+), 1 deletion(-) 36 37diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y 38index 2a4f740e..eee6a5e5 100644 39--- a/mrbgems/mruby-compiler/core/parse.y 40+++ b/mrbgems/mruby-compiler/core/parse.y 41@@ -9,7 +9,6 @@ 42 #ifdef PARSER_DEBUG 43 # define YYDEBUG 1 44 #endif 45-#define YYERROR_VERBOSE 1 46 #define YYSTACK_USE_ALLOCA 1 47 48 #include <ctype.h> 49@@ -1323,6 +1322,7 @@ heredoc_end(parser_state *p) 50 51 %} 52 53+%define parse.error verbose 54 %define api.pure 55 %parse-param {parser_state *p} 56 %lex-param {parser_state *p} 57-- 582.27.0 59