racc 1.4.16 → 1.6.0

data/lib/racc/debugflags.rb

@@ -1,13 +1,14 @@
+#--
+#
 #
-# $Id: 74ff4369ce53c7f45cfc2644ce907785104ebf6e $
 #
 # 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 LGPL, see the file "COPYING".
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 #
+#++
 
 module Racc
 

data/lib/racc/exception.rb

@@ -1,11 +1,14 @@
+#--
+#
 #
-# $Id: ebb9798ad0b211e031670a12a1ab154678c1c8f3 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
 # 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,11 +1,14 @@
+#--
+#
 #
-# $Id: 3fcabd58bef02540bf78e8142469681cb9f975c2 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
 # see the file "COPYING".
+#
+#++
 
 require 'racc/compat'
 require 'racc/iset'
@@ -83,14 +86,15 @@ module Racc
     end
 
     def n_useless_nonterminals
-      @n_useless_nonterminals ||=
-          begin
-            n = 0
-            @symboltable.each_nonterminal do |sym|
-              n += 1 if sym.useless?
-            end
-            n
-          end
+      @n_useless_nonterminals ||= each_useless_nonterminal.count
+    end
+
+    def each_useless_nonterminal
+      return to_enum __method__ unless block_given?
+
+      @symboltable.each_nonterminal do |sym|
+        yield sym if sym.useless?
+      end
     end
 
     def useless_rule_exist?
@@ -98,14 +102,15 @@ module Racc
     end
 
     def n_useless_rules
-      @n_useless_rules ||=
-          begin
-            n = 0
-            each do |r|
-              n += 1 if r.useless?
-            end
-            n
-          end
+      @n_useless_rules ||= each_useless_rule.count
+    end
+
+    def each_useless_rule
+      return to_enum __method__ unless block_given?
+
+      each do |r|
+        yield r if r.useless?
+      end
     end
 
     def nfa

data/lib/racc/grammarfileparser.rb

@@ -1,13 +1,14 @@
+#--
+#
 #
-# $Id: 63bd084db2dce8a2c9760318faae6104717cead7 $
 #
 # 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'
 require 'racc/compat'
@@ -286,7 +287,7 @@ module Racc
     end
 
     def add_user_code(label, src)
-      @result.params.send(USER_CODE_LABELS[label]).push src
+      @result.params.public_send(USER_CODE_LABELS[label]).push src
     end
 
   end
@@ -427,7 +428,7 @@ module Racc
     $raccs_print_type = false
 
     def scan_action
-      buf = ''
+      buf = String.new
       nest = 1
       pre = nil
       @in_block = 'action'

data/lib/racc/info.rb

@@ -1,14 +1,17 @@
+#--
+#
 #
-# $Id: 8ab2cb5341529fe5e35956bb1a1f42ec9b9c6f5a $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
 # see the file "COPYING".
+#
+#++
 
 module Racc
-  VERSION   = '1.4.16'
+  VERSION   = '1.6.0'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end

data/lib/racc/iset.rb

@@ -1,13 +1,14 @@
+#--
+#
 #
-# $Id: 31aa4331c08dfd4609c06eb5f94b7ef38dc708e1 $
 #
 # 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
 

data/lib/racc/logfilegenerator.rb

@@ -1,13 +1,14 @@
+#--
+#
 #
-# $Id: 5e9d0a01b5d56fd9cdc3d5cb078b1a3e1bbaf779 $
 #
 # 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
 

data/lib/racc/parser-text.rb

@@ -31,7 +31,7 @@ end
 # == Command-line Reference
 #
 #     racc [-o<var>filename</var>] [--output-file=<var>filename</var>]
-#          [-e<var>rubypath</var>] [--embedded=<var>rubypath</var>]
+#          [-e<var>rubypath</var>] [--executable=<var>rubypath</var>]
 #          [-v] [--verbose]
 #          [-O<var>filename</var>] [--log-file=<var>filename</var>]
 #          [-g] [--debug]
@@ -43,7 +43,7 @@ end
 #          [-S] [--output-status]
 #          [--version] [--copyright] [--help] <var>grammarfile</var>
 #
-# [+filename+]
+# [+grammarfile+]
 #   Racc grammar file. Any extension is permitted.
 # [-o+outfile+, --output-file=+outfile+]
 #   A filename for output. default is <+filename+>.tab.rb
@@ -181,45 +181,39 @@ end
 # Your own parser is completely yours.
 module Racc
 
-  unless defined?(Racc_No_Extentions)
-    Racc_No_Extentions = false # :nodoc:
+  unless defined?(Racc_No_Extensions)
+    Racc_No_Extensions = false # :nodoc:
   end
 
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: 7adc21ee7a5690f10b7ff399b8af4e2717b9d94c $'
-
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: 7adc21ee7a5690f10b7ff399b8af4e2717b9d94c $'.split[1]
+
     begin
       if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+        require 'jruby'
         require 'racc/cparse-jruby.jar'
         com.headius.racc.Cparse.new.load(JRuby.runtime, false)
       else
         require 'racc/cparse'
       end
-    # Racc_Runtime_Core_Version_C  = (defined in extention)
-      Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
+
       unless new.respond_to?(:_racc_do_parse_c, true)
         raise LoadError, 'old cparse.so'
       end
-      if Racc_No_Extentions
+      if Racc_No_Extensions
         raise LoadError, 'selecting ruby version of racc runtime core'
       end
 
       Racc_Main_Parsing_Routine    = :_racc_do_parse_c # :nodoc:
       Racc_YY_Parse_Method         = :_racc_yyparse_c # :nodoc:
       Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C # :nodoc:
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_C # :nodoc:
       Racc_Runtime_Type            = 'c' # :nodoc:
     rescue LoadError
-puts $!
-puts $!.backtrace
       Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
       Racc_YY_Parse_Method         = :_racc_yyparse_rb
       Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
       Racc_Runtime_Type            = 'ruby'
     end
 
@@ -332,7 +326,7 @@ puts $!.backtrace
     # It must 'yield' the token, which format is [TOKEN-SYMBOL, VALUE].
     class_eval %{
     def yyparse(recv, mid)
-      #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), true)
+      #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), false)
     end
     }
 
@@ -554,7 +548,7 @@ puts $!.backtrace
     end
 
     # Exit parser.
-    # Return value is Symbol_Value_Stack[0].
+    # Return value is +Symbol_Value_Stack[0]+.
     def yyaccept
       throw :racc_jump, 2
     end

data/lib/racc/parser.rb

@@ -29,7 +29,7 @@ end
 # == Command-line Reference
 #
 #     racc [-o<var>filename</var>] [--output-file=<var>filename</var>]
-#          [-e<var>rubypath</var>] [--embedded=<var>rubypath</var>]
+#          [-e<var>rubypath</var>] [--executable=<var>rubypath</var>]
 #          [-v] [--verbose]
 #          [-O<var>filename</var>] [--log-file=<var>filename</var>]
 #          [-g] [--debug]
@@ -41,7 +41,7 @@ end
 #          [-S] [--output-status]
 #          [--version] [--copyright] [--help] <var>grammarfile</var>
 #
-# [+filename+]
+# [+grammarfile+]
 #   Racc grammar file. Any extension is permitted.
 # [-o+outfile+, --output-file=+outfile+]
 #   A filename for output. default is <+filename+>.tab.rb
@@ -179,45 +179,39 @@ end
 # Your own parser is completely yours.
 module Racc
 
-  unless defined?(Racc_No_Extentions)
-    Racc_No_Extentions = false # :nodoc:
+  unless defined?(Racc_No_Extensions)
+    Racc_No_Extensions = false # :nodoc:
   end
 
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: e754525bd317344c4284fca6fdce0a425979ade1 $'
-
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: e754525bd317344c4284fca6fdce0a425979ade1 $'.split[1]
+
     begin
       if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+        require 'jruby'
         require 'racc/cparse-jruby.jar'
         com.headius.racc.Cparse.new.load(JRuby.runtime, false)
       else
         require 'racc/cparse'
       end
-    # Racc_Runtime_Core_Version_C  = (defined in extention)
-      Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
+
       unless new.respond_to?(:_racc_do_parse_c, true)
         raise LoadError, 'old cparse.so'
       end
-      if Racc_No_Extentions
+      if Racc_No_Extensions
         raise LoadError, 'selecting ruby version of racc runtime core'
       end
 
       Racc_Main_Parsing_Routine    = :_racc_do_parse_c # :nodoc:
       Racc_YY_Parse_Method         = :_racc_yyparse_c # :nodoc:
       Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C # :nodoc:
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_C # :nodoc:
       Racc_Runtime_Type            = 'c' # :nodoc:
     rescue LoadError
-puts $!
-puts $!.backtrace
       Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
       Racc_YY_Parse_Method         = :_racc_yyparse_rb
       Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
       Racc_Runtime_Type            = 'ruby'
     end
 
@@ -330,7 +324,7 @@ puts $!.backtrace
     # It must 'yield' the token, which format is [TOKEN-SYMBOL, VALUE].
     class_eval %{
     def yyparse(recv, mid)
-      #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), true)
+      #{Racc_YY_Parse_Method}(recv, mid, _racc_setup(), false)
     end
     }
 
@@ -552,7 +546,7 @@ puts $!.backtrace
     end
 
     # Exit parser.
-    # Return value is Symbol_Value_Stack[0].
+    # Return value is +Symbol_Value_Stack[0]+.
     def yyaccept
       throw :racc_jump, 2
     end

data/lib/racc/parserfilegenerator.rb

@@ -1,13 +1,15 @@
+#--
+#
 #
-# $Id: fff07ebfd582f8dbc845e424908cb9f41f8bf42f $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
 # see the file "COPYING".
+#
+#++
 
-require 'enumerator'
 require 'racc/compat'
 require 'racc/sourcetext'
 require 'racc/parser-text'
@@ -235,7 +237,7 @@ module Racc
     end
 
     def unique_separator(id)
-      sep = "...end #{id}/module_eval..."
+      sep = String.new "...end #{id}/module_eval..."
       while @used_separator.key?(sep)
         sep.concat sprintf('%02x', rand(255))
       end
@@ -318,50 +320,6 @@ module Racc
     end
 
     def integer_list(name, table)
-      if table.size > 2000
-        serialize_integer_list_compressed name, table
-      else
-        serialize_integer_list_std name, table
-      end
-    end
-
-    def serialize_integer_list_compressed(name, table)
-      # TODO: this can be made a LOT more clean with a simple split/map
-      sep  = "\n"
-      nsep = ",\n"
-      buf  = ''
-      com  = ''
-      ncom = ','
-      co   = com
-      @f.print 'clist = ['
-      table.each do |i|
-        buf << co << i.to_s; co = ncom
-        if buf.size > 66
-          @f.print sep; sep = nsep
-          @f.print "'", buf, "'"
-          buf = ''
-          co = com
-        end
-      end
-      unless buf.empty?
-        @f.print sep
-        @f.print "'", buf, "'"
-      end
-      line ' ]'
-
-      @f.print(<<-End)
-        #{name} = arr = ::Array.new(#{table.size}, nil)
-        idx = 0
-        clist.each do |str|
-          str.split(',', -1).each do |i|
-            arr[idx] = i.to_i unless i.empty?
-            idx += 1
-          end
-        end
-      End
-    end
-
-    def serialize_integer_list_std(name, table)
       sep = ''
       line "#{name} = ["
       table.each_slice(10) do |ns|

data/lib/racc/sourcetext.rb

@@ -1,13 +1,14 @@
+#--
+#
 #
-# $Id: 3b2d89d9ada2f5fcb043837dcc5c9631856d5b70 $
 #
 # 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 LGPL, see the file "COPYING".
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 #
+#++
 
 module Racc
 

data/lib/racc/state.rb

@@ -1,11 +1,14 @@
+#--
+#
 #
-# $Id: 6bd3136439c94cb8d928917f5e0de9c593181527 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
 # see the file "COPYING".
+#
+#++
 
 require 'racc/iset'
 require 'racc/statetransitiontable'

data/lib/racc/statetransitiontable.rb

@@ -1,22 +1,17 @@
+#--
+#
 #
-# $Id: 4c5f4311663b6d03050953d64d6a0e7905ff2216 $
 #
 # 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 LGPL, see the file "COPYING".
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 #
+#++
 
 require 'racc/parser'
 
-unless Object.method_defined?(:funcall)
-  class Object
-    alias funcall __send__
-  end
-end
-
 module Racc
 
   StateTransitionTable = Struct.new(:action_table,
@@ -196,7 +191,7 @@ module Racc
     def mkmapexp(arr)
       i = ii = 0
       as = arr.size
-      map = ''
+      map = String.new
       maxdup = RE_DUP_MAX
       curr = nil
       while i < as
@@ -229,7 +224,7 @@ module Racc
       map = '-' * 10240
 
       # sort long to short
-      entries.sort! {|a,b| b[0].size <=> a[0].size }
+      entries.sort_by!.with_index {|a,i| [-a[0].size, i] }
 
       entries.each do |arr, chkval, expr, min, ptri|
         if upper + arr.size > map.size
@@ -299,9 +294,9 @@ module Racc
       c.module_eval "def _reduce_none(vals, vstack) vals[0] end"
       @grammar.each do |rule|
         if rule.action.empty?
-          c.funcall(:alias_method, "_reduce_#{rule.ident}", :_reduce_none)
+          c.alias_method("_reduce_#{rule.ident}", :_reduce_none)
         else
-          c.funcall(:define_method, "_racc_action_#{rule.ident}", &rule.action.proc)
+          c.define_method("_racc_action_#{rule.ident}", &rule.action.proc)
           c.module_eval(<<-End, __FILE__, __LINE__ + 1)
             def _reduce_#{rule.ident}(vals, vstack)
               _racc_action_#{rule.ident}(*vals)