expressir 1.2.7-x86_64-darwin → 1.2.9-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6030a88e2347a914a26a027154e318d376b7eb351b2f0e0c8d4d4245f6cf8b2d
-  data.tar.gz: 017a19262e9c57df4937713ab56da4245c9d57b4caa1a8d737d0b69be3ba7e85
+  metadata.gz: 5cb83cbad52aaa9ac9bfc628f06d15a5d29a3e73ad73d4ef926b2278cc0c164c
+  data.tar.gz: 247f7ece048630c52f07724defa6aae0a326755e4b4ef259b855e9afb5e91179
 SHA512:
-  metadata.gz: 52ebe9c49d76e588c0a4cb29e3c4c2dbb9781d2eb85b27ddf2b78beaa740e47adf0d838b45f98065863b5fe9b7b1b05869616ed5e447ac5663e1868109cad910
-  data.tar.gz: eb83287a57d97f429b3f8c0a959049c2393da4d34aa7050b5e7be7a868d258e1225e26cd789634a83b197bfedc32db6cfcb2269d63cdf9143852d299be990292
+  metadata.gz: 313c7fe5228d35b9f228d237cfafbcd6415b986101f7681c3d45632af7a5c07bcb675876643ed9d0eb16559c3d888491199db940e5ce1279fe7d325048f046e8
+  data.tar.gz: 3dc47ca6c0fd9e6dfe4e6bdf7a281b1f57c932ab68ba499a46c1b342ff60171f8bccb3625819a6f17017e559810809310161c64f775fa172cd870821b22db2ed

data/.github/workflows/rake.yml

@@ -5,6 +5,17 @@ on:
     branches: [ master, main ]
   pull_request:
 
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
+env:
+  BUNDLER_VER: 2.3.24
+# Forcing bundler version to ensure that it is consistent everywhere and
+# does not cause bundler gem reinstalls
+# bundler/rubygems 2.3.22 is a minimal requirement to support gnu/musl differentiation
+# https://github.com/rubygems/rubygems/pull/4488
+
 jobs:
   rubocop:
     runs-on: ubuntu-latest
@@ -15,9 +26,10 @@ jobs:
           submodules: recursive
 
       - name: Install Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@master
         with:
           ruby-version: 3.0
+          bundler: ${{ env.BUNDLER_VER }}
           bundler-cache: true
 
       - name: Bundle
@@ -46,13 +58,14 @@ jobs:
         run: brew install autoconf automake libtool
 
       - name: Install Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler: ${{ env.BUNDLER_VER }}
           bundler-cache: true
 
       - name: Process cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache
         with:
           path: lib/expressir/express/express_parser.*
@@ -70,8 +83,6 @@ jobs:
   # test release workflow
   pack-ruby:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -79,11 +90,12 @@ jobs:
           submodules: recursive
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@master
         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
+          bundler: ${{ env.BUNDLER_VER }}
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
@@ -92,7 +104,7 @@ jobs:
         run: gem build expressir.gemspec
 
       - name: Package gem without native extension
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pkg-ruby
           path: expressir-*.gem
@@ -110,11 +122,12 @@ jobs:
           submodules: recursive
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@master
         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
+          bundler: ${{ env.BUNDLER_VER }}
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
@@ -131,7 +144,7 @@ jobs:
         run: bundle exec rake gem:${{ matrix.host }}
 
       - name: Package gem with native extension
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pkg-${{ matrix.host }}
           path: pkg/*.gem
@@ -147,10 +160,11 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: Install Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -159,9 +173,9 @@ jobs:
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
-        
+
       - name: Download packaged gem
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
          name: pkg-ruby
          path: pkg
@@ -185,19 +199,20 @@ jobs:
         ruby: [ '3.1', '3.0', '2.7' ]
     steps:
       - name: Install Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
-        
+
       - name: Download packaged gem
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
          name: pkg-darwin
          path: pkg
@@ -222,19 +237,20 @@ jobs:
         ruby: [ '3.1', '3.0', '2.7' ]
     steps:
       - name: Install Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
-        
+
       - name: Download packaged gem
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
          name: pkg-linux
          path: pkg
@@ -255,25 +271,26 @@ jobs:
     runs-on: windows-latest
     strategy:
       fail-fast: false
-# Ruby 3.1 fails 
-# https://github.com/lutaml/expressir/issues/103      
+# 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
+        uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
-        
+
       - name: Download packaged gem
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
          name: pkg-windows
          path: pkg

data/.github/workflows/release.yml

@@ -11,17 +11,22 @@ on:
   push:
     tags: [ v* ]
 
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
 jobs:
   bump:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@master
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
+          bundler: ${{ env.BUNDLER_VER }}
 
       - if: ${{ github.event_name == 'workflow_dispatch' }} # unfortunatelly cannot keep this condition on job level
         run: |
@@ -31,21 +36,21 @@ jobs:
           gem bump --version ${{ github.event.inputs.next_version }} --tag --push
 
   pack:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: bump
     strategy:
       fail-fast: false
       matrix:
         host: [ linux, windows, darwin ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           ref: main # https://github.com/actions/checkout/issues/439#issuecomment-830862188
 
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@master
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
           # 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
 
@@ -55,7 +60,7 @@ jobs:
       - run: gem build expressir.gemspec
 
       - if: matrix.host == 'linux'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pkg-ruby
           path: expressir-*.gem
@@ -71,38 +76,38 @@ jobs:
       # build gem WITH pre-built native extension
       - run: bundle exec rake gem:${{ matrix.host }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: pkg-${{ matrix.host }}
           path: pkg/*.gem
 
   publish:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: pack
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: pkg-ruby
           path: pkg
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: pkg-linux
           path: pkg
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: pkg-windows
           path: pkg
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: pkg-darwin
           path: pkg
 
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@master
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
 
       - run: ls -l pkg/
 

data/.rubocop.yml

@@ -2,7 +2,8 @@ inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
+  NewCops: enable
   SuggestExtensions: false
   Exclude:
     - 'vendor/**/*'

data/bin/rspec

@@ -15,7 +15,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
 bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/expressir.gemspec

@@ -17,7 +17,7 @@ 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.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.files         = `git ls-files`.split("\n")\
     + Dir.glob("ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/**/*")
@@ -41,8 +41,8 @@ Gem::Specification.new do |spec|
   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 "rubocop", "1.58"
+  spec.add_development_dependency "rubocop-performance", "~> 1.19"
   spec.add_development_dependency "webrick", "~> 1.7.0"
   spec.add_development_dependency "yard", "~> 0.9.26"
 end

data/lib/expressir/express/visitor.rb

@@ -17,7 +17,7 @@ require "set"
 # - such multi-pass parsing is not implemented yet
 # - xxxRef - merged to SimpleReference
 # - entityConstructor, functionCall - merged to FunctionCall
-# 
+#
 # difference between generalized and instantiable types is not recognized
 # see note in 8.6.2 Parameter data types
 # > A syntactic construct such as ARRAY[1:3] OF REAL satisfies two syntactic productions —
@@ -69,7 +69,7 @@ module Expressir
           default
         end
       end
-    
+
       def visit_if_map(ctx)
         if ctx
           ctx.map{|ctx2| visit(ctx2)}
@@ -77,7 +77,7 @@ module Expressir
           []
         end
       end
-    
+
       def visit_if_map_flatten(ctx)
         if ctx
           ctx.map{|ctx2| visit(ctx2)}.flatten
@@ -111,15 +111,25 @@ module Expressir
         end
       end
 
+      def node_find(node, path)
+        if node.is_a?(Enumerable)
+          target_node = node.find { |item| item.find(path) }
+        else
+          target_node = node.find(path)
+        end
+        target_node
+      end
+
       def find_remark_target(node, path)
-        target_node = node.find(path)
+        target_node = node_find(node, path)
+
         return target_node if target_node
 
         # check if path can create implicit remark item
         # see https://github.com/lutaml/expressir/issues/78
         rest, _, current_path = path.rpartition(".") # get last path part
         _, _, current_path = current_path.rpartition(":") # ignore prefix
-        parent_node = node.find(rest)
+        parent_node = node_find(node, rest)
         if parent_node and parent_node.class.method_defined? :remark_items
           remark_item = Model::Declarations::RemarkItem.new(
             id: current_path
@@ -134,7 +144,7 @@ module Expressir
             parent_node.remark_items << remark_item
           end
           parent_node.reset_children_by_id
-          
+
           remark_item
         end
       end
@@ -427,7 +437,7 @@ module Expressir
         optional = ctx__OPTIONAL && true
         unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__instantiable_type)
-        
+
         Model::DataTypes::Array.new(
           bound1: bound1,
           bound2: bound2,
@@ -495,7 +505,7 @@ module Expressir
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
         base_type = visit_if(ctx__instantiable_type)
-        
+
         Model::DataTypes::Bag.new(
           bound1: bound1,
           bound2: bound2,
@@ -830,7 +840,7 @@ module Expressir
         if ctx__type_ref
           ref = visit_if(ctx__type_ref)
           attribute = visit_if(ctx__enumeration_ref)
-  
+
           Model::References::AttributeReference.new(
             ref: ref,
             attribute: attribute
@@ -1030,7 +1040,7 @@ module Expressir
         optional = ctx__OPTIONAL && true
         unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__parameter_type)
-        
+
         Model::DataTypes::Array.new(
           bound1: bound1,
           bound2: bound2,
@@ -1049,7 +1059,7 @@ module Expressir
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
         base_type = visit_if(ctx__parameter_type)
-        
+
         Model::DataTypes::Bag.new(
           bound1: bound1,
           bound2: bound2,
@@ -1068,7 +1078,7 @@ module Expressir
         bound2 = visit_if(ctx__bound_spec__bound2)
         unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__parameter_type)
-        
+
         Model::DataTypes::List.new(
           bound1: bound1,
           bound2: bound2,
@@ -1093,7 +1103,7 @@ module Expressir
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
         base_type = visit_if(ctx__parameter_type)
-        
+
         Model::DataTypes::Set.new(
           bound1: bound1,
           bound2: bound2,
@@ -1358,7 +1368,7 @@ module Expressir
         bound2 = visit_if(ctx__bound_spec__bound2)
         unique = ctx__UNIQUE && true
         base_type = visit_if(ctx__instantiable_type)
-        
+
         Model::DataTypes::List.new(
           bound1: bound1,
           bound2: bound2,
@@ -1989,7 +1999,7 @@ module Expressir
             end
           end
         end
-        
+
         Model::Declarations::SchemaVersion.new(
           value: value,
           items: items
@@ -2042,7 +2052,7 @@ module Expressir
         bound1 = visit_if(ctx__bound_spec__bound1)
         bound2 = visit_if(ctx__bound_spec__bound2)
         base_type = visit_if(ctx__instantiable_type)
-        
+
         Model::DataTypes::Set.new(
           bound1: bound1,
           bound2: bound2,
@@ -2087,7 +2097,7 @@ module Expressir
       def visit_simple_factor_expression(ctx)
         ctx__expression = ctx.expression
         ctx__primary = ctx.primary
-        
+
         visit_if(ctx__expression || ctx__primary)
       end
 
@@ -2575,4 +2585,4 @@ module Expressir
       end
     end
   end
-end
+end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.2.7".freeze
+  VERSION = "1.2.9".freeze
 end

data/rakelib/cross-ruby.rake

@@ -126,7 +126,7 @@ CrossRuby = Struct.new(:version, :host) do
 
   def verify_entry_linux(dll)
     nm = `#{["env", "LANG=C", tool("nm"), "-D", dll].shelljoin}`
-    unless / T Init_express_parser/.match?(nm)
+    unless nm.include?(" T Init_express_parser")
       raise "Export function Init_express_parser not in dll #{dll}"
     end
   end
@@ -223,7 +223,7 @@ CrossRuby = Struct.new(:version, :host) do
   end
 
   def actual_dlls_windows(dump)
-    dump.scan(/DLL Name: (.*)$/).map(&:first).map(&:downcase).uniq
+    dump.scan(/DLL Name: (.*)$/).map { |x| x.first.downcase }.uniq
   end
 
   def actual_dlls_darwin(dll)
@@ -272,12 +272,12 @@ CrossRuby = Struct.new(:version, :host) do
   end
 end
 
-CROSS_RUBIES = File.read(".cross_rubies").split("\n").map do |line|
+CROSS_RUBIES = File.read(".cross_rubies").split("\n").filter_map do |line|
   case line
   when /\A([^#]+):([^#]+)/
     CrossRuby.new($1, $2)
   end
-end.compact
+end
 
 ENV["RUBY_CC_VERSION"] = CROSS_RUBIES.map(&:ver).uniq.join(":")
 
@@ -329,7 +329,7 @@ namespace "gem" do
         #{pre_req(plat)} &&
         gem install bundler --no-document &&
         bundle &&
-        bundle exec rake gem:#{plat}:builder MAKE='nice make -j`nproc`'
+        bundle exec rake gem:#{plat}:builder MAKE="nice make -j`nproc`"
       RCD
     end
 

data/spec/syntax/remark.exp

@@ -23,7 +23,9 @@ ENTITY remark_entity;
   DERIVE remark_derived_attribute : STRING := 'xxx';
   INVERSE remark_inverse_attribute : remark_entity FOR remark_attribute;
   UNIQUE UR1: remark_attribute;
-  WHERE WR1: TRUE;
+  WHERE WR1:
+  --"unusual_placement" placed inside WHERE clauses (or other enumerable context)
+  TRUE;
   --"remark_attribute" entity scope - entity attribute
   --"remark_derived_attribute" entity scope - entity derived attribute
   --"remark_inverse_attribute" entity scope - entity inverse attribute
@@ -188,4 +190,4 @@ END_SCHEMA;
 --"remark_schema.remark_procedure.remark_enumeration_item" universal scope - procedure enumeration item, on the same level as the type
 --"remark_schema.remark_procedure.remark_constant" universal scope - procedure constant
 --"remark_schema.remark_procedure.remark_variable" universal scope - procedure variable
---"remark_schema.remark_item" universal scope - schema remark item
+--"remark_schema.remark_item" universal scope - schema remark item

data/spec/syntax/remark.yaml

@@ -133,6 +133,11 @@ schemas:
       - schema scope - entity where, with prefix
       - universal scope - entity where
       - universal scope - entity where, with prefix
+      remark_items:
+      - _class: Expressir::Model::Declarations::RemarkItem
+        id: unusual_placement
+        remarks:
+        - placed inside WHERE clauses (or other enumerable context)
       expression:
         _class: Expressir::Model::Literals::Logical
         value: :TRUE

data/spec/syntax/remark_formatted.exp

@@ -146,6 +146,7 @@ several physical lines.
 --"remark_schema.remark_entity.WR1" schema scope - entity where, with prefix
 --"remark_schema.remark_entity.WR1" universal scope - entity where
 --"remark_schema.remark_entity.WR1" universal scope - entity where, with prefix
+--"remark_schema.remark_entity.WR1.unusual_placement" placed inside WHERE clauses (or other enumerable context)
 --"remark_schema.remark_entity.IP1" entity scope - entity informal proposition
 --"remark_schema.remark_entity.IP1" entity scope - entity informal proposition, with prefix
 --"remark_schema.remark_entity.IP1" schema scope - entity informal proposition

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: x86_64-darwin
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.58'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.58'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement