racc 1.4.15 → 1.4.16

data/ext/racc/cparse/extconf.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: false
+# $Id: a9187b5bc40e6adf05e7b6ee5b370b39a3429ecd $
+
+require 'mkmf'
+
+have_func('rb_ary_subseq')
+
+create_makefile 'racc/cparse'

data/lib/racc/exception.rb

@@ -1,13 +1,11 @@
 #
-# $Id: a26517cc7b6a673ce1985c8c75fba88492e1e820 $
+# $Id: ebb9798ad0b211e031670a12a1ab154678c1c8f3 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of the GNU LGPL, see the file "COPYING".
-#
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 
 module Racc
   class Error < StandardError; end

data/lib/racc/grammar.rb

@@ -1,13 +1,11 @@
 #
-# $Id: 733f7084ff1dca50994cba55c8a05aba8d82eb31 $
+# $Id: 3fcabd58bef02540bf78e8142469681cb9f975c2 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of the GNU LGPL, see the file "COPYING".
-#
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 
 require 'racc/compat'
 require 'racc/iset'
@@ -571,7 +569,7 @@ module Racc
         check_symbols_useless s
       end until r.size == rs and s.size == ss
     end
-    
+
     def check_rules_useless(rules)
       rules.delete_if do |rule|
         rule.useless = false
@@ -855,7 +853,7 @@ module Racc
     end
 
     private
-    
+
     def ptr_bug!
       raise "racc: fatal: pointer not exist: self: #{to_s}"
     end

data/lib/racc/grammarfileparser.rb

@@ -1,5 +1,5 @@
 #
-# $Id: 5e1871defa15d288d2252e6a76bb2c4cf2119ed3 $
+# $Id: 63bd084db2dce8a2c9760318faae6104717cead7 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -284,7 +284,7 @@ module Racc
       end
       label
     end
-    
+
     def add_user_code(label, src)
       @result.params.send(USER_CODE_LABELS[label]).push src
     end
@@ -295,7 +295,7 @@ module Racc
   class GrammarFileScanner
 
     def initialize(str, filename = '-')
-      @lines  = str.split(/\n|\r\n|\r/)
+      @lines  = str.b.split(/\n|\r\n|\r/)
       @filename = filename
       @lineno = -1
       @line_head   = true
@@ -450,6 +450,7 @@ module Racc
             nest -= 1
             if nest == 0
               @in_block = nil
+              buf.sub!(/[ \t\f]+\z/, '')
               return buf
             end
             buf << (pre = ch)

data/lib/racc/info.rb

@@ -1,16 +1,14 @@
 #
-# $Id: cb493ec682225ae384145f255590797788f7ef12 $
+# $Id: 8ab2cb5341529fe5e35956bb1a1f42ec9b9c6f5a $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of the GNU LGPL, see the file "COPYING".
-#
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 
 module Racc
-  VERSION   = '1.4.15'
+  VERSION   = '1.4.16'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end

data/lib/racc/iset.rb

@@ -1,5 +1,5 @@
 #
-# $Id: de638608cfd72d3ed9819d87b65a89ee6a57b589 $
+# $Id: 31aa4331c08dfd4609c06eb5f94b7ef38dc708e1 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -85,7 +85,7 @@ module Racc
     def dup
       ISet.new(@set.dup)
     end
-  
+
   end   # class ISet
 
 end   # module Racc

data/lib/racc/logfilegenerator.rb

@@ -1,5 +1,5 @@
 #
-# $Id: a7e9663605afdda065d305b250a9805e3bd3fa70 $
+# $Id: 5e9d0a01b5d56fd9cdc3d5cb078b1a3e1bbaf779 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -132,7 +132,7 @@ module Racc
     def outact(f, t, act)
       case act
       when Shift
-        f.printf "  %-12s  shift, and go to state %d\n", 
+        f.printf "  %-12s  shift, and go to state %d\n",
                  t.to_s, act.goto_id
       when Reduce
         f.printf "  %-12s  reduce using rule %d (%s)\n",

data/lib/racc/parser-text.rb

@@ -1,8 +1,7 @@
 module Racc
   PARSER_TEXT = <<'__end_of_file__'
-#
-# $Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $
-#
+# frozen_string_literal: false
+#--
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
@@ -11,7 +10,7 @@ module Racc
 # 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
 #          [--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+]
@@ -61,7 +60,7 @@ end
 # [-E, --embedded]
 #   Output parser which doesn't need runtime files (racc/parser.rb).
 # [-C, --check-only]
-#   Check syntax of racc grammer file and quit.
+#   Check syntax of racc grammar file and quit.
 # [-S, --output-status]
 #   Print messages time to time while compiling.
 # [-l, --no-line-convert]
@@ -178,7 +177,7 @@ end
 # This command creates myparser.rb which `includes' Racc runtime.
 # Only you must do is to distribute your parser file (myparser.rb).
 #
-# Note: parser.rb is LGPL, but your parser is not.
+# Note: parser.rb is ruby license, but your parser is not.
 # Your own parser is completely yours.
 module Racc
 
@@ -189,10 +188,10 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'
+    Racc_Runtime_Revision = '$Id: 7adc21ee7a5690f10b7ff399b8af4e2717b9d94c $'
 
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: 7adc21ee7a5690f10b7ff399b8af4e2717b9d94c $'.split[1]
     begin
       if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
         require 'racc/cparse-jruby.jar'
@@ -269,9 +268,11 @@ puts $!.backtrace
     #     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
     #
     # 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,

data/lib/racc/parser.rb

@@ -1,6 +1,5 @@
-#
-# $Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $
-#
+# frozen_string_literal: false
+#--
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
@@ -9,7 +8,7 @@
 # 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'
 
@@ -43,7 +42,7 @@ end
 #          [--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+]
@@ -59,7 +58,7 @@ end
 # [-E, --embedded]
 #   Output parser which doesn't need runtime files (racc/parser.rb).
 # [-C, --check-only]
-#   Check syntax of racc grammer file and quit.
+#   Check syntax of racc grammar file and quit.
 # [-S, --output-status]
 #   Print messages time to time while compiling.
 # [-l, --no-line-convert]
@@ -176,7 +175,7 @@ end
 # This command creates myparser.rb which `includes' Racc runtime.
 # Only you must do is to distribute your parser file (myparser.rb).
 #
-# Note: parser.rb is LGPL, but your parser is not.
+# Note: parser.rb is ruby license, but your parser is not.
 # Your own parser is completely yours.
 module Racc
 
@@ -187,10 +186,10 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'
+    Racc_Runtime_Revision = '$Id: e754525bd317344c4284fca6fdce0a425979ade1 $'
 
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: e754525bd317344c4284fca6fdce0a425979ade1 $'.split[1]
     begin
       if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
         require 'racc/cparse-jruby.jar'
@@ -267,9 +266,11 @@ puts $!.backtrace
     #     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.
@@ -327,9 +328,11 @@ puts $!.backtrace
     #
     # 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,

data/lib/racc/parserfilegenerator.rb

@@ -1,13 +1,11 @@
 #
-# $Id: f2d2788af2323ada1913f1dad5fea8aae4cc6830 $
+# $Id: fff07ebfd582f8dbc845e424908cb9f41f8bf42f $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of the GNU LGPL, see the file "COPYING".
-#
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 
 require 'enumerator'
 require 'racc/compat'
@@ -125,7 +123,7 @@ module Racc
       line %q[#]
       line %q[# DO NOT MODIFY!!!!]
       line %Q[# This file is automatically generated by Racc #{Racc::Version}]
-      line %Q[# from Racc grammer file "#{@params.filename}".]
+      line %Q[# from Racc grammar file "#{@params.filename}".]
       line %q[#]
     end
 
@@ -159,8 +157,8 @@ module Racc
       cref_pop
       indent; line "end   \# class #{classid}"
       mods.reverse_each do |mod|
-        indent; line "end   \# module #{mod}"
         cref_pop
+        indent; line "end   \# module #{mod}"
       end
     end
 

data/lib/racc/state.rb

@@ -1,13 +1,11 @@
 #
-# $Id: 735e622baf286554d4a31d42664ea07b3a17115d $
+# $Id: 6bd3136439c94cb8d928917f5e0de9c593181527 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of the GNU LGPL, see the file "COPYING".
-#
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 
 require 'racc/iset'
 require 'racc/statetransitiontable'
@@ -170,7 +168,7 @@ module Racc
         @states.push dest
 
         @statecache[k] = dest
-        
+
         puts "core_to_state: create state   ID #{dest.ident}" if @d_state
       else
         if @d_state
@@ -308,7 +306,7 @@ module Racc
 
       la
     end
-    
+
     def create_tmap(size)
       Array.new(size, 0)   # use Integer as bitmap
     end
@@ -512,13 +510,13 @@ module Racc
         end
       end
     end
-    
+
     ASSOC = {
       :Left     => :Reduce,
       :Right    => :Shift,
       :Nonassoc => :Error
     }
-   
+
     def do_resolve_sr(stok, rtok)
       puts "resolve_sr: s/r conflict: rtok=#{rtok}, stok=#{stok}" if @d_prec
 
@@ -775,7 +773,7 @@ module Racc
     attr_reader :symbol
     attr_reader :from_state
     attr_reader :to_state
-    
+
     def inspect
       "(#{@from_state.ident}-#{@symbol}->#{@to_state.ident})"
     end
@@ -938,11 +936,11 @@ module Racc
       @shift   = shift
       @reduce  = reduce
     end
-    
+
     attr_reader :stateid
     attr_reader :shift
     attr_reader :reduce
-  
+
     def to_s
       sprintf('state %d: S/R conflict rule %d reduce and shift %s',
               @stateid, @reduce.ruleid, @shift.to_s)
@@ -961,7 +959,7 @@ module Racc
     attr_reader :high_prec
     attr_reader :low_prec
     attr_reader :token
-  
+
     def to_s
       sprintf('state %d: R/R conflict with rule %d and %d on %s',
               @stateid, @high_prec.ident, @low_prec.ident, @token.to_s)

data/test/assets/intp.y

@@ -27,7 +27,7 @@ rule
                   result.push val[1]
                 }
             | stmt_list EOL
-  
+
   stmt      : expr
             | assign
             | IDENT realprim
@@ -38,7 +38,7 @@ rule
             | if_stmt
             | while_stmt
             | defun
-  
+
   if_stmt   : IF stmt THEN EOL stmt_list else_stmt END
                 {
                   result = IfNode.new( @fname, val[0][0],
@@ -261,7 +261,7 @@ module Intp
 
   class Core
 
-    def initialize 
+    def initialize
       @ftab = {}
       @obj = Object.new
       @stack = []
@@ -318,7 +318,7 @@ module Intp
     def lvar?(name)
       @lvars.key? name
     end
-    
+
     def [](key)
       @lvars[key]
     end