lrama 0.6.1 → 0.6.2

data/lib/lrama/states/item.rb

@@ -5,7 +5,7 @@ module Lrama
     class Item < Struct.new(:rule, :position, keyword_init: true)
       # Optimization for States#setup_state
       def hash
-        [rule.id, position].hash
+        [rule_id, position].hash
       end
 
       def rule_id
@@ -17,27 +17,31 @@ module Lrama
       end
 
       def number_of_rest_symbols
-        rule.rhs.count - position
+        rhs.count - position
       end
 
       def lhs
         rule.lhs
       end
 
+      def rhs
+        rule.rhs
+      end
+
       def next_sym
-        rule.rhs[position]
+        rhs[position]
       end
 
       def next_next_sym
-        rule.rhs[position + 1]
+        rhs[position + 1]
       end
 
       def previous_sym
-        rule.rhs[position - 1]
+        rhs[position - 1]
       end
 
       def end_of_rule?
-        rule.rhs.count == position
+        rhs.count == position
       end
 
       def beginning_of_rule?
@@ -45,7 +49,7 @@ module Lrama
       end
 
       def start_item?
-        rule.id == 0 && position == 0
+        rule.initial_rule? && beginning_of_rule?
       end
 
       def new_by_next_position
@@ -53,11 +57,11 @@ module Lrama
       end
 
       def symbols_before_dot
-        rule.rhs[0...position]
+        rhs[0...position]
       end
 
       def symbols_after_dot
-        rule.rhs[position..-1]
+        rhs[position..-1]
       end
 
       def to_s
@@ -65,14 +69,14 @@ module Lrama
       end
 
       def display_name
-        r = rule.rhs.map(&:display_name).insert(position, "•").join(" ")
-        "#{r}  (rule #{rule.id})"
+        r = rhs.map(&:display_name).insert(position, "•").join(" ")
+        "#{r}  (rule #{rule_id})"
       end
 
       # Right after position
       def display_rest
-        r = rule.rhs[position..-1].map(&:display_name).join(" ")
-        ". #{r}  (rule #{rule.id})"
+        r = rhs[position..-1].map(&:display_name).join(" ")
+        ". #{r}  (rule #{rule_id})"
       end
     end
   end

data/lib/lrama/states_reporter.rb

@@ -53,7 +53,7 @@ module Lrama
       last_lhs = nil
 
       @states.rules.each do |rule|
-        if rule.rhs.empty?
+        if rule.empty_rule?
           r = "ε"
         else
           r = rule.rhs.map(&:display_name).join(" ")
@@ -84,17 +84,15 @@ module Lrama
         last_lhs = nil
         list = itemsets ? state.items : state.kernels
         list.sort_by {|i| [i.rule_id, i.position] }.each do |item|
-          rule = item.rule
-          position = item.position
-          if rule.rhs.empty?
+          if item.empty_rule?
             r = "ε •"
           else
-            r = rule.rhs.map(&:display_name).insert(position, "•").join(" ")
+            r = item.rhs.map(&:display_name).insert(item.position, "•").join(" ")
           end
-          if rule.lhs == last_lhs
-            l = " " * rule.lhs.id.s_value.length + "|"
+          if item.lhs == last_lhs
+            l = " " * item.lhs.id.s_value.length + "|"
           else
-            l = rule.lhs.id.s_value + ":"
+            l = item.lhs.id.s_value + ":"
           end
           la = ""
           if lookaheads && item.end_of_rule?
@@ -104,9 +102,9 @@ module Lrama
               la = "  [#{look_ahead.map(&:display_name).join(", ")}]"
             end
           end
-          last_lhs = rule.lhs
+          last_lhs = item.lhs
 
-          io << sprintf("%5i %s %s%s\n", rule.id, l, r, la)
+          io << sprintf("%5i %s %s%s\n", item.rule_id, l, r, la)
         end
         io << "\n"
 

data/lib/lrama/version.rb

@@ -1,3 +1,3 @@
 module Lrama
-  VERSION = "0.6.1".freeze
+  VERSION = "0.6.2".freeze
 end

data/parser.y

@@ -69,6 +69,7 @@ rule
                        {
                          @grammar.initial_action = Grammar::Code::InitialActionCode.new(type: :initial_action, token_code: val[3])
                        }
+                   | "%no-stdlib" { @grammar.no_stdlib = true }
                    | ";"
 
   grammar_declaration: "%union" "{"
@@ -451,9 +452,9 @@ rule
            result = builder
          }
 
-  parameterizing_suffix: "?"
-                       | "+"
-                       | "*"
+  parameterizing_suffix: "?" { result = "option" }
+                       | "+" { result = "nonempty_list" }
+                       | "*" { result = "list" }
 
   parameterizing_args: symbol { result = [val[0]] }
                      | parameterizing_args ',' symbol { result = val[0].append(val[2]) }
@@ -514,8 +515,6 @@ def parse
     @precedence_number = 0
     reset_precs
     do_parse
-    @grammar.prepare
-    @grammar.validate!
     @grammar
   end
 end

data/sig/lrama/grammar/parameterizing_rule/resolver.rbs

@@ -15,6 +15,7 @@ module Lrama
         private
 
         def select_rules: (Lexer::Token::InstantiateRule token) -> Array[Grammar::ParameterizingRule::Rule]
+        def select_rules_by_name: (String rule_name) -> Array[Grammar::ParameterizingRule::Rule]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lrama
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Yuichiro Kaneko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies: []
 description: LALR (1) parser generator written by Ruby
 email:
@@ -60,19 +60,13 @@ files:
 - lib/lrama/grammar/parameterizing_rule/resolver.rb
 - lib/lrama/grammar/parameterizing_rule/rhs.rb
 - lib/lrama/grammar/parameterizing_rule/rule.rb
-- lib/lrama/grammar/parameterizing_rules/builder.rb
-- lib/lrama/grammar/parameterizing_rules/builder/base.rb
-- lib/lrama/grammar/parameterizing_rules/builder/list.rb
-- lib/lrama/grammar/parameterizing_rules/builder/nonempty_list.rb
-- lib/lrama/grammar/parameterizing_rules/builder/option.rb
-- lib/lrama/grammar/parameterizing_rules/builder/separated_list.rb
-- lib/lrama/grammar/parameterizing_rules/builder/separated_nonempty_list.rb
 - lib/lrama/grammar/percent_code.rb
 - lib/lrama/grammar/precedence.rb
 - lib/lrama/grammar/printer.rb
 - lib/lrama/grammar/reference.rb
 - lib/lrama/grammar/rule.rb
 - lib/lrama/grammar/rule_builder.rb
+- lib/lrama/grammar/stdlib.y
 - lib/lrama/grammar/symbol.rb
 - lib/lrama/grammar/type.rb
 - lib/lrama/grammar/union.rb
@@ -122,13 +116,6 @@ files:
 - sig/lrama/grammar/parameterizing_rule/resolver.rbs
 - sig/lrama/grammar/parameterizing_rule/rhs.rbs
 - sig/lrama/grammar/parameterizing_rule/rule.rbs
-- sig/lrama/grammar/parameterizing_rules/builder.rbs
-- sig/lrama/grammar/parameterizing_rules/builder/base.rbs
-- sig/lrama/grammar/parameterizing_rules/builder/list.rbs
-- sig/lrama/grammar/parameterizing_rules/builder/nonempty_list.rbs
-- sig/lrama/grammar/parameterizing_rules/builder/option.rbs
-- sig/lrama/grammar/parameterizing_rules/builder/separated_list.rbs
-- sig/lrama/grammar/parameterizing_rules/builder/separated_nonempty_list.rbs
 - sig/lrama/grammar/percent_code.rbs
 - sig/lrama/grammar/precedence.rbs
 - sig/lrama/grammar/printer.rbs

data/lib/lrama/grammar/parameterizing_rules/builder/base.rb

@@ -1,36 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        # Base class for parameterizing rules builder
-        class Base
-          attr_reader :build_token
-
-          def initialize(token, rule_counter, lhs_tag, user_code, precedence_sym, line)
-            @args = token.args
-            @token = @args.first
-            @rule_counter = rule_counter
-            @lhs_tag = lhs_tag
-            @user_code = user_code
-            @precedence_sym = precedence_sym
-            @line = line
-            @expected_argument_num = 1
-            @build_token = nil
-          end
-
-          def build
-            raise NotImplementedError
-          end
-
-          private
-
-          def validate_argument_number!
-            unless @args.count == @expected_argument_num
-              raise "Invalid number of arguments. expect: #{@expected_argument_num} actual: #{@args.count}"
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/lrama/grammar/parameterizing_rules/builder/list.rb

@@ -1,28 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        # Builder for list of general parameterizing rules
-        class List < Base
-
-          # program: list(number)
-          #
-          # =>
-          #
-          # program: list_number
-          # list_number: ε
-          # list_number: list_number number
-          def build
-            validate_argument_number!
-
-            rules = []
-            @build_token = Lrama::Lexer::Token::Ident.new(s_value: "list_#{@token.s_value}")
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [@build_token, @token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules
-          end
-        end
-      end
-    end
-  end
-end

data/lib/lrama/grammar/parameterizing_rules/builder/nonempty_list.rb

@@ -1,28 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        # Builder for nonempty list of general parameterizing rules
-        class NonemptyList < Base
-
-          # program: nonempty_list(number)
-          #
-          # =>
-          #
-          # program: nonempty_list_number
-          # nonempty_list_number: number
-          # nonempty_list_number: nonempty_list_number number
-          def build
-            validate_argument_number!
-
-            rules = []
-            @build_token = Lrama::Lexer::Token::Ident.new(s_value: "nonempty_list_#{@token.s_value}")
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [@token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [@build_token, @token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules
-          end
-        end
-      end
-    end
-  end
-end

data/lib/lrama/grammar/parameterizing_rules/builder/option.rb

@@ -1,28 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        # Builder for option of general parameterizing rules
-        class Option < Base
-
-          # program: option(number)
-          #
-          # =>
-          #
-          # program: option_number
-          # option_number: ε
-          # option_number: number
-          def build
-            validate_argument_number!
-
-            rules = []
-            @build_token = Lrama::Lexer::Token::Ident.new(s_value: "option_#{@token.s_value}")
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [@token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules
-          end
-        end
-      end
-    end
-  end
-end

data/lib/lrama/grammar/parameterizing_rules/builder/separated_list.rb

@@ -1,39 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        # Builder for separated list of general parameterizing rules
-        class SeparatedList < Base
-          def initialize(token, rule_counter, lhs_tag, user_code, precedence_sym, line)
-            super
-            @separator = @args[0]
-            @token = @args[1]
-            @expected_argument_num = 2
-          end
-
-          # program: separated_list(',', number)
-          #
-          # =>
-          #
-          # program: separated_list_number
-          # separated_list_number: ε
-          # separated_list_number: separated_nonempty_list_number
-          # separated_nonempty_list_number: number
-          # separated_nonempty_list_number: separated_nonempty_list_number ',' number
-          def build
-            validate_argument_number!
-
-            rules = []
-            @build_token = Lrama::Lexer::Token::Ident.new(s_value: "separated_list_#{@token.s_value}")
-            separated_nonempty_list_token = Lrama::Lexer::Token::Ident.new(s_value: "separated_nonempty_list_#{@token.s_value}")
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [separated_nonempty_list_token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules << Rule.new(id: @rule_counter.increment, _lhs: separated_nonempty_list_token, _rhs: [@token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules << Rule.new(id: @rule_counter.increment, _lhs: separated_nonempty_list_token, _rhs: [separated_nonempty_list_token, @separator, @token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules
-          end
-        end
-      end
-    end
-  end
-end

data/lib/lrama/grammar/parameterizing_rules/builder/separated_nonempty_list.rb

@@ -1,34 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        # Builder for separated nonempty list of general parameterizing rules
-        class SeparatedNonemptyList < Base
-          def initialize(token, rule_counter, lhs_tag, user_code, precedence_sym, line)
-            super
-            @separator = @args[0]
-            @token = @args[1]
-            @expected_argument_num = 2
-          end
-
-          # program: separated_nonempty_list(',', number)
-          #
-          # =>
-          #
-          # program: separated_nonempty_list_number
-          # separated_nonempty_list_number: number
-          # separated_nonempty_list_number: separated_nonempty_list_number ',' number
-          def build
-            validate_argument_number!
-
-            rules = []
-            @build_token = Lrama::Lexer::Token::Ident.new(s_value: "separated_nonempty_list_#{@token.s_value}")
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [@token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules << Rule.new(id: @rule_counter.increment, _lhs: @build_token, _rhs: [@build_token, @separator, @token], lhs_tag: @lhs_tag, token_code: @user_code, precedence_sym: @precedence_sym, lineno: @line)
-            rules
-          end
-        end
-      end
-    end
-  end
-end

data/lib/lrama/grammar/parameterizing_rules/builder.rb

@@ -1,60 +0,0 @@
-require 'lrama/grammar/parameterizing_rules/builder/base'
-require 'lrama/grammar/parameterizing_rules/builder/list'
-require 'lrama/grammar/parameterizing_rules/builder/nonempty_list'
-require 'lrama/grammar/parameterizing_rules/builder/option'
-require 'lrama/grammar/parameterizing_rules/builder/separated_nonempty_list'
-require 'lrama/grammar/parameterizing_rules/builder/separated_list'
-
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      # Builder for parameterizing rules
-      class Builder
-        RULES = {
-          option: Lrama::Grammar::ParameterizingRules::Builder::Option,
-          "?": Lrama::Grammar::ParameterizingRules::Builder::Option,
-          nonempty_list: Lrama::Grammar::ParameterizingRules::Builder::NonemptyList,
-          "+": Lrama::Grammar::ParameterizingRules::Builder::NonemptyList,
-          list: Lrama::Grammar::ParameterizingRules::Builder::List,
-          "*": Lrama::Grammar::ParameterizingRules::Builder::List,
-          separated_nonempty_list: Lrama::Grammar::ParameterizingRules::Builder::SeparatedNonemptyList,
-          separated_list: Lrama::Grammar::ParameterizingRules::Builder::SeparatedList,
-        }
-
-        def initialize(token, rule_counter, lhs_tag, user_code, precedence_sym, line)
-          @token = token
-          @key = token.s_value.to_sym
-          @rule_counter = rule_counter
-          @lhs_tag = lhs_tag
-          @user_code = user_code
-          @precedence_sym = precedence_sym
-          @line = line
-          @builder = nil
-        end
-
-        def build
-          create_builder
-          @builder.build
-        end
-
-        def build_token
-          create_builder
-          @builder.build_token
-        end
-
-        private
-
-        def create_builder
-          unless @builder
-            validate_key!
-            @builder = RULES[@key].new(@token, @rule_counter, @lhs_tag, @user_code, @precedence_sym, @line)
-          end
-        end
-
-        def validate_key!
-          raise "Parameterizing rule does not exist. `#{@key}`" unless RULES.key?(@key)
-        end
-      end
-    end
-  end
-end

data/sig/lrama/grammar/parameterizing_rules/builder/base.rbs

@@ -1,28 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        class Base
-          attr_reader build_token: Lexer::Token::Ident
-
-          def initialize: (Lexer::Token::InstantiateRule token, Counter rule_counter, untyped lhs_tag, Lexer::Token::UserCode? user_code, Lexer::Token? precedence_sym, Integer? line) -> void
-          def build: () -> Array[Rule]
-
-          @args: Array[Lexer::Token]
-          @token: Lexer::Token::InstantiateRule
-          @key: Symbol
-          @rule_counter: Counter
-          @lhs_tag: untyped
-          @user_code: Lexer::Token::UserCode?
-          @precedence_sym: Lexer::Token?
-          @line: Integer?
-          @expected_argument_num: Integer
-
-          private
-
-          def validate_argument_number!: () -> void
-        end
-      end
-    end
-  end
-end

data/sig/lrama/grammar/parameterizing_rules/builder/list.rbs

@@ -1,10 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        class List < Base
-        end
-      end
-    end
-  end
-end

data/sig/lrama/grammar/parameterizing_rules/builder/nonempty_list.rbs

@@ -1,10 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        class NonemptyList < Base
-        end
-      end
-    end
-  end
-end

data/sig/lrama/grammar/parameterizing_rules/builder/option.rbs

@@ -1,10 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        class Option < Base
-        end
-      end
-    end
-  end
-end

data/sig/lrama/grammar/parameterizing_rules/builder/separated_list.rbs

@@ -1,13 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        class SeparatedList < Base
-          @separator: Lexer::Token
-
-          def initialize: (Lexer::Token token, Counter rule_counter, untyped lhs_tag, Lexer::Token::UserCode? user_code, Lexer::Token? precedence_sym, Integer? line) -> void
-        end
-      end
-    end
-  end
-end

data/sig/lrama/grammar/parameterizing_rules/builder/separated_nonempty_list.rbs

@@ -1,13 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        class SeparatedNonemptyList < Base
-          @separator: Lexer::Token
-
-          def initialize: (Lexer::Token token, Counter rule_counter, untyped lhs_tag, Lexer::Token::UserCode? user_code, Lexer::Token? precedence_sym, Integer? line) -> void
-        end
-      end
-    end
-  end
-end

data/sig/lrama/grammar/parameterizing_rules/builder.rbs

@@ -1,24 +0,0 @@
-module Lrama
-  class Grammar
-    class ParameterizingRules
-      class Builder
-        RULES: Hash[Symbol, singleton(Base)]
-
-        @token: Lexer::Token::InstantiateRule
-        @key: Symbol
-        @rule_counter: Counter
-        @lhs_tag: untyped
-        @user_code: Lexer::Token::UserCode?
-        @precedence_sym: Lexer::Token?
-        @line: Integer?
-        @builder: Grammar::ParameterizingRules::Builder::Base
-
-        def initialize: (Lexer::Token token, Counter rule_counter, untyped lhs_tag, Lexer::Token::UserCode? user_code, Lexer::Token? precedence_sym, Integer? line) -> void
-        def build: () -> Array[Rule]
-        def build_token: () -> Lexer::Token
-        def create_builder: () -> void
-        def validate_key!: () -> void
-      end
-    end
-  end
-end