racc 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846dee114d1ef9fb3a80c99ea23a02a452412fa2817ad083848d6f0aabc76931
-  data.tar.gz: 2eabf79dc8515992c8b764e664f39c4a38da10c5683c3850156698070fa1348d
+  metadata.gz: 5de182ad74eb075783ee57ec9f930c2d81a4d1465db436f6d5e42fb96eaa6a0f
+  data.tar.gz: 53cb977c27837bdf4df9cd1eae679e30a00ecb07b080e8481b59bfb66aec8bf8
 SHA512:
-  metadata.gz: e56e63a9cdf7826b79985833bf5402a0a0121e548ffe3c7531922b2f2cf139186189eda45fbc086b27c7686224e28922b4abd3687189d86262fa08d1f14a3bec
-  data.tar.gz: f55154a97d29a2b680d67688f05d324ded7cba0f8182e8154042de9f40fb9d14543c97e011a708ea3a038e8a12208ee73f92f33d1e4a79e3e523d36ade5c91cd
+  metadata.gz: cf79f910341f5fa146fb6f798ebfa08ad3e0379b1f322e80a004ea1b1285c4ce8bfa239f59cc078eb152d020a012d5d4f0646e2ad16a3ad55665db7d9521be1e
+  data.tar.gz: a317170a03d5355324b1d35cecc0edcd06fd4622eee4dd5cbc48ec0c4d53631054b37798f65b90ba0b4eabce1eb281e172554139854b63bad7bc3b8bdef3b811

data/ChangeLog

@@ -253,7 +253,7 @@ Mon Jul  3 04:34:32 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/racc/grammar.rb: class RuleTable -> Grammar.
 
-	* lib/racc/grammar.rb: Grammar.new does not acccept a Compiler.
+	* lib/racc/grammar.rb: Grammar.new does not accept a Compiler.
 
 	* lib/racc/grammar.rb: refactoring.
 
@@ -285,7 +285,7 @@ Mon Jul  3 04:34:32 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/racc/state.rb: class StateTable -> States.
 
-	* lib/racc/state.rb: States.new does not acccept a Compiler.
+	* lib/racc/state.rb: States.new does not accept a Compiler.
 
 	* lib/racc/state.rb: refactoring.
 
@@ -418,7 +418,7 @@ Tue Jul 26 23:37:46 2005  Minero Aoki  <aamine@loveruby.net>
 
 Sun Jan  2 11:48:19 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/racc/grammer.rb (once_writer): bug! needs argument.
+	* lib/racc/grammar.rb (once_writer): bug! needs argument.
 
 Mon Feb 16 16:14:16 2004  Minero Aoki  <aamine@loveruby.net>
 

data/README.ja.rdoc

@@ -1,23 +1,15 @@
 = Racc
 
-* http://i.loveruby.net/en/projects/racc/
+* https://github.com/ruby/racc
 
 == DESCRIPTION:
 
   Racc は LALR(1) パーサジェネレータです。
   yacc の Ruby 版に相当します。
 
-  NOTE:
-  Ruby 1.8.0 からは Racc のランタイムが標準添付されているので、
-  Racc で生成したパーサを安心して配布できます。また Ruby 1.6 系に
-  対応させたい場合は racc -E で生成してください。
-
-
 == 必要環境
 
-  *  Ruby 1.8 以降
- (*) C コンパイラと make
-
+  *  Ruby 2.5 以降
 
 == インストール
 

data/bin/racc

@@ -30,7 +30,7 @@ def main
   profiler = RaccProfiler.new(false)
 
   parser = OptionParser.new
-  parser.banner = "Usage: #{File.basename($0)} [options] <input>"
+  parser.banner = "Usage: #{File.basename($0)} [options] [input]"
   parser.on('-o', '--output-file=PATH',
             'output file name [<input>.tab.rb]') {|name|
     output = name
@@ -92,54 +92,52 @@ def main
   #}
   parser.on('--version', 'Prints version and quit.') {
     puts "racc version #{Racc::Version}"
-    exit 0
+    exit
   }
   parser.on('--runtime-version', 'Prints runtime version and quit.') {
-    printf "racc runtime version %s; %s\n",
+    printf "racc runtime version %s; %s core version %s\n",
            Racc::Parser::Racc_Runtime_Version,
+           Racc::Parser.racc_runtime_type,
            if Racc::Parser.racc_runtime_type == 'ruby'
-             sprintf('ruby core version %s',
-                     Racc::Parser::Racc_Runtime_Core_Version_R)
+             Racc::Parser::Racc_Runtime_Core_Version_R
            else
-             sprintf('c core version %s',
-                     Racc::Parser::Racc_Runtime_Core_Version_C)
+             Racc::Parser::Racc_Runtime_Core_Version_C
            end
-    exit 0
+    exit
   }
   parser.on('--copyright', 'Prints copyright and quit.') {
     puts Racc::Copyright
-    exit 0
+    exit
   }
   parser.on('--help', 'Prints this message and quit.') {
     puts parser.help
-    exit 1
+    exit
   }
   begin
     parser.parse!
   rescue OptionParser::ParseError => err
-    $stderr.puts err.message
-    $stderr.puts parser.help
-    exit 1
-  end
-  if ARGV.empty?
-    $stderr.puts 'no input'
-    exit 1
+    abort [err.message, parser.help].join("\n")
   end
   if ARGV.size > 1
-    $stderr.puts 'too many input'
-    exit 1
+    abort 'too many input'
+  end
+
+  input = ARGV[0] || "stdin"
+
+  if input == "stdin" && !output then
+    abort 'You must specify a path to read or use -o <path> for output.'
   end
-  input = ARGV[0]
 
   begin
     $stderr.puts 'Parsing grammar file...' if verbose
     result = profiler.section('parse') {
       parser = Racc::GrammarFileParser.new(debug_flags)
-      parser.parse(File.read(input), File.basename(input))
+      content = input == "stdin" ? ARGF.read : File.read(input)
+      parser.parse(content, File.basename(input))
     }
     if check_only
       $stderr.puts 'syntax ok'
-      exit 0
+      exit
     end
 
     $stderr.puts 'Generating LALR states...' if verbose
@@ -195,11 +193,13 @@ def main
     end
 
     profiler.report
+    if states.should_error_on_expect_mismatch?
+      raise Racc::CompileError, "#{states.grammar.n_expected_srconflicts} shift/reduce conflicts are expected but #{states.n_srconflicts} shift/reduce conflicts exist"
+    end
   rescue Racc::Error, Errno::ENOENT, Errno::EPERM => err
     raise if $DEBUG or debug_flags.any?
     lineno = err.message.slice(/\A\d+:/).to_s
-    $stderr.puts "#{File.basename $0}: #{input}:#{lineno} #{err.message.strip}"
-    exit 1
+    abort "#{File.basename $0}: #{input}:#{lineno} #{err.message.strip}"
   end
 end
 
@@ -276,19 +276,13 @@ class RaccProfiler
   def initialize(really)
     @really = really
     @log = []
-    unless ::Process.respond_to?(:times)
-      # Ruby 1.6
-      @class = ::Time
-    else
-      @class = ::Process
-    end
   end
 
   def section(name)
     if @really
-      t1 = @class.times.utime
+      t1 = ::Process.times.utime
       result = yield
-      t2 = @class.times.utime
+      t2 = ::Process.times.utime
       @log.push [name, t2 - t1]
       result
     else

data/doc/en/grammar.en.rdoc

@@ -15,48 +15,47 @@ supported: 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 conflict]
-  [options]
-  [semantic value conversion]
-  [start rule]
-rule
-  GRAMMARS
---
+
+  class CLASS_NAME
+    [precedence table]
+    [token declarations]
+    [expected number of S/R conflict]
+    [options]
+    [semantic value conversion]
+    [start rule]
+  rule
+    GRAMMARS
+
 CLASS_NAME is a name of parser class.
 This is the name of generating parser class.
 
 If CLASS_NAME includes '::', Racc outputs module clause.
-For example, writing "class M::C" causes creating the code bellow:
---
-module M
-  class C
-    :
-    :
+For example, writing "class M::C" causes creating the code below:
+
+  module M
+    class C
+      :
+      :
+    end
   end
-end
---
 
 == Grammar Block
 
 The grammar block describes the grammar
 to be understood by parser.  Syntax is:
---
-(token): (token) (token) (token).... (action)
 
-(token): (token) (token) (token).... (action)
-       | (token) (token) (token).... (action)
-       | (token) (token) (token).... (action)
---
+  (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] }
---
+
+  { print val[0]
+    puts val[1] }
+
 Note that you cannot use '%' string, here document, '%r' regexp in action.
 
 Actions can be omitted.
@@ -66,20 +65,20 @@ A return value of action is a value of left side value ($$).
 It is value of result, or returned value by "return" statement.
 
 Here is an example of whole grammar block.
---
-rule
-  goal: definition rules source { result = val }
-
-  definition: /* none */   { result = [] }
-    | definition startdesig  { result[0] = val[1] }
-    | definition
-             precrule   # this line continue from upper line
-      {
-        result[1] = val[1]
-      }
-
-  startdesig: START TOKEN
---
+
+  rule
+    goal: definition rules source { result = val }
+
+    definition: /* none */   { result = [] }
+      | definition startdesig  { result[0] = val[1] }
+      | definition
+               precrule   # this line continue from upper line
+        {
+          result[1] = val[1]
+        }
+
+    startdesig: START TOKEN
+
 You can use following special local variables in action.
 
   * result ($$)
@@ -99,45 +98,43 @@ DO NOT MODIFY this stack unless you know what you are doing.
 
 This function is equal to '%prec' in yacc.
 To designate this block:
---
-prechigh
-  nonassoc '++'
-  left     '*' '/'
-  left     '+' '-'
-  right    '='
-preclow
---
+
+  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"
-         :
-         :
---
+
+  prechigh
+    nonassoc UMINUS
+    left '*' '/'
+    left '+' '-'
+  preclow
+
+  rule
+    exp: exp '*' exp
+       | exp '-' exp
+       | '-' exp       =UMINUS   # equals to "%prec UMINUS"
+           :
+           :
 
 == expect
 
 Racc supports Bison's "expect" directive to declare the expected
 number of shift/reduce conflicts.
---
-class MyParser
-  expect 3
-rule
-    :
-    :
---
-Then warnings are issued only when the effective number of conflicts differs.
 
+  class MyParser
+    expect 3
+  rule
+      :
+      :
+
+Then warnings are issued only when the effective number of conflicts differs.
 
 == Declaring Tokens
 
@@ -145,17 +142,16 @@ 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
---
+
+  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 OPTION OPTION ...
+
 Options are:
 
   * omit_action_call
@@ -179,32 +175,29 @@ Token symbols are, as default,
 
 You can change this default using a "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
---
+
+  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 are causes 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
---
+
+  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 the start symbol.
---
-start real_target
---
 
+  start real_target
 
 == User Code Block
 
@@ -213,14 +206,13 @@ There are three user code blocks, "header" "inner" and "footer".
 
 User code blocks are introduced by four '-' at the beginning of a line,
 followed by a single-word name:
---
----- header
-  ruby statement
-  ruby statement
-  ruby statement
-
----- inner
-  ruby statement
-     :
-     :
---
+
+  ---- header
+    ruby statement
+    ruby statement
+    ruby statement
+
+  ---- inner
+    ruby statement
+       :
+       :

data/lib/racc/grammar.rb

@@ -27,6 +27,7 @@ module Racc
       @rules   = []  # :: [Rule]
       @start   = nil
       @n_expected_srconflicts = nil
+      @error_on_expect_mismatch = nil
       @prec_table = []
       @prec_table_closed = false
       @closed = false
@@ -36,6 +37,7 @@ module Racc
     attr_reader :start
     attr_reader :symboltable
     attr_accessor :n_expected_srconflicts
+    attr_accessor :error_on_expect_mismatch
 
     def [](x)
       @rules[x]
@@ -787,6 +789,81 @@ module Racc
   end
 
 
+  class OptionMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '?'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class ManyMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '*'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class Many1Mark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '+'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class GroupStartMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      '('
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
+  class GroupEndMark
+    def initialize(lineno)
+      @lineno = lineno
+    end
+
+    def name
+      ')'
+    end
+
+    alias inspect name
+
+    attr_reader :lineno
+  end
+
+
   class Prec
     def initialize(symbol, lineno)
       @symbol = symbol

data/lib/racc/grammarfileparser.rb

@@ -76,6 +76,9 @@ module Racc
                         raise CompileError, "`expect' seen twice"
                       end
                       @grammar.n_expected_srconflicts = num
+                    }\
+                  | seq(:ERROR_ON_EXPECT_MISMATCH) {|*|
+                      @grammar.error_on_expect_mismatch = true
                     }
 
     g.convdef     = seq(:symbol, :STRING) {|sym, code|
@@ -133,6 +136,21 @@ module Racc
                   | seq("|") {|*|
                       OrMark.new(@scanner.lineno)
                     }\
+                  | seq("?") {|*|
+                      OptionMark.new(@scanner.lineno)
+                    }\
+                  | seq("*") {|*|
+                      ManyMark.new(@scanner.lineno)
+                    }\
+                  | seq("+") {|*|
+                      Many1Mark.new(@scanner.lineno)
+                    }\
+                  | seq("(") {|*|
+                      GroupStartMark.new(@scanner.lineno)
+                    }\
+                  | seq(")") {|*|
+                      GroupEndMark.new(@scanner.lineno)
+                    }\
                   | seq("=", :symbol) {|_, sym|
                       Prec.new(sym, @scanner.lineno)
                     }\
@@ -210,27 +228,114 @@ module Racc
     end
 
     def add_rule_block(list)
-      sprec = nil
       target = list.shift
       case target
-      when OrMark, UserAction, Prec
+      when OrMark, OptionMark, ManyMark, Many1Mark, GroupStartMark, GroupEndMark, UserAction, Prec
         raise CompileError, "#{target.lineno}: unexpected symbol #{target.name}"
       end
+      enum = list.each.with_index
+      _, sym, idx = _add_rule_block(target, enum)
+      if idx
+        # sym is Racc::GroupEndMark
+        raise "#{sym.lineno}: unexpected symbol ')' at pos=#{idx}"
+      end
+    end
+
+    def _add_rule_block(target, enum)
+      rules = [] # [ [seqs, sprec], .. ]
       curr = []
-      list.each do |i|
-        case i
+      sprec = nil
+      while (sym, idx = enum.next rescue nil)
+        case sym
         when OrMark
-          add_rule target, curr, sprec
+          rules << [curr, sprec]
           curr = []
           sprec = nil
+        when OptionMark
+          curr << _add_option_rule(curr.pop)
+        when ManyMark
+          curr << _add_many_rule(curr.pop)
+        when Many1Mark
+          curr << _add_many1_rule(curr.pop)
+        when GroupStartMark
+          curr << _add_group_rule(enum)
+        when GroupEndMark
+          rules << [curr, sprec]
+          return rules, sym, idx
         when Prec
           raise CompileError, "'=<prec>' used twice in one rule" if sprec
-          sprec = i.symbol
+          sprec = sym.symbol
         else
-          curr.push i
+          curr.push sym
         end
       end
-      add_rule target, curr, sprec
+      rules << [curr, sprec]
+      rules.each do |syms, sprec|
+        add_rule target, syms, sprec
+      end
+      nil
+    end
+
+
+    def _add_option_rule(prev)
+      @option_rule_registry ||= {}
+      target = @option_rule_registry[prev.to_s]
+      return target if target
+      target = _gen_target_name("option", prev)
+      @option_rule_registry[prev.to_s] = target
+      act = UserAction.empty
+      @grammar.add Rule.new(target, [], act)
+      @grammar.add Rule.new(target, [prev], act)
+      target
+    end
+
+    def _add_many_rule(prev)
+      @many_rule_registry ||= {}
+      target = @many_rule_registry[prev.to_s]
+      return target if target
+      target = _gen_target_name("many", prev)
+      @many_rule_registry[prev.to_s] = target
+      src = SourceText.new("result = val[1] ? val[1].unshift(val[0]) : val", __FILE__, __LINE__)
+      act = UserAction.source_text(src)
+      @grammar.add Rule.new(target, [], act)
+      @grammar.add Rule.new(target, [prev, target], act)
+      target
+    end
+
+    def _add_many1_rule(prev)
+      @many1_rule_registry ||= {}
+      target = @many1_rule_registry[prev.to_s]
+      return target if target
+      target = _gen_target_name("many1", prev)
+      @many1_rule_registry[prev.to_s] = target
+      src = SourceText.new("result = val[1] ? val[1].unshift(val[0]) : val", __FILE__, __LINE__)
+      act = UserAction.source_text(src)
+      @grammar.add Rule.new(target, [prev], act)
+      @grammar.add Rule.new(target, [prev, target], act)
+      target
+    end
+
+    def _add_group_rule(enum)
+      target = @grammar.intern("-temp-group", true)
+      rules, _ = _add_rule_block(target, enum)
+      target_name = rules.map{|syms, sprec| syms.join("-")}.join("|")
+      @group_rule_registry ||= {}
+      unless target = @group_rule_registry[target_name]
+        target = @grammar.intern("-group@#{target_name}", true)
+        @group_rule_registry[target_name] = target
+        src = SourceText.new("result = val", __FILE__, __LINE__)
+        act = UserAction.source_text(src)
+        rules.each do |syms, sprec|
+          rule = Rule.new(target, syms, act)
+          rule.specified_prec = sprec
+          @grammar.add rule
+        end
+      end
+      target
+    end
+
+    def _gen_target_name(type, sym)
+      @grammar.intern("-#{type}@#{sym.value}", true)
     end
 
     def add_rule(target, list, sprec)
@@ -391,6 +496,7 @@ module Racc
       'options'  => :OPTION,
       'start'    => :START,
       'expect'   => :EXPECT,
+      'error_on_expect_mismatch' => :ERROR_ON_EXPECT_MISMATCH,
       'class'    => :CLASS,
       'rule'     => :RULE,
       'end'      => :END

data/lib/racc/info.rb

@@ -12,7 +12,7 @@
 #++
 
 module Racc
-  VERSION   = '1.7.3'
+  VERSION   = '1.8.0'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end

data/lib/racc/parser-text.rb

@@ -15,7 +15,7 @@ unless $".find {|p| p.end_with?('/racc/info.rb')}
 $".push "#{__dir__}/racc/info.rb"
 
 module Racc
-  VERSION   = '1.7.3'
+  VERSION   = '1.8.0'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end
@@ -23,10 +23,6 @@ end
 end
 
 
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError # :nodoc:
-end
-
 module Racc
   class ParseError < StandardError; end
 end

data/lib/racc/parser.rb

@@ -12,10 +12,6 @@
 
 require 'racc/info'
 
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError # :nodoc:
-end
-
 module Racc
   class ParseError < StandardError; end
 end

data/lib/racc/state.rb

@@ -73,6 +73,10 @@ module Racc
           (n_srconflicts() != @grammar.n_expected_srconflicts)
     end
 
+    def should_error_on_expect_mismatch?
+      should_report_srconflict? && @grammar.error_on_expect_mismatch
+    end
+
     def srconflict_exist?
       n_srconflicts() != 0
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: racc
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Minero Aoki
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2024-05-20 00:00:00.000000000 Z
 dependencies: []
 description: |
   Racc is a LALR(1) parser generator.
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Racc is a LALR(1) parser generator