expressir 1.2.3-x86_64-linux → 1.2.6-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037a9a73ba0528e09b6c5816dcb3f8c904abc5d2f45c68bda99d3298df1373c1
-  data.tar.gz: 79372b6d8f8e25d5a1fd624489bd48d7c0b07b2b0c71885fc5bbe028676dd1df
+  metadata.gz: 03e481ebfeda970cbf8896742c748656f4c8301cde155b1c2cc4c95977523e12
+  data.tar.gz: '049a6c297c3929c70e024b838d360276490ec96caa328f964e6f51fa8fac3a5f'
 SHA512:
-  metadata.gz: 33f793fbd4c77a1d8c323a4eb5459fe1e3550974e527b01a76967938d641527d9d5087d0c9637438a35fb86a2eaeaefcbf952d15d718b40bc690ca8272becf72
-  data.tar.gz: fdd55bf4485a696ad4acec92ec4dcc8220397b9c146ccc4950c756e60b12fe8ad66a4e3823a5d788d83a603c63265f1d722e79b664eee1a6ef814ccd0e3aa049
+  metadata.gz: 837a7b01d89cb8dd1164edba3f199a4871ab3fb6e1a10f588c9239e9f40e2ef3c6003675e31df2ce1055f9620b309fd824abd4c2743d1eb480f231f950480ffe
+  data.tar.gz: 1aee92803dbd53930b1add42ba208d99df258185205f6ac67a22cc8140ecc9ba34869b6dff60b441581d4cd88b5881bb29dde3c0026b7abe9c6d07cc822cebf7

data/.cross_rubies

@@ -1,20 +1,14 @@
-3.1.0:i686-w64-mingw32
 3.1.0:x86_64-w64-mingw32
-3.1.0:i686-linux-gnu
 3.1.0:x86_64-linux-gnu
 3.1.0:aarch64-linux-gnu
 3.1.0:x86_64-darwin
 3.1.0:arm64-darwin
-3.0.0:i686-w64-mingw32
 3.0.0:x86_64-w64-mingw32
-3.0.0:i686-linux-gnu
 3.0.0:x86_64-linux-gnu
 3.0.0:aarch64-linux-gnu
 3.0.0:x86_64-darwin
 3.0.0:arm64-darwin
-2.7.0:i686-w64-mingw32
 2.7.0:x86_64-w64-mingw32
-2.7.0:i686-linux-gnu
 2.7.0:x86_64-linux-gnu
 2.7.0:aarch64-linux-gnu
 2.7.0:x86_64-darwin

data/.github/workflows/rake.yml

@@ -6,79 +6,119 @@ on:
   pull_request:
 
 jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: true
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
+
+      - name: Rubocop
+        run: bundle exec rake rubocop
+
   rake:
     name: test on ruby-${{ matrix.ruby }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '3.1', '3.0', '2.7' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-        include:
-          - ruby: 'head'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: 'head'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: 'head'
-            os: 'macos-latest'
-            experimental: true
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - if: matrix.os == 'macos-latest'
+      - name: Setup packages
+        if: startsWith(matrix.os, 'macos')
         run: brew install autoconf automake libtool
 
-      - uses: ruby/setup-ruby@v1
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - uses: actions/cache@v2
+      - name: Process cache
+        uses: actions/cache@v2
+        id: cache
         with:
           path: lib/expressir/express/express_parser.*
           key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
-      - if: hashFiles('lib/expressir/express/express_parser.*') == ''
+      - name: Build native extension
+        if: steps.cache.outputs.cache-hit != 'true'
         run: bundle exec rake compile
 
-      - run: bundle exec rake
+      - name: Run tests
+        run: |
+          bundle exec rake
+          cat .rspec_status
 
   # test release workflow
-  pack:
-    runs-on: ubuntu-18.04
+  pack-ruby:
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        host: [ linux, windows, darwin ]
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - uses: ruby/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
           # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
           # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
 
-      - run: bundle install --jobs 4 --retry 3
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
 
-      # build gem WITHOUT pre-built native extension
-      - run: gem build expressir.gemspec
+      - name: Build gem without native extension
+        run: gem build expressir.gemspec
 
-      - if: matrix.host == 'linux'
+      - name: Package gem without native extension
         uses: actions/upload-artifact@v2
         with:
           name: pkg-ruby
           path: expressir-*.gem
 
+  pack:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        host: [ linux, windows, darwin ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
+          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
+
       - name: Enable swap
         run: |
           sudo fallocate -l 15g /compile.swap
@@ -87,10 +127,162 @@ jobs:
           sudo swapon /compile.swap
           sudo swapon --all --verbose
 
-      # build gem WITH pre-built native extension
-      - run: bundle exec rake gem:${{ matrix.host }}
+      - name: Build gem with native extension
+        run: bundle exec rake gem:${{ matrix.host }}
 
-      - uses: actions/upload-artifact@v2
+      - name: Package gem with native extension
+        uses: actions/upload-artifact@v2
         with:
           name: pkg-${{ matrix.host }}
           path: pkg/*.gem
+
+  verify-ruby:
+    name: verify ruby gem on ruby-${{ matrix.ruby }} ${{ matrix.os }}
+    needs: pack-ruby
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.1', '3.0', '2.7' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    steps:
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
+        
+      - name: Download packaged gem
+        uses: actions/download-artifact@v2
+        with:
+         name: pkg-ruby
+         path: pkg
+
+      - name: Install gem
+        run: gem install -l pkg/expressir-*.gem
+
+      - name: Verify
+        run: |
+          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          ruby bin/rspec
+          cat .rspec_status || echo ".rspec_status was not found"
+
+  verify-darwin:
+    name: verify MacOS binary gem on ruby-${{ matrix.ruby }}
+    needs: pack
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.1', '3.0', '2.7' ]
+    steps:
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
+        
+      - name: Download packaged gem
+        uses: actions/download-artifact@v2
+        with:
+         name: pkg-darwin
+         path: pkg
+
+      - name: Install binary gem
+        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM.sub(/darwin\d{2}$/, 'darwin')").gem
+# MacOS with have something like x86_64-darwin19, others just x86_64-linux
+
+      - name: Verify
+        run: |
+          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          ruby bin/rspec
+          cat .rspec_status || echo ".rspec_status was not found"
+
+  verify-linux:
+    name: verify Linux binary gem on ruby-${{ matrix.ruby }}
+    needs: pack
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.1', '3.0', '2.7' ]
+    steps:
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
+        
+      - name: Download packaged gem
+        uses: actions/download-artifact@v2
+        with:
+         name: pkg-linux
+         path: pkg
+
+      - name: Install binary gem
+        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM").gem
+
+      - name: Verify
+        run: |
+          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          ruby bin/rspec
+          cat .rspec_status || echo ".rspec_status was not found"
+
+  verify-windows:
+    name: verify Windows binary gem on ruby-${{ matrix.ruby }}
+    needs: pack
+    continue-on-error: true
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+# Ruby 3.1 fails 
+# https://github.com/lutaml/expressir/issues/103      
+      matrix:
+        ruby: [ '3.1', '3.0', '2.7' ]
+    steps:
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
+        
+      - name: Download packaged gem
+        uses: actions/download-artifact@v2
+        with:
+         name: pkg-windows
+         path: pkg
+
+      - name: Install binary gem
+        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM").gem
+
+      - name: Verify
+        run: |
+          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          ruby bin/rspec
+          cat .rspec_status || echo ".rspec_status was not found"

data/.gitignore

@@ -8,10 +8,16 @@
 /tmp/
 /Gemfile.lock
 /.idea
+/.vscode
 /lib/expressir/express/express_parser.bundle
+/lib/expressir/express/express_parser.so
+/lib/expressir/express/*/express_parser.bundle
+/lib/expressir/express/*/express_parser.so
 /spec/syntax/*-pretty.exp
+/ext/express-parser/rice-embed
 
 # rspec failure tracking
 .rspec_status
 
-/ext/express-parser/rice-embed
+# rubocop guide
+.rubocop-https---*

data/.gitmodules

@@ -1,3 +1,6 @@
 [submodule "ext/express-parser/antlr4-upstream"]
 	path = ext/express-parser/antlr4-upstream
 	url = https://github.com/antlr/antlr4
+[submodule "ext/express-grammar"]
+	path = ext/express-grammar
+	url = https://github.com/lutaml/express-grammar

data/.rubocop.yml

@@ -1,8 +1,17 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
-# local repo-specific modifications
-# ...
-
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
+  SuggestExtensions: false
+  Exclude:
+    - 'vendor/**/*'
+    - 'expressir.gemspec'
+    - 'tmp/**/*'
+    - 'pkg/**/*'
+    - 'exe/format-test'
+    - 'lib/expressir/express/**/*'
+    - 'lib/expressir/model/**/*'
+
+Layout/LineLength:
+  Max: 160

data/README.adoc

@@ -75,6 +75,14 @@ Run the test suite
 bin/rspec
 ----
 
+=== Grammar updates
+EXPRESS grammar is lined as git submodule to ext/express-grammar
+Shoudl you update it, run ```rake generate```. This command will generate source code for updated native extension using antlr4-native gem.
+Please note that we create several classes on top of antlr4-native output so using embedded rake task is a real requirement.
+
+When new extension is gnerated and tested plase check in updated C++ files to git (```rake generate``` is NOT a CI step, 
+extension source files are pulled from the repo).
+
 == Installation
 
 Add this line to your application's `Gemfile`:

data/Rakefile

@@ -1,14 +1,17 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rake/extensiontask"
+require "rubocop/rake_task"
 require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 GEMSPEC = Gem::Specification.load("expressir.gemspec")
 
+RuboCop::RakeTask.new
+
 Gem::PackageTask.new(GEMSPEC).define
 
 YARD::Rake::YardocTask.new

data/bin/console

@@ -9,4 +9,3 @@ require "reeper"
 # (If you use this, don't forget to add pry to your Gemfile!)
 require "pry"
 Pry.start
-

data/bin/rspec

@@ -10,12 +10,12 @@
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/exe/expressir

@@ -11,8 +11,10 @@ $:.unshift File.expand_path("../../lib", bin_file)
 # Fixes https://github.com/rubygems/rubygems/issues/1420
 require "rubygems/specification"
 
-class Gem::Specification
-  def this; self; end
+module Gem
+  class Specification
+    def this; self; end
+  end
 end
 
 # start up the CLI

data/exe/format

@@ -15,4 +15,4 @@ formatter = Class.new(Expressir::Express::Formatter) do
 end
 result = repository.to_hash(formatter: formatter, skip_empty: true)
 
-puts YAML.dump(result)
+puts YAML.dump(result)

data/exe/format-test

@@ -24,30 +24,30 @@ exp_files = [
   # '../iso-10303-stepmod/data/resources/iso13584_expressions_schema/iso13584_expressions_schema.exp',
   # annotated-express test (12s)
   # see https://github.com/metanorma/annotated-express/blob/master/data/documents/resources/fundamentals_of_product_description_and_support/sections/04-schemas.adoc
-  '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/application_context_schema/application_context_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/approval_schema/approval_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/certification_schema/certification_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/contract_schema/contract_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/date_time_schema/date_time_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/document_schema/document_schema.exp',
-  '../iso-10303-stepmod/data/resources/effectivity_schema/effectivity_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/experience_schema/experience_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/external_reference_schema/external_reference_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/group_schema/group_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/language_schema/language_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/location_schema/location_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/management_resources_schema/management_resources_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/measure_schema/measure_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/person_organization_schema/person_organization_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/process_property_schema/process_property_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/product_definition_schema/product_definition_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/product_property_definition_schema/product_property_definition_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/product_property_representation_schema/product_property_representation_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/qualifications_schema/qualifications_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/security_classification_schema/security_classification_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
+  "../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/application_context_schema/application_context_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/approval_schema/approval_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/certification_schema/certification_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/contract_schema/contract_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/date_time_schema/date_time_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/document_schema/document_schema.exp",
+  "../iso-10303-stepmod/data/resources/effectivity_schema/effectivity_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/experience_schema/experience_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/external_reference_schema/external_reference_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/group_schema/group_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/language_schema/language_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/location_schema/location_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/management_resources_schema/management_resources_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/measure_schema/measure_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/person_organization_schema/person_organization_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/process_property_schema/process_property_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/product_definition_schema/product_definition_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/product_property_definition_schema/product_property_definition_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/product_property_representation_schema/product_property_representation_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/qualifications_schema/qualifications_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/security_classification_schema/security_classification_schema_annotated.exp",
+  "../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp",
   # full test (6m18s + 8s = 6m26s)
   # *`bundle exec ../stepmod-utils/exe/stepmod-find-express-files ../iso-10303-stepmod`.strip.split("\n").map{|file| File.exists?(file.sub(/\.exp$/, '_annotated.exp')) ? file.sub(/\.exp$/, '_annotated.exp') : file}
 ]
@@ -78,4 +78,4 @@ end
 result = repository.to_hash(formatter: formatter, skip_empty: true)
 puts "Repository.to_hash time: #{(Time.now - start).round(2)}s"
 
-# puts YAML.dump(result)
+# puts YAML.dump(result)

data/exe/generate-parser

@@ -1,29 +1,30 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
-require 'antlr4-native'
+require "fileutils"
+require "antlr4-native"
 
 grammar_file = ARGV.shift
 
 # ANTLR does weird things if the grammar file isn't in the current working directory
-temp_grammar_file = File.join(FileUtils.pwd(), File.basename(grammar_file))
+temp_grammar_file = File.join(FileUtils.pwd, File.basename(grammar_file))
 FileUtils.cp(grammar_file, temp_grammar_file)
 
 # generate parser
 generator = Antlr4Native::Generator.new(
   grammar_files: [File.basename(temp_grammar_file)],
-  output_dir: 'ext',
-  parser_root_method: 'syntax'
+  output_dir: "ext",
+  parser_root_method: "syntax",
 )
 generator.generate
 
 # fix issues with generated parser
-parser_source_file = File.join(*%w(ext express-parser express_parser.cpp))
-parser_source_lines = File.read(parser_source_file).split(/\n/)
+parser_source_file = File.join("ext", "express-parser", "express_parser.cpp")
+parser_source_lines = File.read(parser_source_file).split("\n")
 
 # - add ParserProxy tokens method, simple compensation for missing exposed BufferedTokenStream
-i = parser_source_lines.index{|x| x == '  Object syntax() {'}
-parser_source_lines[i + 6] += "\n" + <<~CPP.split(/\n/).map{|x| x != "" ? "  " + x : x}.join("\n") + "\n"
+i = parser_source_lines.index { |x| x == "  Object syntax() {" }
+parser_source_lines[i + 6] += <<~CPP.split("\n").map { |x| x == "" ? x : "  #{x}" }.join("\n")
+
   Array getTokens() {
     Array a;
 
@@ -35,14 +36,16 @@ parser_source_lines[i + 6] += "\n" + <<~CPP.split(/\n/).map{|x| x != "" ? "  " +
 
     return a;
   }
+
 CPP
-i = parser_source_lines.index{|x| x == '    .define_method("syntax", &ParserProxy::syntax)'}
-parser_source_lines[i] += "\n" + <<~CPP.split(/\n/).map{|x| x != "" ? "    " + x : x}.join("\n")
+i = parser_source_lines.index { |x| x == '    .define_method("syntax", &ParserProxy::syntax, Return().keepAlive())' }
+parser_source_lines[i] += <<~CPP.split("\n").map { |x| x == "" ? x : "    #{x}" }.join("\n")
+
   .define_method("tokens", &ParserProxy::getTokens)
 CPP
 
 # write fixed parser file
-File.write(parser_source_file, parser_source_lines.join("\n") + "\n")
+File.write(parser_source_file, "#{parser_source_lines.join("\n")}\n")
 
 # cleanup
-FileUtils.rm(temp_grammar_file)
+FileUtils.rm(temp_grammar_file)

data/expressir.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "https://github.com/lutaml/expressir/releases"
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.files         = `git ls-files`.split("\n")\
-    + Dir.glob('ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/**/*')
+    + Dir.glob("ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/**/*")
 
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
@@ -30,17 +30,19 @@ Gem::Specification.new do |spec|
 
   spec.extensions = File.join(*%w(ext express-parser extconf.rb))
 
-  spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_runtime_dependency "rice", "~> 4.0.3"
+  spec.add_runtime_dependency "thor", "~> 1.0"
+  spec.add_development_dependency "antlr4-native", "~> 2.1.0"
   spec.add_development_dependency "asciidoctor", "~> 2.0.13"
-  spec.add_development_dependency "antlr4-native", "~> 1.1.0"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "byebug", "~> 11.1"
+  spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.1"
-  spec.add_development_dependency "rake-compiler-dock", "~> 1.1"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "yard", "~> 0.9.26"
+  spec.add_development_dependency "rake-compiler", "~> 1.2"
+  spec.add_development_dependency "rake-compiler-dock", "~> 1.2.1"
+  spec.add_development_dependency "rspec", "~> 3.11"
+  spec.add_development_dependency "rubocop", "1.5.2"
+  spec.add_development_dependency "rubocop-performance", "~> 1.0"
   spec.add_development_dependency "webrick", "~> 1.7.0"
+  spec.add_development_dependency "yard", "~> 0.9.26"
 end

data/lib/expressir/config.rb

@@ -15,7 +15,7 @@ module Expressir
     attr_accessor :logs
 
     def initialize
-      @logs ||= %i(error)
+      @logs = %i(error)
     end
   end