lrama 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccec35a8c70236b675ecd03905a2ca5bed3fa7bf0ca37ec89658b99211572df2
-  data.tar.gz: 337dbb0772531a9325e381387a8867635ad9a3191677e064d1654726cf3ab954
+  metadata.gz: 0a8a1b04a3e761af04029af3e3b74aaaf4fe9a9e2741205f430264ee3399f66c
+  data.tar.gz: a97ec2c2b2007f3bad6cbe5d1b37baa87d520cc3025e82403a9d8a70cddccc8a
 SHA512:
-  metadata.gz: 6f6588f355970ad490cd93184556d2fa3f39a1df1ce354ead1200dd93736e247a2f3e82e9a43b96430b0459456777ea07dcf141d59bb56bac4a52e5f210ed2a9
-  data.tar.gz: 26ed741e7cfc5f827cb12241329529f915026b50ff34d7f38e79ad3926e88ec4cd5afb4956cc6e8e76cf610739bc4bbaace14b4d1e61b8dbaba377d0ca9f1758
+  metadata.gz: 820bce06aefc235c02995cc957f9e0d9b2e8d588ce7748225896f0d63c319135068da39977be860815276c360a66e3dd6c2132802aa30e3292d706bc6ae7ef9d
+  data.tar.gz: d5c4ec405196bca888c78bf8a16cc9aef47da0f9943d7eee2bf9033c104f9a07fcb07c4cb6aabb3bb49f0e3665bf37932e2206cd9acad925702c30c7124210fb

data/.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['head', '3.2', '3.1', '3.0', '2.7']
+        ruby: ['head', '3.2', '3.1', '3.0', '2.7', '2.6', '2.5']
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
@@ -40,10 +40,12 @@ jobs:
           bundler-cache: true
       - run: git clone --depth=1 https://github.com/ruby/ruby.git -b ${{ matrix.ruby_branch }} ../ruby
         working-directory:
-      - run: mkdir tool/lrama
+      - run: mkdir -p tool/lrama
         working-directory: ../ruby
       - name: Copy Lrama to ruby/tool
-        run: cp -r exe lib template ../ruby/tool/lrama
+        run: cp -r exe lib ../ruby/tool/lrama
+        # TODO: Consider how to manage changes on ruby/ruby master and ruby/lrama
+        # run: cp -r exe lib template ../ruby/tool/lrama
         working-directory:
       - run: tree tool/lrama
         working-directory: ../ruby

data/lib/lrama/command.rb

@@ -57,14 +57,18 @@ module Lrama
       end
 
       if !grammar_file
-        puts "File should be specified\n"
-        exit 1
+        abort "File should be specified\n"
       end
 
       Report::Duration.enable if trace_opts[:time]
 
       warning = Lrama::Warning.new
-      y = File.read(grammar_file)
+      if grammar_file == '-'
+        grammar_file = argv.shift or abort "File name for STDIN should be specified\n"
+        y = STDIN.read
+      else
+        y = File.read(grammar_file)
+      end
       grammar = Lrama::Parser.new(y).parse
       states = Lrama::States.new(grammar, warning, trace_state: (trace_opts[:automaton] || trace_opts[:closure]))
       states.compute

data/lib/lrama/output.rb

@@ -25,26 +25,35 @@ module Lrama
       @grammar = grammar
     end
 
+    if ERB.instance_method(:initialize).parameters.last.first == :key
+      def self.erb(input)
+        ERB.new(input, trim_mode: '-')
+      end
+    else
+      def self.erb(input)
+        ERB.new(input, nil, '-')
+      end
+    end
+
+    def eval_template(file, path)
+      erb = self.class.erb(File.read(file))
+      erb.filename = file
+      tmp = erb.result_with_hash(context: @context, output: self)
+      replace_special_variables(tmp, path)
+    end
+
     def render
       report_duration(:render) do
-        erb = ERB.new(File.read(template_file), trim_mode: '-')
-        erb.filename = template_file
-        tmp = erb.result_with_hash(context: @context, output: self)
-        tmp = replace_special_variables(tmp, @output_file_path)
+        tmp = eval_template(template_file, @output_file_path)
         @out << tmp
 
         if @header_file_path
-          erb = ERB.new(File.read(header_template_file), trim_mode: '-')
-          erb.filename = header_template_file
-          tmp = erb.result_with_hash(context: @context, output: self)
-          tmp = replace_special_variables(tmp, @header_file_path)
+          tmp = eval_template(header_template_file, @header_file_path)
 
           if @header_out
             @header_out << tmp
           else
-            File.open(@header_file_path, "w+") do |f|
-              f << tmp
-            end
+            File.write(@header_file_path, tmp)
           end
         end
       end
@@ -141,7 +150,7 @@ module Lrama
 
       <<-STR
         #{comment}
-        #line #{@grammar.initial_action.line} "#{@grammar_file_path}"
+#line #{@grammar.initial_action.line} "#{@grammar_file_path}"
         #{@grammar.initial_action.translated_code}
       STR
     end

data/lib/lrama/states.rb

@@ -776,7 +776,7 @@ module Lrama
         state.reduces.each do |reduce|
           next if reduce.look_ahead.nil?
 
-          intersection = a.intersection(reduce.look_ahead)
+          intersection = a & reduce.look_ahead
           a += reduce.look_ahead
 
           if !intersection.empty?

data/lib/lrama/version.rb

@@ -1,3 +1,3 @@
 module Lrama
-  VERSION = "0.3.0".freeze
+  VERSION = "0.5.0".freeze
 end

data/lrama.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/yui-knk/lrama"
   # See LEGAL.md file for detail
   spec.license       = "GNU GPLv3"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }

data/template/bison/yacc.c

@@ -1,5 +1,5 @@
 <%# b4_generated_by -%>
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by Lrama <%= Lrama::VERSION %>.  */
 
 <%# b4_copyright -%>
 /* Bison implementation for Yacc-like parsers in C

data/template/bison/yacc.h

@@ -1,5 +1,5 @@
 <%# b4_generated_by -%>
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by Lrama <%= Lrama::VERSION %>.  */
 
 <%# b4_copyright -%>
 /* Bison interface for Yacc-like parsers in C

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lrama
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yuichiro Kaneko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies: []
 description: LALR (1) parser generator written by Ruby
 email:
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="