racc 1.7.1 → 1.8.1

data/lib/racc/grammarfileparser.rb

@@ -10,11 +10,11 @@
 #
 #++
 
-require 'racc'
-require 'racc/compat'
-require 'racc/grammar'
-require 'racc/parserfilegenerator'
-require 'racc/sourcetext'
+require_relative '../racc'
+require_relative 'compat'
+require_relative 'grammar'
+require_relative 'parserfilegenerator'
+require_relative 'sourcetext'
 require 'stringio'
 
 module Racc
@@ -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", @filename, @scanner.lineno + 1)
+      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", @filename, @scanner.lineno + 1)
+      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", @filename, @scanner.lineno + 1)
+        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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 #
 #
@@ -11,7 +12,7 @@
 #++
 
 module Racc
-  VERSION   = '1.7.1'
+  VERSION   = '1.8.1'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end

data/lib/racc/parser-text.rb

@@ -1,6 +1,5 @@
 module Racc
   PARSER_TEXT = <<'__end_of_file__'
-# frozen_string_literal: false
 #--
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -14,20 +13,9 @@ module Racc
 
 unless $".find {|p| p.end_with?('/racc/info.rb')}
 $".push "#{__dir__}/racc/info.rb"
-#--
-#
-#
-#
-# 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.7.1'
+  VERSION   = '1.8.1'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end
@@ -35,10 +23,6 @@ end
 end
 
 
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError # :nodoc:
-end
-
 module Racc
   class ParseError < StandardError; end
 end
@@ -46,7 +30,7 @@ unless defined?(::ParseError)
   ParseError = Racc::ParseError # :nodoc:
 end
 
-# Racc is a LALR(1) parser generator.
+# Racc is an LALR(1) parser generator.
 # It is written in Ruby itself, and generates Ruby programs.
 #
 # == Command-line Reference
@@ -76,10 +60,12 @@ end
 # [-v, --verbose]
 #   verbose mode. create +filename+.output file, like yacc's y.output file.
 # [-g, --debug]
-#   add debug code to parser class. To display debuggin information,
+#   add debug code to parser class. To display debugging information,
 #   use this '-g' option and set @yydebug true in parser class.
 # [-E, --embedded]
 #   Output parser which doesn't need runtime files (racc/parser.rb).
+# [-F, --frozen]
+#   Output parser which declares frozen_string_literals: true
 # [-C, --check-only]
 #   Check syntax of racc grammar file and quit.
 # [-S, --output-status]
@@ -558,7 +544,7 @@ module Racc
     #
     # If this method returns, parsers enter "error recovering mode".
     def on_error(t, val, vstack)
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
+      raise ParseError, sprintf("parse error on value %s (%s)",
                                 val.inspect, token_to_str(t) || '?')
     end
 

data/lib/racc/parser.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -12,10 +12,6 @@
 
 require 'racc/info'
 
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError # :nodoc:
-end
-
 module Racc
   class ParseError < StandardError; end
 end
@@ -23,7 +19,7 @@ unless defined?(::ParseError)
   ParseError = Racc::ParseError # :nodoc:
 end
 
-# Racc is a LALR(1) parser generator.
+# Racc is an LALR(1) parser generator.
 # It is written in Ruby itself, and generates Ruby programs.
 #
 # == Command-line Reference
@@ -53,10 +49,12 @@ end
 # [-v, --verbose]
 #   verbose mode. create +filename+.output file, like yacc's y.output file.
 # [-g, --debug]
-#   add debug code to parser class. To display debuggin information,
+#   add debug code to parser class. To display debugging information,
 #   use this '-g' option and set @yydebug true in parser class.
 # [-E, --embedded]
 #   Output parser which doesn't need runtime files (racc/parser.rb).
+# [-F, --frozen]
+#   Output parser which declares frozen_string_literals: true
 # [-C, --check-only]
 #   Check syntax of racc grammar file and quit.
 # [-S, --output-status]
@@ -535,7 +533,7 @@ module Racc
     #
     # If this method returns, parsers enter "error recovering mode".
     def on_error(t, val, vstack)
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
+      raise ParseError, sprintf("parse error on value %s (%s)",
                                 val.inspect, token_to_str(t) || '?')
     end
 

data/lib/racc/parserfilegenerator.rb

@@ -10,9 +10,9 @@
 #
 #++
 
-require 'racc/compat'
-require 'racc/sourcetext'
-require 'racc/parser-text'
+require_relative 'compat'
+require_relative 'sourcetext'
+require_relative 'parser-text'
 require 'rbconfig'
 
 module Racc
@@ -45,6 +45,7 @@ module Racc
       bool_attr :convert_line
       bool_attr :convert_line_all
       bool_attr :embed_runtime
+      bool_attr :frozen_strings
       bool_attr :make_executable
       attr_accessor :interpreter
 
@@ -64,6 +65,7 @@ module Racc
         self.convert_line = true
         self.convert_line_all = false
         self.embed_runtime = false
+        self.frozen_strings = false
         self.make_executable = false
         self.interpreter = nil
       end
@@ -122,6 +124,7 @@ module Racc
     end
 
     def notice
+      line %q[# frozen_string_literal: true] if @params.frozen_strings?
       line %q[#]
       line %q[# DO NOT MODIFY!!!!]
       line %Q[# This file is automatically generated by Racc #{Racc::Version}]

data/lib/racc/state.rb

@@ -10,9 +10,9 @@
 #
 #++
 
-require 'racc/iset'
-require 'racc/statetransitiontable'
-require 'racc/exception'
+require_relative 'iset'
+require_relative 'statetransitiontable'
+require_relative 'exception'
 require 'forwardable'
 
 module Racc
@@ -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

data/lib/racc/statetransitiontable.rb

@@ -10,7 +10,7 @@
 #
 #++
 
-require 'racc/parser'
+require_relative 'parser'
 
 module Racc
 

data/lib/racc/static.rb

@@ -1,5 +1,5 @@
-require 'racc'
-require 'racc/parser'
-require 'racc/grammarfileparser'
-require 'racc/parserfilegenerator'
-require 'racc/logfilegenerator'
+require_relative '../racc'
+require_relative 'parser'
+require_relative 'grammarfileparser'
+require_relative 'parserfilegenerator'
+require_relative 'logfilegenerator'

data/lib/racc.rb

@@ -1,6 +1,6 @@
-require 'racc/compat'
-require 'racc/debugflags'
-require 'racc/grammar'
-require 'racc/state'
-require 'racc/exception'
-require 'racc/info'
+require_relative 'racc/compat'
+require_relative 'racc/debugflags'
+require_relative 'racc/grammar'
+require_relative 'racc/state'
+require_relative 'racc/exception'
+require_relative 'racc/info'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: racc
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Minero Aoki
@@ -9,10 +9,10 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies: []
 description: |
-  Racc is a LALR(1) parser generator.
+  Racc is an LALR(1) parser generator.
     It is written in Ruby itself, and generates Ruby program.
 
     NOTE: Ruby 1.8.x comes with Racc runtime module.  You
@@ -29,23 +29,21 @@ extra_rdoc_files:
 - README.ja.rdoc
 - README.rdoc
 files:
+- BSDL
 - COPYING
 - ChangeLog
 - README.ja.rdoc
 - README.rdoc
 - TODO
 - bin/racc
-- doc/en/NEWS.en.rdoc
 - doc/en/grammar.en.rdoc
 - doc/en/grammar2.en.rdoc
-- doc/ja/NEWS.ja.rdoc
 - doc/ja/command.ja.html
 - doc/ja/debug.ja.rdoc
 - doc/ja/grammar.ja.rdoc
 - doc/ja/index.ja.html
 - doc/ja/parser.ja.rdoc
 - doc/ja/usage.ja.html
-- ext/racc/MANIFEST
 - ext/racc/cparse/cparse.c
 - ext/racc/cparse/extconf.rb
 - lib/racc.rb
@@ -68,7 +66,8 @@ homepage: https://github.com/ruby/racc
 licenses:
 - Ruby
 - BSD-2-Clause
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/ruby/racc/releases
 post_install_message:
 rdoc_options:
 - "--main"
@@ -89,5 +88,5 @@ requirements: []
 rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
-summary: Racc is a LALR(1) parser generator
+summary: Racc is an LALR(1) parser generator
 test_files: []