expressir 0.2.5 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567720b9ed58f631e97fe20795af2c4b99850cadb1e6fef158d8d264cde9a201
-  data.tar.gz: a9ecc46df11220f963c69235c1b27aa7d97bad00b5b961f16bc1548feed2e2a7
+  metadata.gz: b7ba84b2e2bb6810108340208cb5d2e72047af1576990acfeb73c4f077eb8ba2
+  data.tar.gz: e92db63b885211b20df63adb3f91e6bb299af7ce745aa4c6f9557e7deb583257
 SHA512:
-  metadata.gz: 278e45df08db09c8e84d5c61173315e80a68bdadd1c729940f42e07a684255b15cf1ab82edd6d241304f896e5a06e71a00008d8975f20e7e513b314db69c1afc
-  data.tar.gz: 642fdc300642949ab9d6eeb9d3142ac0972383930b56909f3aafada88164527fb74440b94eb61504e584e2b80452c2defbc9d5fab8445bba8bd7f58d58c0fb00
+  metadata.gz: 5ded502bc8563615f49af32175de1127b41aa019f0efe42699ba953da542bc5df04d3639196c6355f55d1b12c94b496eb8bfe03e1e41a179df69bfd97270dc5a
+  data.tar.gz: 99015fc2a30fe12f69ccd861ffd49e54593666e6892176f0076c90f215df282bb77c83ddf7bf197915366bdab162757a1834851dd4118426de9fb38735c69855

data/.cross_rubies

@@ -0,0 +1,30 @@
+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: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:x86_64-darwin
+2.7.0:arm64-darwin
+2.6.0:i686-w64-mingw32
+2.6.0:x86_64-w64-mingw32
+2.6.0:i686-linux-gnu
+2.6.0:x86_64-linux-gnu
+2.6.0:x86_64-darwin
+2.6.0:arm64-darwin
+2.5.0:i686-w64-mingw32
+2.5.0:x86_64-w64-mingw32
+2.5.0:i686-linux-gnu
+2.5.0:x86_64-linux-gnu
+2.5.0:x86_64-darwin
+2.5.0:arm64-darwin
+2.4.0:i686-w64-mingw32
+2.4.0:x86_64-w64-mingw32
+2.4.0:i686-linux-gnu
+2.4.0:x86_64-linux-gnu
+2.4.0:x86_64-darwin
+2.4.0:arm64-darwin

data/.github/workflows/rake.yml

@@ -3,8 +3,6 @@ name: rake
 on:
   push:
     branches: [ master ]
-    tags:
-      - '*'
   pull_request:
 
 jobs:
@@ -18,28 +16,29 @@ jobs:
         ruby: [ '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
+        include:
+          - ruby: '3.0'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'macos-latest'
+            experimental: true
 
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
 
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
-
       - if: matrix.os == 'macos-latest'
         run: brew install autoconf automake libtool
 
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
       - run: bundle exec rake compile
 

data/.github/workflows/release.yml

@@ -7,11 +7,11 @@ on:
 
 jobs:
   pack:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        host: [ linux, windows, darwin ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -19,39 +19,48 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.4'
-
-      - if: matrix.os == 'macos-latest'
-        run: brew install autoconf automake libtool
+          ruby-version: '2.6'
 
       - run: bundle install --jobs 4 --retry 3
 
-      - run: bundle exec rake native gem
+      - run: gem build expressir.gemspec
+
+      - if: matrix.host == 'linux'
+        uses: actions/upload-artifact@v2
+        with:
+          name: pkg-ruby
+          path: expressir-*.gem
 
-      - run: bundle exec rake
+      - run: bundle exec rake gem:${{ matrix.host }}
 
       - uses: actions/upload-artifact@v2
         with:
-          name: pkg-${{ matrix.os }}
+          name: pkg-${{ matrix.host }}
           path: pkg/*.gem
 
+
   release:
     runs-on: ubuntu-18.04
     needs: pack
     steps:
       - uses: actions/download-artifact@v2
         with:
-          name: pkg-ubuntu-latest
+          name: pkg-ruby
+          path: pkg
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: pkg-linux
           path: pkg
 
       - uses: actions/download-artifact@v2
         with:
-          name: pkg-windows-latest
+          name: pkg-windows
           path: pkg
 
       - uses: actions/download-artifact@v2
         with:
-          name: pkg-macos-latest
+          name: pkg-darwin
           path: pkg
 
       - uses: ruby/setup-ruby@v1
@@ -62,14 +71,13 @@ jobs:
 
       - name: Publish to rubygems.org
         env:
-          RUBYGEMS_API_KEY: ${{secrets.LUTAML_CI_RUBYGEMS_API_KEY}}
+          RUBYGEMS_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
         run: |
           mkdir -p ~/.gem
-          cat <<'EOF' > ~/.gem/credentials
+          cat > ~/.gem/credentials << EOF
           ---
           :rubygems_api_key: ${RUBYGEMS_API_KEY}
           EOF
           chmod 0600 ~/.gem/credentials
-          gem -v
           gem signin
-          for gem in pkg/*.gem; do gem push $gem -V -k rubygems ; done
+          for gem in pkg/*.gem; do gem push $gem -V; done

data/.gitignore

@@ -8,8 +8,10 @@
 /tmp/
 /Gemfile.lock
 /.idea
-/lib/express_parser.bundle
+/lib/expressir/express_exp/express_parser.bundle
 /original/examples/syntax/*-pretty.exp
 
 # rspec failure tracking
 .rspec_status
+
+/ext/express-parser/rice-embed

data/Gemfile

@@ -2,5 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in reeper.gemspec
 gemspec
-
-gem "rake-compiler", git: "https://github.com/larskanis/rake-compiler", branch: "fix-native-version"

data/Rakefile

@@ -6,12 +6,6 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-spec = Gem::Specification.load("expressir.gemspec")
+GEMSPEC = Gem::Specification.load("expressir.gemspec")
 
-# add your default gem packing task
-Gem::PackageTask.new(spec) do |pkg|
-end
-
-ext = Rake::ExtensionTask.new("express_parser", spec) do |ext|
-  ext.ext_dir = "ext/express-parser"
-end
+Gem::PackageTask.new(GEMSPEC).define

data/expressir.gemspec

@@ -17,6 +17,8 @@ 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.files         = `git ls-files`.split("\n")\
     + Dir.glob('ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/**/*')
 
@@ -28,13 +30,14 @@ Gem::Specification.new do |spec|
 
   spec.extensions = File.join(*%w(ext express-parser extconf.rb))
 
+  spec.add_runtime_dependency "nokogiri", "~> 1.10"
   spec.add_runtime_dependency "thor", "~> 1.0"
-  spec.add_runtime_dependency "rice", "~> 2.2.0"
+  spec.add_runtime_dependency "rice", "~> 3"
   spec.add_development_dependency "antlr4-native", "~> 1.1.0"
-  spec.add_development_dependency "nokogiri", "~> 1.10"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.1.1"
+  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"
 end

data/ext/express-parser/express_parser.cpp

@@ -1,24 +1,26 @@
 #include <iostream>
 
-#include "antlr4-runtime.h"
+#include <antlr4-runtime.h>
 
-#include "ExpressParser.h"
-#include "ExpressBaseVisitor.h"
-#include "ExpressLexer.h"
+#include "antlrgen/ExpressParser.h"
+#include "antlrgen/ExpressBaseVisitor.h"
+#include "antlrgen/ExpressLexer.h"
 
-#include "rice/Array.hpp"
-#include "rice/Class.hpp"
-#include "rice/Constructor.hpp"
-#include "rice/Director.hpp"
+#include <rice/Array.hpp>
+#include <rice/Class.hpp>
+#include <rice/Constructor.hpp>
+#include <rice/Director.hpp>
 
 #ifdef _WIN32
-#undef FALSE
-#undef TRUE
 #undef OPTIONAL
 #undef IN
 #undef OUT
 #endif
 
+// ruby-3.0
+#undef FALSE
+#undef TRUE
+
 using namespace std;
 using namespace Rice;
 using namespace antlr4;

data/ext/express-parser/extconf.rb

@@ -1,34 +1,57 @@
-require 'mkmf-rice'
+require 'rubygems'
+require 'mkmf'
 
 extension_name = 'express_parser'
-dir_config(extension_name)
-
-have_library('stdc++')
-
-$CFLAGS << ' -std=c++14 -DANTLR4CPP_STATIC'
-
-include_paths = [
-  '.',
-  'antlrgen',
-  'antlr4-upstream/runtime/Cpp/runtime/src',
-  'antlr4-upstream/runtime/Cpp/runtime/src/atn',
-  'antlr4-upstream/runtime/Cpp/runtime/src/dfa',
-  'antlr4-upstream/runtime/Cpp/runtime/src/misc',
-  'antlr4-upstream/runtime/Cpp/runtime/src/support',
-  'antlr4-upstream/runtime/Cpp/runtime/src/tree',
-  'antlr4-upstream/runtime/Cpp/runtime/src/tree/pattern',
-  'antlr4-upstream/runtime/Cpp/runtime/src/tree/xpath'
+cross_build = enable_config("cross-build")
+
+antlr4_src = 'antlr4-upstream/runtime/Cpp/runtime/src'
+src_paths = [
+  ".",
+  "antlrgen",
+  "#{antlr4_src}",
+  "#{antlr4_src}/atn",
+  "#{antlr4_src}/dfa",
+  "#{antlr4_src}/misc",
+  "#{antlr4_src}/support",
+  "#{antlr4_src}/tree",
+  "#{antlr4_src}/tree/pattern",
+  "#{antlr4_src}/tree/xpath",
 ]
 
-$srcs = []
+if cross_build
+  rice_subdir = "rice-embed"
+  rice_root = Gem.loaded_specs["rice"].full_gem_path
+  rice_src = File.join(rice_root, "rice")
+  rice_embed = File.join(__dir__, rice_subdir)
+  unless File.exists?(rice_embed)
+    FileUtils.mkdir_p(rice_embed)
+    FileUtils.cp_r(Dir.glob(rice_src), rice_embed)
+    File.delete(*Dir.glob("#{rice_embed}/**/*.o"))
+    File.delete(*Dir.glob("#{rice_embed}/**/Makefile"))
+  end
 
-include_paths.each do |include_path|
-  $INCFLAGS << " -I#{__dir__}/#{include_path}"
-  $VPATH << "#{__dir__}/#{include_path}"
+  src_paths.push("#{rice_subdir}/rice", "#{rice_subdir}/rice/detail")
 
-  Dir.glob("#{__dir__}/#{include_path}/*.cpp").each do |path|
-    $srcs << path
+  $INCFLAGS << " -I#{__dir__}/#{rice_subdir}"
+
+  if RbConfig::CONFIG['target_os'] =~ /mingw32|mswin/
+    # workaround for 'w64-mingw32-as: express_parser.o: too many sections'
+    $CXXFLAGS << " -O3 -Wa,-mbig-obj"
   end
+else
+  require 'mkmf-rice'
+
+  dir_config(extension_name)
+end
+
+$CPPFLAGS << " -std=c++14 -DANTLR4CPP_STATIC -DHAVE_CXX11"
+$INCFLAGS << " -I#{__dir__}/#{antlr4_src}"
+$srcs = []
+
+src_paths.each do |src_path|
+  abs_src_path = File.join(__dir__, src_path)
+  $VPATH << abs_src_path
+  $srcs.push(*Dir["#{abs_src_path}/*.cpp"])
 end
 
-create_makefile(extension_name)
+create_makefile "expressir/express_exp/#{extension_name}"

data/lib/expressir/express_exp/formatter.rb

@@ -233,6 +233,10 @@ module Expressir
       end
 
       def format_entity(node)
+        explicit_attributes = node.attributes.select{|x| x.kind == Model::Attribute::EXPLICIT}
+        derived_attributes = node.attributes.select{|x| x.kind == Model::Attribute::DERIVED}
+        inverse_attributes = node.attributes.select{|x| x.kind == Model::Attribute::INVERSE}
+
         [
           [
             'ENTITY',
@@ -290,19 +294,19 @@ module Expressir
             end,
             ';'
           ].join(''),
-          *if node.explicit_attributes and node.explicit_attributes.length > 0
-            indent(node.explicit_attributes.map{|x| format(x)}.join("\n"))
+          *if explicit_attributes and explicit_attributes.length > 0
+            indent(explicit_attributes.map{|x| format(x)}.join("\n"))
           end,
-          *if node.derived_attributes and node.derived_attributes.length > 0
+          *if derived_attributes and derived_attributes.length > 0
             indent([
               'DERIVE',
-              indent(node.derived_attributes.map{|x| format(x)}.join("\n")),
+              indent(derived_attributes.map{|x| format(x)}.join("\n")),
             ].join("\n"))
           end,
-          *if node.inverse_attributes and node.inverse_attributes.length > 0
+          *if inverse_attributes and inverse_attributes.length > 0
             indent([
               'INVERSE',
-              indent(node.inverse_attributes.map{|x| format(x)}.join("\n")),
+              indent(inverse_attributes.map{|x| format(x)}.join("\n")),
             ].join("\n"))
           end,
           *if node.unique and node.unique.length > 0
@@ -347,8 +351,20 @@ module Expressir
             format(node.return_type),
             ';'
           ].join(''),
-          *if node.declarations and node.declarations.length > 0
-            indent(node.declarations.map{|x| format(x)}.join("\n"))
+          *if node.types and node.types.length > 0
+            indent(node.types.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.entities and node.entities.length > 0
+            indent(node.entities.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.functions and node.functions.length > 0
+            indent(node.functions.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.procedures and node.procedures.length > 0
+            indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
           *if node.constants and node.constants.length > 0
             indent([
@@ -395,7 +411,7 @@ module Expressir
               "\n",
               INDENT,
               '(',
-              node.items.map{|x| format(x)},
+              node.items.map{|x| format(x)}.join(', '),
               ')'
             ].join('')
           end,
@@ -434,8 +450,20 @@ module Expressir
             end,
             ';'
           ].join(''),
-          *if node.declarations and node.declarations.length > 0
-            indent(node.declarations.map{|x| format(x)}.join("\n"))
+          *if node.types and node.types.length > 0
+            indent(node.types.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.entities and node.entities.length > 0
+            indent(node.entities.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.functions and node.functions.length > 0
+            indent(node.functions.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.procedures and node.procedures.length > 0
+            indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
           *if node.constants and node.constants.length > 0
             indent([
@@ -500,8 +528,20 @@ module Expressir
             ')',
             ';'
           ].join(''),
-          *if node.declarations and node.declarations.length > 0
-            indent(node.declarations.map{|x| format(x)}.join("\n"))
+          *if node.types and node.types.length > 0
+            indent(node.types.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.entities and node.entities.length > 0
+            indent(node.entities.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            indent(node.subtype_constraints.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.functions and node.functions.length > 0
+            indent(node.functions.map{|x| format(x)}.join("\n"))
+          end,
+          *if node.procedures and node.procedures.length > 0
+            indent(node.procedures.map{|x| format(x)}.join("\n"))
           end,
           *if node.constants and node.constants.length > 0
             indent([
@@ -566,8 +606,23 @@ module Expressir
               ].join('')
             ].join("\n")
           end,
-          *if node.declarations and node.declarations.length > 0
-            node.declarations.map{|x| format(x)}.join("\n\n")
+          *if node.types and node.types.length > 0
+            node.types.map{|x| format(x)}.join("\n")
+          end,
+          *if node.entities and node.entities.length > 0
+            node.entities.map{|x| format(x)}.join("\n")
+          end,
+          *if node.subtype_constraints and node.subtype_constraints.length > 0
+            node.subtype_constraints.map{|x| format(x)}.join("\n")
+          end,
+          *if node.functions and node.functions.length > 0
+            node.functions.map{|x| format(x)}.join("\n")
+          end,
+          *if node.procedures and node.procedures.length > 0
+            node.procedures.map{|x| format(x)}.join("\n")
+          end,
+          *if node.rules and node.rules.length > 0
+            node.rules.map{|x| format(x)}.join("\n")
           end,
           [
             'END_SCHEMA',
@@ -832,7 +887,7 @@ module Expressir
           ' ',
           '<*',
           ' ',
-          format(node.source),
+          format(node.aggregate_source),
           ' ',
           '|',
           ' ',
@@ -1226,7 +1281,7 @@ module Expressir
               format(node.extension_type)
             ].join('')
           end,
-          *if node.extension_items
+          *if node.extension_items and node.extension_items.length > 0
             [
               ' ',
               'WITH',
@@ -1330,7 +1385,7 @@ module Expressir
               format(node.extension_type)
             ].join('')
           end,
-          *if node.extension_items
+          *if node.extension_items and node.extension_items.length > 0
             [
               ' ',
               'WITH',
@@ -1437,11 +1492,7 @@ module Expressir
         [
           *format_remarks(node),
           *if node.class.method_defined? :children
-            node.children.flat_map do |x|
-              if x != node
-                format_scope_remarks(x)
-              end
-            end
+            node.children.select{|x| x.parent == node}.flat_map{|x| format_scope_remarks(x)}
           end
         ]
       end