ruby-changes:58504
From: Hiroshi <ko1@a...>
Date: Wed, 30 Oct 2019 21:37:50 +0900 (JST)
Subject: [ruby-changes:58504] 6c3ed0d71c (master): Update the latest versions from upstream repository of racc
https://git.ruby-lang.org/ruby.git/commit/?id=6c3ed0d71c From 6c3ed0d71cb1b59be5b2fbc886b5dd962ab74d35 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Wed, 30 Oct 2019 21:36:59 +0900 Subject: Update the latest versions from upstream repository of racc diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb index a9187b5..47b455d 100644 --- a/ext/racc/cparse/extconf.rb +++ b/ext/racc/cparse/extconf.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/racc/cparse/extconf.rb#L1 # frozen_string_literal: false -# $Id$ +# $Id: a9187b5bc40e6adf05e7b6ee5b370b39a3429ecd $ require 'mkmf' diff --git a/lib/racc/exception.rb b/lib/racc/exception.rb index bd46fcb..0069ca3 100644 --- a/lib/racc/exception.rb +++ b/lib/racc/exception.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/exception.rb#L1 # -# $Id: d5858363d1d4a4b5a2ca8d193b5153a49312188e $ +# $Id: ebb9798ad0b211e031670a12a1ab154678c1c8f3 $ # # Copyright (c) 1999-2006 Minero Aoki # diff --git a/lib/racc/grammar.rb b/lib/racc/grammar.rb index cc4e48e..123f1f1 100644 --- a/lib/racc/grammar.rb +++ b/lib/racc/grammar.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/grammar.rb#L1 # -# $Id: acc33b7e1fe05f28f2d271f1fb9f1c42e50705dc $ +# $Id: 3fcabd58bef02540bf78e8142469681cb9f975c2 $ # # Copyright (c) 1999-2006 Minero Aoki # diff --git a/lib/racc/grammarfileparser.rb b/lib/racc/grammarfileparser.rb index 488f3e6..ff7c682 100644 --- a/lib/racc/grammarfileparser.rb +++ b/lib/racc/grammarfileparser.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/grammarfileparser.rb#L1 # -# $Id: 5e1871defa15d288d2252e6a76bb2c4cf2119ed3 $ +# $Id: 0e355164c34f7baf8a813f76a138b8924ec3269a $ # # Copyright (c) 1999-2006 Minero Aoki # diff --git a/lib/racc/info.rb b/lib/racc/info.rb index c688fed..3a6e7f6 100644 --- a/lib/racc/info.rb +++ b/lib/racc/info.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/info.rb#L1 # -# $Id: 10d9595b388ab1ba061c08c038901ff632a0c3c3 $ +# $Id: 8ab2cb5341529fe5e35956bb1a1f42ec9b9c6f5a $ # # Copyright (c) 1999-2006 Minero Aoki # diff --git a/lib/racc/iset.rb b/lib/racc/iset.rb index 1e5fcf5..245bad8 100644 --- a/lib/racc/iset.rb +++ b/lib/racc/iset.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/iset.rb#L1 # -# $Id: de638608cfd72d3ed9819d87b65a89ee6a57b589 $ +# $Id: 31aa4331c08dfd4609c06eb5f94b7ef38dc708e1 $ # # Copyright (c) 1999-2006 Minero Aoki # diff --git a/lib/racc/logfilegenerator.rb b/lib/racc/logfilegenerator.rb index 05a4e0c..68593c4 100644 --- a/lib/racc/logfilegenerator.rb +++ b/lib/racc/logfilegenerator.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/logfilegenerator.rb#L1 # -# $Id: a7e9663605afdda065d305b250a9805e3bd3fa70 $ +# $Id: 5e9d0a01b5d56fd9cdc3d5cb078b1a3e1bbaf779 $ # # Copyright (c) 1999-2006 Minero Aoki # diff --git a/lib/racc/parser-text.rb b/lib/racc/parser-text.rb index 07ff41a..63ef323 100644 --- a/lib/racc/parser-text.rb +++ b/lib/racc/parser-text.rb @@ -1,8 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/parser-text.rb#L1 module Racc PARSER_TEXT = <<'__end_of_file__' -# -# $Id: 1c0ef52c0f41acc465725e9e44b5b9d74d392ba5 $ -# +# frozen_string_literal: false +#-- # Copyright (c) 1999-2006 Minero Aoki # # This program is free software. @@ -11,7 +10,7 @@ module Racc https://github.com/ruby/ruby/blob/trunk/lib/racc/parser-text.rb#L10 # As a special exception, when this code is copied by Racc # into a Racc output file, you may use that output file # without restriction. -# +#++ require 'racc/info' @@ -45,7 +44,7 @@ end https://github.com/ruby/ruby/blob/trunk/lib/racc/parser-text.rb#L44 # [--version] [--copyright] [--help] <var>grammarfile</var> # # [+filename+] -# Racc grammar file. Any extention is permitted. +# Racc grammar file. Any extension is permitted. # [-o+outfile+, --output-file=+outfile+] # A filename for output. default is <+filename+>.tab.rb # [-O+filename+, --log-file=+filename+] @@ -189,10 +188,10 @@ module Racc https://github.com/ruby/ruby/blob/trunk/lib/racc/parser-text.rb#L188 class Parser Racc_Runtime_Version = ::Racc::VERSION - Racc_Runtime_Revision = '$Id: 1c0ef52c0f41acc465725e9e44b5b9d74d392ba5 $' + Racc_Runtime_Revision = '$Id: 87af5c09d4467cae567837b4162ec2145417a90e $' Racc_Runtime_Core_Version_R = ::Racc::VERSION - Racc_Runtime_Core_Revision_R = '$Id: 1c0ef52c0f41acc465725e9e44b5b9d74d392ba5 $'.split[1] + Racc_Runtime_Core_Revision_R = '$Id: 87af5c09d4467cae567837b4162ec2145417a90e $'.split[1] begin if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby' require 'racc/cparse-jruby.jar' @@ -269,9 +268,11 @@ puts $!.backtrace https://github.com/ruby/ruby/blob/trunk/lib/racc/parser-text.rb#L268 # def next_token # @q.shift # end + class_eval %{ def do_parse - __send__(Racc_Main_Parsing_Routine, _racc_setup(), false) + #{Racc_Main_Parsing_Routine}(_racc_setup(), false) end + } # The method to fetch next token. # If you use #do_parse method, you must implement #next_token. @@ -329,9 +330,11 @@ puts $!.backtrace https://github.com/ruby/ruby/blob/trunk/lib/racc/parser-text.rb#L330 # # RECEIVER#METHOD_ID is a method to get next token. # It must 'yield' the token, which format is [TOKEN-SYMBOL, VALUE]. + class_eval %{ def yyparse(recv, mid) - __send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), false) + #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), true) end + } def _racc_yyparse_rb(recv, mid, arg, c_debug) action_table, action_check, action_default, action_pointer, diff --git a/lib/racc/parserfilegenerator.rb b/lib/racc/parserfilegenerator.rb index 35c6357..b4fac62 100644 --- a/lib/racc/parserfilegenerator.rb +++ b/lib/racc/parserfilegenerator.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/parserfilegenerator.rb#L1 # -# $Id: 19fb5debfd07d70f6bc2ddc79ef43fbb3d27f15e $ +# $Id: 67117a7ef68abc59a11abce2b42084f65cddb2ca $ # # Copyright (c) 1999-2006 Minero Aoki # diff --git a/lib/racc/state.rb b/lib/racc/state.rb index 814d14d..51b1d83 100644 --- a/lib/racc/state.rb +++ b/lib/racc/state.rb @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/racc/state.rb#L1 # -# $Id: a101d6acb72abc392f7757cda89bf6f0a683a43d $ +# $Id: 6bd3136439c94cb8d928917f5e0de9c593181527 $ # # Copyright (c) 1999-2006 Minero Aoki # -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/