expressir 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ffc6b0439702c043c6a606ba6c45e6316027be0bc838b647f53b14e849e482e
-  data.tar.gz: 8d10711fbe684dcc368481a2cbb909d055461e66e5ee1ad9ed8b66d447e29781
+  metadata.gz: be523698bc4b0f210e3beb5e8eaa2b05b5ab33b8c5c32762a269759d6d3f6fd7
+  data.tar.gz: f49b97df3c0fce460a9d5374cff70d6f29b0ada6e972619230398d653e489385
 SHA512:
-  metadata.gz: 5b3831d6d8286cfe7d5c017f5be55f736d4ac1400e06c2dd95076e9929733b8ca397026d76d213bbaee715b1684331026377fdeee916ece5c70509d64c109d83
-  data.tar.gz: b70488df7783479437049194aae50b8ef8f676f2d218589075fe177558fe619cbaa60c6223ad6a326c2d593dfc16034ce4506321e2e094586682fd997ed0a9f1
+  metadata.gz: b816ba44ca7dba9ea6f1186c0ed714255947d52b1412e97109e6b094c8d51234e8fb87b5a24971f68915e5d0180b8dfd8e560910e5994428cd7a18ba8c8c3090
+  data.tar.gz: 3509a1d1edd20451ccb18a7d3bf3fb0e74ea9fad1285fe7c83de32684e9bb117f7509e1f7e8a382215f00ab37f94d4e1c9688171edece8270a37eedb4a77bafb

data/.github/workflows/rake.yml

@@ -29,23 +29,11 @@ jobs:
   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:
       - name: Checkout

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/ext/express-parser/express_parser.cpp

@@ -228,6 +228,8 @@ Class rb_cParser;
 Class rb_cParseTree;
 Class rb_cTerminalNode;
 Class rb_cContextProxy;
+Class rb_cParserExt;
+Class rb_cTokenExt;
 
 namespace Rice::detail {
   template <>
@@ -258,6 +260,28 @@ namespace Rice::detail {
   };
 }
 
+class TokenProxy : public Object {
+  public:
+    TokenProxy(Token* orig) {
+      this -> orig = orig;
+    }
+
+    std::string getText() {
+      return orig->getText();
+    }
+
+    size_t getChannel() {
+      return orig->getChannel();
+    }
+
+    size_t getTokenIndex() {
+      return orig->getTokenIndex();
+    }
+
+  private:
+    Token * orig = nullptr;
+};
+
 class ContextProxy {
 public:
   ContextProxy(tree::ParseTree* orig) {
@@ -17256,17 +17280,6 @@ public:
     return detail::To_Ruby<SyntaxContextProxy>().convert(proxy);
   }
 
-  Array getTokens() {
-    Array a;
-
-    std::vector<Token*> tokens = this -> tokens -> getTokens();
-
-    for (auto &token : tokens) {
-      a.push(token);
-    }
-
-    return a;
-  }
   Object visit(VisitorProxy* visitor) {
     auto result = visitor -> visit(this -> parser -> syntax());
 
@@ -18121,6 +18134,59 @@ Object ContextProxy::wrapParseTree(tree::ParseTree* node) {
   }
 }
 
+class ParserProxyExt : public Object {
+  public:
+    ParserProxyExt(Object self, string file) {
+      ifstream stream;
+      stream.open(file);
+      input = new ANTLRInputStream(stream);
+      lexer = new ExpressLexer(input);
+      tokens = new CommonTokenStream(lexer);
+      parser = new ExpressParser(tokens);
+      stream.close();
+    };
+
+    ~ParserProxyExt() {
+      delete parser;
+      delete tokens;
+      delete lexer;
+      delete input;
+    }
+
+    Object syntax() {
+      auto ctx = parser -> syntax();
+
+      SyntaxContextProxy proxy((ExpressParser::SyntaxContext*) ctx);
+      return detail::To_Ruby<SyntaxContextProxy>().convert(proxy);
+    }
+
+    Array getTokens() {
+      Array a;
+      for (auto token : tokens -> getTokens()) {
+        a.push(new TokenProxy(token));
+      }
+      return a;
+    }
+
+    Object visit(VisitorProxy* visitor) {
+      auto result = visitor -> visit(parser -> syntax());
+
+      lexer -> reset();
+      parser -> reset();
+
+      try {
+        return std::any_cast<Object>(result);
+      } catch(std::bad_cast) {
+       return Qnil;
+      }
+    }
+
+  private:
+    ANTLRInputStream* input;
+    ExpressLexer* lexer;
+    CommonTokenStream* tokens;
+    ExpressParser* parser;
+};
 
 extern "C"
 void Init_express_parser() {
@@ -18353,9 +18419,19 @@ void Init_express_parser() {
     .define_singleton_function("parse", &ParserProxy::parse)
     .define_singleton_function("parse_file", &ParserProxy::parseFile)
     .define_method("syntax", &ParserProxy::syntax, Return().keepAlive())
-    .define_method("tokens", &ParserProxy::getTokens)
     .define_method("visit", &ParserProxy::visit, Return().keepAlive());
 
+  rb_cTokenExt = define_class_under<TokenProxy>(rb_mExpressParser, "TokenExt")
+    .define_method("text", &TokenProxy::getText)
+    .define_method("channel", &TokenProxy::getChannel)
+    .define_method("token_index", &TokenProxy::getTokenIndex);
+
+  rb_cParserExt = define_class_under<ParserProxyExt>(rb_mExpressParser, "ParserExt")
+    .define_constructor(Constructor<ParserProxyExt, Object, string>())
+    .define_method("syntax", &ParserProxyExt::syntax, Return().keepAlive())
+    .define_method("tokens", &ParserProxyExt::getTokens)
+    .define_method("visit", &ParserProxyExt::visit, Return().keepAlive());
+
   rb_cAttributeRefContext = define_class_under<AttributeRefContextProxy, ContextProxy>(rb_mExpressParser, "AttributeRefContext")
     .define_method("attribute_id", &AttributeRefContextProxy::attributeId);
 

data/ext/express-parser/extconf.rb

@@ -41,7 +41,7 @@ if cross_build
     # workaround for LoadError: 127: The specified procedure could not be found.
     $DLDFLAGS << " -static-libgcc -static-libstdc++"
   when /darwin/
-    $CXXFLAGS << " -mmacosx-version-min=10.14 -Wno-register -fno-c++-static-destructors"
+    $CXXFLAGS << " -mmacosx-version-min=10.14 -fno-c++-static-destructors"
     $DLDFLAGS << " -mmacosx-version-min=10.14"
   end
 else

data/lib/expressir/express/parser.rb

@@ -31,13 +31,12 @@ module Expressir
       # @param [Boolean] include_source attach original source code to model elements
       # @return [Model::Repository]
       def self.from_file(file, skip_references: nil, include_source: nil)
-        @input = File.read(file)
 
       # An important note re memory management
-      # parse, syntax, visitor methods return complex tree structures created in netive (C++) extension
+      # parse, syntax, visitor methods return complex tree structures created in native (C++) extension
       # visit method references nodes and leaves of this structures but it is totally untransparent for Ruby GarbageCllector
-      # so in this class we keep those C++ structure marked for GC so theu are not freed 
-        @parser = ::ExpressParser::Parser.parse(@input)
+      # so in this class we keep those C++ structure marked for GC so they are not freed 
+        @parser = ::ExpressParser::ParserExt.new(file.to_s)
         @parse_tree = @parser.syntax()
 
         @visitor = Visitor.new(@parser.tokens, include_source: include_source)

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.2.5".freeze
+  VERSION = "1.2.6".freeze
 end

data/rakelib/antlr4-native.rake

@@ -2,34 +2,138 @@ require "fileutils"
 require "antlr4-native"
 require "rake"
 
-def create_tokens_api(parser_source_lines)
-  # - add ParserProxy tokens method, simple compensation for missing exposed BufferedTokenStream
-  i = parser_source_lines.index { |x| x == "  Object syntax() {" }
-  parser_source_lines[i + 6] += <<~CPP.split("\n").map { |x| x == "" ? x : "  #{x}" }.join("\n")
+def create_class_declarations(parser_source_lines)
+  i = parser_source_lines.index { |x| x == "Class rb_cContextProxy;" }
+  parser_source_lines[i] += <<~CPP.split("\n").map { |x| x == "" ? x : x.to_s }.join("\n")
 
-    Array getTokens() {
-      Array a;
+    Class rb_cParserExt;
+    Class rb_cTokenExt;
 
-      std::vector<Token*> tokens = this -> tokens -> getTokens();
+  CPP
+end
+
+def create_tp_class_definition(parser_source_lines)
+  i = parser_source_lines.index { |x| x == "class ContextProxy {" }
+  parser_source_lines[i - 2] += <<~CPP.split("\n").map { |x| x == "" ? x : x.to_s }.join("\n")
+
+
+    class TokenProxy : public Object {
+      public:
+        TokenProxy(Token* orig) {
+          this -> orig = orig;
+        }
+
+        std::string getText() {
+          return orig->getText();
+        }
+
+        size_t getChannel() {
+          return orig->getChannel();
+        }
+
+        size_t getTokenIndex() {
+          return orig->getTokenIndex();
+        }
+
+      private:
+        Token * orig = nullptr;
+    };
+
+  CPP
+end
+
+def create_pp_class_definition(parser_source_lines)
+  i = parser_source_lines.index { |x| x == "extern \"C\"" }
+  parser_source_lines[i - 2] += <<~CPP.split("\n").map { |x| x == "" ? x : x.to_s }.join("\n")
+
+    class ParserProxyExt : public Object {
+      public:
+        ParserProxyExt(Object self, string file) {
+          ifstream stream;
+          stream.open(file);
+          input = new ANTLRInputStream(stream);
+          lexer = new ExpressLexer(input);
+          tokens = new CommonTokenStream(lexer);
+          parser = new ExpressParser(tokens);
+          stream.close();
+        };
+
+        ~ParserProxyExt() {
+          delete parser;
+          delete tokens;
+          delete lexer;
+          delete input;
+        }
+
+        Object syntax() {
+          auto ctx = parser -> syntax();
+
+          SyntaxContextProxy proxy((ExpressParser::SyntaxContext*) ctx);
+          return detail::To_Ruby<SyntaxContextProxy>().convert(proxy);
+        }
 
-      for (auto &token : tokens) {
-        a.push(token);
-      }
+        Array getTokens() {
+          Array a;
+          for (auto token : tokens -> getTokens()) {
+            a.push(new TokenProxy(token));
+          }
+          return a;
+        }
+
+        Object visit(VisitorProxy* visitor) {
+          auto result = visitor -> visit(parser -> syntax());
+
+          lexer -> reset();
+          parser -> reset();
+
+          try {
+            return std::any_cast<Object>(result);
+          } catch(std::bad_cast) {
+           return Qnil;
+          }
+        }
+
+      private:
+        ANTLRInputStream* input;
+        ExpressLexer* lexer;
+        CommonTokenStream* tokens;
+        ExpressParser* parser;
+    };
 
-      return a;
-    }
 
   CPP
 end
 
-def create_tokens_method(parser_source_lines)
-  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")
+def create_class_api(parser_source_lines)
+  i = parser_source_lines.index { |x| x == "    .define_method(\"visit\", &ParserProxy::visit, Return().keepAlive());" }
+  parser_source_lines[i] += <<~CPP.split("\n").map { |x| x == "" ? x : "  #{x}" }.join("\n")
+
+
+    rb_cTokenExt = define_class_under<TokenProxy>(rb_mExpressParser, "TokenExt")
+      .define_method("text", &TokenProxy::getText)
+      .define_method("channel", &TokenProxy::getChannel)
+      .define_method("token_index", &TokenProxy::getTokenIndex);
+
+    rb_cParserExt = define_class_under<ParserProxyExt>(rb_mExpressParser, "ParserExt")
+      .define_constructor(Constructor<ParserProxyExt, Object, string>())
+      .define_method("syntax", &ParserProxyExt::syntax, Return().keepAlive())
+      .define_method("tokens", &ParserProxyExt::getTokens)
+      .define_method("visit", &ParserProxyExt::visit, Return().keepAlive());
 
-    .define_method("tokens", &ParserProxy::getTokens)
   CPP
 end
 
+def generate_extended_parser
+  # Generate extended parser that provide Ruby access to token stream
+  parser_source_file = File.join("ext", "express-parser", "express_parser.cpp")
+  parser_source_lines = File.read(parser_source_file).split("\n")
+  create_class_declarations(parser_source_lines)
+  create_tp_class_definition(parser_source_lines)
+  create_pp_class_definition(parser_source_lines)
+  create_class_api(parser_source_lines)
+  File.write(parser_source_file, "#{parser_source_lines.join("\n")}\n")
+end
+
 desc "Generate parser  (Usage: 'rake generate <grammar_file>')"
 task "generate" do
   grammar_file = ARGV[1]
@@ -38,7 +142,6 @@ task "generate" do
   end
 
   puts "Generating parser from '#{grammar_file}'"
-
   # 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))
   FileUtils.cp(grammar_file, temp_grammar_file)
@@ -51,13 +154,8 @@ task "generate" do
   )
   generator.generate
 
-  # fix issues with generated parser
-  parser_source_file = File.join("ext", "express-parser", "express_parser.cpp")
-  parser_source_lines = File.read(parser_source_file).split("\n")
-  create_tokens_api(parser_source_lines)
-  create_tokens_method(parser_source_lines)
-  File.write(parser_source_file, "#{parser_source_lines.join("\n")}\n")
-
+  puts "Generating extended parser"
+  generate_extended_parser
   # cleanup
   FileUtils.rm(temp_grammar_file)
 end

data/spec/acceptance/version_spec.rb

@@ -5,6 +5,11 @@ RSpec.describe "Expressir" do
     it "has a version number" do |example|
       print "\n[#{example.description}] "
       expect(Expressir::VERSION).not_to be nil
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "displays the current verison" do |example|
@@ -12,6 +17,11 @@ RSpec.describe "Expressir" do
       command = %w(version)
       output = capture_stdout { Expressir::Cli.start(command) }
       expect(output).to include("Version #{Expressir::VERSION}")
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 end

data/spec/expressir/express/cache_spec.rb

@@ -24,6 +24,11 @@ RSpec.describe Expressir::Express::Cache do
         temp_file.close
         temp_file.unlink
       end
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 
@@ -44,6 +49,11 @@ RSpec.describe Expressir::Express::Cache do
         temp_file.close
         temp_file.unlink
       end
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "fails parsing a file from a different Expressir version" do |example|
@@ -62,6 +72,11 @@ RSpec.describe Expressir::Express::Cache do
         temp_file.close
         temp_file.unlink
       end
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 end

data/spec/expressir/express/formatter_spec.rb

@@ -19,6 +19,11 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "exports an object (multiple.exp)" do |example|
@@ -33,6 +38,9 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "exports an object (remark.exp)" do |example|
@@ -47,6 +55,11 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "exports an object (syntax.exp)" do |example|
@@ -61,6 +74,11 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "exports an object with schema head formatter (syntax.exp)" do |example|
@@ -78,6 +96,11 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "exports an object with hyperlink formatter (syntax.exp)" do |example|
@@ -95,6 +118,11 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "exports an object with hyperlink formatter (multiple.exp)" do |example|
@@ -112,6 +140,11 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "exports an object with schema head and hyperlink formatter (multiple.exp)" do |example|
@@ -130,6 +163,11 @@ RSpec.describe Expressir::Express::Formatter do
       expected_result = File.read(formatted_exp_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 end

data/spec/expressir/express/parser_spec.rb

@@ -15,6 +15,11 @@ RSpec.describe Expressir::Express::Parser do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "parses a file (multiple.exp)" do |example|
@@ -28,6 +33,11 @@ RSpec.describe Expressir::Express::Parser do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "parses a file (syntax.exp)" do |example|
@@ -41,6 +51,11 @@ RSpec.describe Expressir::Express::Parser do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "parses a file (remark.exp)" do |example|
@@ -54,6 +69,11 @@ RSpec.describe Expressir::Express::Parser do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "parses a file including original source (multiple.exp)" do |example|
@@ -74,6 +94,11 @@ RSpec.describe Expressir::Express::Parser do
       stop_index = input.index("END_ENTITY;") + "END_ENTITY;".length - 1
       expected_result = input[start_index..stop_index]
       expect(entity.source).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 
@@ -99,6 +124,11 @@ RSpec.describe Expressir::Express::Parser do
       expect(schemas[3].id).to eq("multiple_schema3")
       expect(schemas[4].file).to eq(exp_files[1].to_s)
       expect(schemas[4].id).to eq("multiple_schema4")
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 end

data/spec/expressir/model/model_element_spec.rb

@@ -17,6 +17,11 @@ RSpec.describe Expressir::Model::ModelElement do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 
@@ -32,6 +37,11 @@ RSpec.describe Expressir::Model::ModelElement do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "parses an object (multiple.yaml)" do |example|
@@ -45,6 +55,11 @@ RSpec.describe Expressir::Model::ModelElement do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "parses an object (syntax.yaml)" do |example|
@@ -58,6 +73,10 @@ RSpec.describe Expressir::Model::ModelElement do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "parses an object (remark.yaml)" do |example|
@@ -71,6 +90,11 @@ RSpec.describe Expressir::Model::ModelElement do
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 
@@ -88,6 +112,11 @@ RSpec.describe Expressir::Model::ModelElement do
       # schema scope
       schema = repo.schemas.first
       expect(schema.find("empty_entity")).to be_instance_of(Expressir::Model::Declarations::Entity)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "finds an object (multiple.exp)" do |example|
@@ -111,6 +140,11 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find("attribute_entity2")).to be_instance_of(Expressir::Model::Declarations::Entity)
       expect(schema.find("attribute_entity3")).to be_instance_of(Expressir::Model::Declarations::Entity)
       expect(schema.find("attribute_entity4")).to be_instance_of(Expressir::Model::Declarations::Entity)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "finds an object (syntax.exp)" do |example|
@@ -126,6 +160,11 @@ RSpec.describe Expressir::Model::ModelElement do
       # schema scope
       schema = repo.schemas.first
       expect(schema.find("empty_entity")).to be_instance_of(Expressir::Model::Declarations::Entity)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
 
     it "finds an object (remark.exp)" do |example|
@@ -269,6 +308,11 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(entity.find("remark_type.wr:WR1")).to be_instance_of(Expressir::Model::Declarations::WhereRule)
       expect(entity.find("remark_type.IP1")).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
       expect(entity.find("remark_type.ip:IP1")).to be_instance_of(Expressir::Model::Declarations::RemarkItem)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
     end
   end
 end

data/spec/spec_helper.rb

@@ -14,4 +14,11 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
+
+  config.around(:example) do |ex|
+    ex.run
+  rescue SystemExit => e
+    puts "Got SystemExit: #{e.inspect}."
+    raise
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice