[前][次][番号順一覧][スレッド一覧]

ruby-changes:74425

From: Nobuyoshi <ko1@a...>
Date: Thu, 10 Nov 2022 09:52:13 +0900 (JST)
Subject: [ruby-changes:74425] b7504af8fc (master): Preprocess for older bison is no longer needed

https://git.ruby-lang.org/ruby.git/commit/?id=b7504af8fc

From b7504af8fc73b92ae13b4cf3a65d2417d219ecb4 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 9 Nov 2022 22:04:28 +0900
Subject: Preprocess for older bison is no longer needed

---
 common.mk           |  2 --
 ext/ripper/depend   |  2 --
 tool/pure_parser.rb | 24 ------------------------
 3 files changed, 28 deletions(-)
 delete mode 100755 tool/pure_parser.rb

diff --git a/common.mk b/common.mk
index 88934378f4..81f99b1458 100644
--- a/common.mk
+++ b/common.mk
@@ -956,8 +956,6 @@ PHONY: https://github.com/ruby/ruby/blob/trunk/common.mk#L956
 {$(srcdir)}.y.c:
 	$(ECHO) generating $@
 	$(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) > parse.tmp.y
-	$(Q)$(BASERUBY) $(tooldir)/pure_parser.rb parse.tmp.y $(YACC)
-	$(Q)$(RM) parse.tmp.y.bak
 	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
 	$(Q)$(RM) parse.tmp.y
 	$(Q)sed -f $(tooldir)/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 15c557a8ef..c77e4e1b7a 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -20,8 +20,6 @@ static: check https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L20
 ripper.y: $(srcdir)/tools/preproc.rb $(srcdir)/tools/dsl.rb $(top_srcdir)/parse.y $(top_srcdir)/defs/id.def
 	$(ECHO) extracting $@ from $(top_srcdir)/parse.y
 	$(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb $(top_srcdir)/parse.y > ripper.tmp.y
-	$(Q) $(RUBY) $(top_srcdir)/tool/pure_parser.rb ripper.tmp.y $(BISON)
-	$(Q) $(RM) ripper.tmp.y.bak
 	$(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@
 	$(Q) $(RM) ripper.tmp.y
 
diff --git a/tool/pure_parser.rb b/tool/pure_parser.rb
deleted file mode 100755
index 21c87cc5d6..0000000000
--- a/tool/pure_parser.rb
+++ /dev/null
@@ -1,24 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L0
-#!/usr/bin/ruby -pi.bak
-BEGIN {
-  # pathological setting
-  ENV['LANG'] = ENV['LC_MESSAGES'] = ENV['LC_ALL'] = 'C'
-
-  require_relative 'lib/colorize'
-
-  colorize = Colorize.new
-  file = ARGV.shift
-  begin
-    version = IO.popen(ARGV+%w[--version], "rb", &:read)
-  rescue Errno::ENOENT
-    abort "Failed to run `#{colorize.fail ARGV.join(' ')}'; You may have to install it."
-  end
-  unless /\Abison .* (\d+)\.\d+/ =~ version
-    puts colorize.fail("not bison")
-    exit
-  end
-  exit if $1.to_i >= 3
-  ARGV.clear
-  ARGV.push(file)
-}
-$_.sub!(/^%define\s+api\.pure/, '%pure-parser')
-$_.sub!(/^%define\s+.*/, '')
-- 
cgit v1.2.3


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]