racc 1.4.16 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a97d16998fb78f5a452333cbfd1ea30bda9b21bc28518ae866237f94d0c74d9
-  data.tar.gz: '031906844664c762e36e62a30b3ca3e0187055a0e809c7746c599abb3a62e29c'
+  metadata.gz: c1dc09f1fcbc04e87d099180c64c1566e34c7b1f59c734c60a3760b149bd1a99
+  data.tar.gz: b74af200ad861ddad78ff850a15d7f1554c032c6e24e46841b40a212ee620a0f
 SHA512:
-  metadata.gz: 178509fe90fa510f9249bfcc87ff99ae08006898213e9cbc6a49d33ba1760a42fef78e6163a6d9a3b01beb5cb36eef186b0b5ff0f761ed26487535bdc5d2bc9c
-  data.tar.gz: 32f021789662eebc5c11ba74ec99cc04ba7f242427cfa87a28bea5e9070bbc0b76b2beb49c5324a38e9c703aa9803d4db40746c0dc04bb627f666c02e7b3569e
+  metadata.gz: 18d137641877399ad7ca6f475405fee151af9975df5f04c894c62ed2cba11835b880da0399a69303f663f772ae2283fdd09ce4dce924463c1df8c739a3e30f29
+  data.tar.gz: 5bec7de05bc72b35614140184f4619419b488f878206ed44d5e59405cf55045e90bd1b2eacef0501bd8195f9db035802e2f3e8d569812948cd944097a6f800f6

data/README.ja.rdoc

@@ -1,7 +1,6 @@
 = Racc
 
 * http://i.loveruby.net/en/projects/racc/
-* http://racc.rubyforge.org/
 
 == DESCRIPTION:
 

data/README.rdoc

@@ -1,7 +1,6 @@
 = Racc
 
 * http://i.loveruby.net/en/projects/racc/
-* http://racc.rubyforge.org/
 
 == DESCRIPTION:
 
@@ -16,8 +15,6 @@
 == Requirement
 
   *  Ruby 1.8.x or later.
- (*) make and C compiler.
-
 
 == Installation
 
@@ -36,9 +33,9 @@
 
   You can install Racc into your favorite directory by giving
   options to setup.rb. e.g.
-  
+
     $ ruby setup.rb config --prefix=/usr
-  
+
   For details, try "ruby setup.rb --help".
 
 
@@ -61,9 +58,9 @@
 
       $ ruby calc
 
-  ... Does it works?
-  For details of Racc, see HTML documents placed under 'doc.en/'
-  and sample grammer files under 'sample/'.
+  ... Does it work?
+  For details of Racc, see HTML documents placed under 'rdoc/en/'
+  and sample grammar files under 'sample/'.
 
 
 == License
@@ -76,9 +73,9 @@
 
 == Bug Reports
 
-  Any kind of bug reports are welcome.
-  If you find a bug of Racc, please email me. Your grammer file,
-  debug output genereted by "racc -g", are helpful.
+  Any kind of bug report is welcome.
+  If you find a bug of Racc, please email me. Your grammar file,
+  debug output generated by "racc -g", are helpful.
 
 
                                                       Minero Aoki

data/bin/racc

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# $Id$
+#
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -51,7 +51,7 @@ def main
     logfilename = path
   }
   parser.on('-e', '--executable [RUBYPATH]', 'Makes executable parser.') {|path|
-    executable = true
+    make_executable = true
     rubypath = (path == 'ruby' ? nil : path)
   }
   parser.on('-E', '--embedded', "Embeds Racc runtime in output.") {
@@ -71,10 +71,6 @@ def main
             'Uses CLASSNAME instead of Racc::Parser.') {|name|
     superclass = name
   }
-  parser.on('--runtime=FEATURE',
-            "Uses FEATURE instead of 'racc/parser'") {|feat|
-    runtime = feature
-  }
   parser.on('-C', '--check-only', 'Checks syntax and quit immediately.') {|fl|
     check_only = fl
   }
@@ -88,24 +84,21 @@ def main
     debug_flags = Racc::DebugFlags.parse_option_string(flags)
   }
   #parser.on('--no-extensions', 'Run Racc without any Ruby extension.') {
-  #  Racc.const_set :Racc_No_Extentions, true
+  #  Racc.const_set :Racc_No_Extensions, true
   #}
   parser.on('--version', 'Prints version and quit.') {
     puts "racc version #{Racc::Version}"
     exit 0
   }
   parser.on('--runtime-version', 'Prints runtime version and quit.') {
-    printf "racc runtime version %s (rev. %s); %s\n",
+    printf "racc runtime version %s; %s\n",
            Racc::Parser::Racc_Runtime_Version,
-           Racc::Parser::Racc_Runtime_Revision,
            if Racc::Parser.racc_runtime_type == 'ruby'
-             sprintf('ruby core version %s (rev. %s)',
-                     Racc::Parser::Racc_Runtime_Core_Version_R,
-                     Racc::Parser::Racc_Runtime_Core_Revision_R)
+             sprintf('ruby core version %s',
+                     Racc::Parser::Racc_Runtime_Core_Version_R)
            else
-             sprintf('c core version %s (rev. %s)',
-                     Racc::Parser::Racc_Runtime_Core_Version_C,
-                     Racc::Parser::Racc_Runtime_Core_Revision_C)
+             sprintf('c core version %s',
+                     Racc::Parser::Racc_Runtime_Core_Version_C)
            end
     exit 0
   }
@@ -187,8 +180,12 @@ def main
       log_useless states.grammar
       log_conflict states
     else
-      report_useless states.grammar
-      report_conflict states
+      has_useless = report_useless states.grammar
+      has_conflicts = report_conflict states
+      if has_useless || has_conflicts
+        preamble = make_logfile ? 'C' : 'Turn on logging with "-v" and c'
+        $stderr.puts %Q{#{preamble}heck ".output" file for details}
+      end
     end
 
     profiler.report
@@ -204,13 +201,29 @@ def make_filename(path, suffix)
   path.sub(/(?:\..*?)?\z/, suffix)
 end
 
+LIST_LIMIT = 10
+def report_list(enum, label)
+  c = enum.count
+  if c > 0
+    $stderr.puts "#{c} #{label}:"
+    enum.first(LIST_LIMIT).each do |item|
+      $stderr.puts "  #{yield item}"
+    end
+    $stderr.puts "  ..." if c > LIST_LIMIT
+  end
+end
+
+# @return [Boolean] if anything was reported
 def report_conflict(states)
   if states.should_report_srconflict?
+    reported = true
     $stderr.puts "#{states.n_srconflicts} shift/reduce conflicts"
   end
   if states.rrconflict_exist?
+    reported = true
     $stderr.puts "#{states.n_rrconflicts} reduce/reduce conflicts"
   end
+  reported
 end
 
 def log_conflict(states)
@@ -225,16 +238,17 @@ def log_conflict(states)
   }
 end
 
+# @return [Boolean] if anything was reported
 def report_useless(grammar)
-  if grammar.useless_nonterminal_exist?
-    $stderr.puts "#{grammar.n_useless_nonterminals} useless nonterminals"
-  end
-  if grammar.useless_rule_exist?
-    $stderr.puts "#{grammar.n_useless_rules} useless rules"
-  end
+  reported = report_list(grammar.each_useless_nonterminal, 'useless nonterminals', &:to_s)
+
+  reported ||= report_list(grammar.each_useless_rule, 'useless rules') { |r| "##{r.ident} (#{r.target})" }
+
   if grammar.start.useless?
     $stderr.puts 'fatal: start symbol does not derive any sentence'
+    reported = true
   end
+  reported
 end
 
 def log_useless(grammar)

data/{rdoc → doc}/en/grammar.en.rdoc

@@ -4,25 +4,24 @@
 
 == Class Block and User Code Block
 
-There's two block on toplevel.
-one is 'class' block, another is 'user code' block. 'user code' block MUST
-places after 'class' block.
+There are two top-level blocks: the 'class' block, and the 'user code'
+block. The 'user code' block MUST be after the 'class' block.
 
 == Comment
 
-You can insert comment about all places. Two style comment can be used,
-Ruby style (#.....) and C style (/*......*/) .
+Comments can be added about everywhere.  Two comment styles are
+supported: Ruby style (`# ...`) and C style (`/* ... */`).
 
 == Class Block
 
 The class block is formed like this:
 --
 class CLASS_NAME
-  [precedance table]
-  [token declearations]
+  [precedence table]
+  [token declarations]
   [expected number of S/R conflict]
   [options]
-  [semantic value convertion]
+  [semantic value conversion]
   [start rule]
 rule
   GRAMMARS
@@ -43,7 +42,7 @@ end
 
 == Grammar Block
 
-The grammar block discripts grammar which is able
+The grammar block describes the grammar
 to be understood by parser.  Syntax is:
 --
 (token): (token) (token) (token).... (action)
@@ -69,7 +68,7 @@ It is value of result, or returned value by "return" statement.
 Here is an example of whole grammar block.
 --
 rule
-  goal: definition ruls source { result = val }
+  goal: definition rules source { result = val }
 
   definition: /* none */   { result = [] }
     | definition startdesig  { result[0] = val[1] }
@@ -96,7 +95,7 @@ An array of value of right-hand side (rhs).
 A stack of values.
 DO NOT MODIFY this stack unless you know what you are doing.
 
-== Operator Precedance
+== Operator Precedence
 
 This function is equal to '%prec' in yacc.
 To designate this block:
@@ -128,25 +127,24 @@ rule
 
 == expect
 
-Racc has bison's "expect" directive.
+Racc supports Bison's "expect" directive to declare the expected
+number of shift/reduce conflicts.
 --
-# Example
-
 class MyParser
 rule
   expect 3
     :
     :
 --
-This directive declears "expected" number of shift/reduce conflict.
-If "expected" number is equal to real number of conflicts,
-racc does not print confliction warning message.
+Then warnings are issued only when the effective number of conflicts differs.
+
 
 == Declaring Tokens
 
-By declaring tokens, you can avoid many meanless bugs.
-If decleared token does not exist/existing token does not decleared,
-Racc output warnings.  Declearation syntax is:
+Declaring tokens avoids many bugs.
+
+Racc outputs warnings for declared tokens that do not exist, or existing tokens not declared.
+The syntax is:
 --
 token TOKEN_NAME AND_IS_THIS
       ALSO_THIS_IS AGAIN_AND_AGAIN THIS_IS_LAST
@@ -174,12 +172,12 @@ You can use 'no_' prefix to invert its meanings.
 
 Token symbols are, as default,
 
-  * naked token string in racc file (TOK, XFILE, this_is_token, ...)
+  * naked token strings in racc file (TOK, XFILE, this_is_token, ...)
     --> symbol (:TOK, :XFILE, :this_is_token, ...)
-  * quoted string (':', '.', '(', ...)
+  * quoted strings (':', '.', '(', ...)
     --> same string (':', '.', '(', ...)
 
-You can change this default by "convert" block.
+You can change this default using a "convert" block.
 Here is an example:
 --
 convert
@@ -202,18 +200,19 @@ end
 
 == Start Rule
 
-'%start' in yacc. This changes start rule.
+'%start' in yacc. This changes the start symbol.
 --
 start real_target
 --
-This statement will not be used forever, I think.
+
 
 == User Code Block
 
-"User Code Block" is a Ruby source code which is copied to output.
-There are three user code block, "header" "inner" and "footer".
+A "User Code Block" is a piece of Ruby source code copied in the output.
+There are three user code blocks, "header" "inner" and "footer".
 
-Format of user code is like this:
+User code blocks are introduced by four '-' at the beginning of a line,
+followed by a single-word name:
 --
 ---- header
   ruby statement
@@ -225,6 +224,3 @@ Format of user code is like this:
      :
      :
 --
-If four '-' exist on line head,
-racc treat it as beginning of user code block.
-A name of user code must be one word.

data/doc/en/grammar2.en.rdoc

@@ -0,0 +1,219 @@
+= Racc Grammar File Reference
+
+== Global Structure
+
+== Class Block and User Code Block
+
+There are two blocks on the toplevel. One is the 'class' block, the other is the 'user code'
+block. The 'user code' block MUST be placed after the 'class' block.
+
+== Comments
+
+You can insert comments about all places. Two styles of comments can be used, Ruby style '#.....' and C style '/\*......*\/'.
+
+== Class Block
+
+The class block is formed like this:
+
+  class CLASS_NAME
+    [precedence table]
+    [token declarations]
+    [expected number of S/R conflicts]
+    [options]
+    [semantic value conversion]
+    [start rule]
+  rule
+    GRAMMARS
+
+CLASS_NAME is a name of the parser class. This is the name of the generating parser
+class.
+
+If CLASS_NAME includes '::', Racc outputs the module clause. For example, writing
+"class M::C" causes the code below to be created:
+
+  module M
+    class C
+      :
+      :
+    end
+  end
+
+== Grammar Block
+
+The grammar block describes grammar which is able to be understood by the parser.
+Syntax is:
+
+  (token): (token) (token) (token).... (action)
+
+  (token): (token) (token) (token).... (action)
+         | (token) (token) (token).... (action)
+         | (token) (token) (token).... (action)
+
+(action) is an action which is executed when its (token)s are found.
+(action) is a ruby code block, which is surrounded by braces:
+
+  { print val[0]
+    puts val[1] }
+
+Note that you cannot use '%' string, here document, '%r' regexp in action.
+
+Actions can be omitted. When it is omitted, '' (empty string) is used.
+
+A return value of action is a value of the left side value ($$). It is the value of the
+result, or the returned value by `return` statement.
+
+Here is an example of the whole grammar block.
+
+  rule
+    goal: definition rules source { result = val }
+
+    definition: /* none */   { result = [] }
+      | definition startdesig  { result[0] = val[1] }
+      | definition
+               precrule   # this line continues from upper line
+        {
+          result[1] = val[1]
+        }
+
+    startdesig: START TOKEN
+
+You can use the following special local variables in action:
+
+* result ($$)
+
+The value of the left-hand side (lhs). A default value is val[0].
+
+* val ($1,$2,$3...)
+
+An array of value of the right-hand side (rhs).
+
+* _values (...$-2,$-1,$0)
+
+A stack of values. DO NOT MODIFY this stack unless you know what you are doing.
+
+== Operator Precedence
+
+This function is equal to '%prec' in yacc.
+To designate this block:
+
+  prechigh
+    nonassoc '++'
+    left     '*' '/'
+    left     '+' '-'
+    right    '='
+  preclow
+
+`right` is yacc's %right, `left` is yacc's %left.
+
+`=` + (symbol) means yacc's %prec:
+
+  prechigh
+    nonassoc UMINUS
+    left '*' '/'
+    left '+' '-'
+  preclow
+
+  rule
+    exp: exp '*' exp
+       | exp '-' exp
+       | '-' exp       =UMINUS   # equals to "%prec UMINUS"
+           :
+           :
+
+== expect
+
+Racc has bison's "expect" directive.
+
+  # Example
+
+  class MyParser
+  rule
+    expect 3
+      :
+      :
+
+This directive declares "expected" number of shift/reduce conflicts. If
+"expected" number is equal to real number of conflicts, Racc does not print
+conflict warning message.
+
+== Declaring Tokens
+
+By declaring tokens, you can avoid many meaningless bugs. If declared token
+does not exist or existing token does not decleared, Racc output warnings.
+Declaration syntax is:
+
+  token TOKEN_NAME AND_IS_THIS
+        ALSO_THIS_IS AGAIN_AND_AGAIN THIS_IS_LAST
+
+== Options
+
+You can write options for Racc command in your Racc file.
+
+  options OPTION OPTION ...
+
+Options are:
+
+* omit_action_call
+
+omits empty action call or not.
+
+* result_var
+
+uses local variable "result" or not.
+
+You can use 'no_' prefix to invert their meanings.
+
+== Converting Token Symbol
+
+Token symbols are, as default,
+
+  * naked token string in Racc file (TOK, XFILE, this_is_token, ...)
+    --> symbol (:TOK, :XFILE, :this_is_token, ...)
+  * quoted string (':', '.', '(', ...)
+    --> same string (':', '.', '(', ...)
+
+You can change this default by "convert" block.
+Here is an example:
+
+  convert
+    PLUS 'PlusClass'      # We use PlusClass for symbol of `PLUS'
+    MIN  'MinusClass'     # We use MinusClass for symbol of `MIN'
+  end
+
+We can use almost all ruby value can be used by token symbol,
+except 'false' and 'nil'.  These cause unexpected parse error.
+
+If you want to use String as token symbol, special care is required.
+For example:
+
+  convert
+    class '"cls"'            # in code, "cls"
+    PLUS '"plus\n"'          # in code, "plus\n"
+    MIN  "\"minus#{val}\""   # in code, \"minus#{val}\"
+  end
+
+== Start Rule
+
+'%start' in yacc. This changes start rule.
+
+  start real_target
+
+== User Code Block
+
+"User Code Block" is a Ruby source code which is copied to output. There are
+three user code blocks, "header" "inner" and "footer".
+
+Format of user code is like this:
+
+  ---- header
+    ruby statement
+    ruby statement
+    ruby statement
+
+  ---- inner
+    ruby statement
+       :
+       :
+
+If four '-' exist on the line head, Racc treats it as the beginning of the
+user code block.  The name of the user code block must be one word.

data/{rdoc → doc}/ja/command.ja.html

@@ -1,7 +1,7 @@
 <h1>Raccコマンドリファレンス</h1>
 <p>
 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]

data/ext/racc/cparse/cparse.c

@@ -605,7 +605,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
   user_yyerror:
     if (v->errstatus == 3) {
         if (v->t == vFINAL_TOKEN) {
-            v->retval = Qfalse;
+            v->retval = Qnil;
             v->fin = CP_FIN_EOT;
             return;
         }
@@ -819,14 +819,16 @@ reduce0(RB_BLOCK_CALL_FUNC_ARGLIST(_, data))
 void
 Init_cparse(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     VALUE Racc, Parser;
-    ID id_racc = rb_intern("Racc");
+    ID id_racc = rb_intern_const("Racc");
 
     if (rb_const_defined(rb_cObject, id_racc)) {
         Racc = rb_const_get(rb_cObject, id_racc);
-        Parser = rb_const_get_at(Racc, rb_intern("Parser"));
+        Parser = rb_const_get_at(Racc, rb_intern_const("Parser"));
     }
     else {
         Racc = rb_define_module("Racc");
@@ -846,16 +848,16 @@ Init_cparse(void)
 
     RaccBug = rb_eRuntimeError;
 
-    id_yydebug      = rb_intern("@yydebug");
-    id_nexttoken    = rb_intern("next_token");
-    id_onerror      = rb_intern("on_error");
-    id_noreduce     = rb_intern("_reduce_none");
-    id_errstatus    = rb_intern("@racc_error_status");
-
-    id_d_shift       = rb_intern("racc_shift");
-    id_d_reduce      = rb_intern("racc_reduce");
-    id_d_accept      = rb_intern("racc_accept");
-    id_d_read_token  = rb_intern("racc_read_token");
-    id_d_next_state  = rb_intern("racc_next_state");
-    id_d_e_pop       = rb_intern("racc_e_pop");
+    id_yydebug      = rb_intern_const("@yydebug");
+    id_nexttoken    = rb_intern_const("next_token");
+    id_onerror      = rb_intern_const("on_error");
+    id_noreduce     = rb_intern_const("_reduce_none");
+    id_errstatus    = rb_intern_const("@racc_error_status");
+
+    id_d_shift       = rb_intern_const("racc_shift");
+    id_d_reduce      = rb_intern_const("racc_reduce");
+    id_d_accept      = rb_intern_const("racc_accept");
+    id_d_read_token  = rb_intern_const("racc_read_token");
+    id_d_next_state  = rb_intern_const("racc_next_state");
+    id_d_e_pop       = rb_intern_const("racc_e_pop");
 }

data/ext/racc/cparse/extconf.rb

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

data/lib/racc/compat.rb

@@ -1,13 +1,14 @@
+#--
+#
 #
-# $Id: 14fa1118eb3a23e85265e4f7afe2d5a297d69f9c $
 #
 # 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".
 #
+#++
 
 unless Object.method_defined?(:__send)
   class Object