summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-11-09 22:04:28 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-11-10 09:51:50 +0900
commitb7504af8fc73b92ae13b4cf3a65d2417d219ecb4 (patch)
tree8d09d32ae88d70170b69c737df1f264b7958f4cf
parent5a4d9f91c4678a4b821fc9cc3be77058b1235bf9 (diff)
Preprocess for older bison is no longer needed
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6701
-rw-r--r--common.mk2
-rw-r--r--ext/ripper/depend2
-rwxr-xr-xtool/pure_parser.rb24
3 files changed, 0 insertions, 28 deletions
diff --git a/common.mk b/common.mk
index 88934378f4..81f99b1458 100644
--- a/common.mk
+++ b/common.mk
@@ -956,8 +956,6 @@ PHONY:
{$(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
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 @@
-#!/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+.*/, '')