expressir 1.2.3 → 1.2.4

data/ext/express-parser/extconf.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'mkmf'
 
 extension_name = 'express_parser'
-cross_build = enable_config("cross-build")
+cross_build =  enable_config("cross-build")
 
 antlr4_src = 'antlr4-upstream/runtime/Cpp/runtime/src'
 src_paths = [
@@ -23,7 +23,7 @@ if cross_build
   rice_root = Gem.loaded_specs["rice"].full_gem_path
   rice_src = File.join(rice_root, "include", "rice")
   rice_embed = File.join(__dir__, rice_subdir)
-  unless File.exists?(rice_embed)
+  unless File.exist?(rice_embed)
     FileUtils.mkdir_p(rice_embed)
     FileUtils.cp_r(Dir.glob(rice_src), rice_embed)
     File.delete(*Dir.glob("#{rice_embed}/**/*.o"))
@@ -45,11 +45,10 @@ if cross_build
   end
 else
   require 'mkmf-rice'
-
   dir_config(extension_name)
 end
 
-$CPPFLAGS << " -std=c++17 -DANTLR4CPP_STATIC -DHAVE_CXX11"
+$CPPFLAGS << " -std=c++17 -DANTLR4CPP_STATIC -DHAVE_CXX11 -fno-omit-frame-pointer"
 $INCFLAGS << " -I#{__dir__}/#{antlr4_src}"
 $srcs = []
 

data/lib/expressir/express/parser.rb

@@ -33,23 +33,26 @@ module Expressir
       def self.from_file(file, skip_references: nil, include_source: nil)
         input = File.read(file)
 
-        parser = ::ExpressParser::Parser.parse(input)
+      # An important note re memory management
+      # parse, syntax, visitor methods return complex tree structures created in netive (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)
+        @parse_tree = @parser.syntax()
 
-        parse_tree = parser.syntax()
+        @visitor = Visitor.new(@parser.tokens, include_source: include_source)
+        @repository = @visitor.visit(@parse_tree)
 
-        visitor = Visitor.new(parser.tokens, include_source: include_source)
-        repository = visitor.visit(parse_tree)
-
-        repository.schemas.each do |schema|
+        @repository.schemas.each do |schema|
           schema.file = file.to_s
         end
 
         unless skip_references
-          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
-          resolve_references_model_visitor.visit(repository)
+          @resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          @resolve_references_model_visitor.visit(@repository)
         end
 
-        repository
+        @repository
       end
 
       # Parses Express files into an Express model
@@ -65,16 +68,16 @@ module Expressir
           repository.schemas
         end.flatten
 
-        repository = Model::Repository.new(
+        @repository = Model::Repository.new(
           schemas: schemas
         )
 
-        unless skip_references
-          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
-          resolve_references_model_visitor.visit(repository)
+        unless @skip_references
+          @resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          @resolve_references_model_visitor.visit(@repository)
         end
 
-        repository
+        @repository
       end
     end
   end

data/lib/expressir/express/visitor.rb

@@ -138,7 +138,9 @@ module Expressir
       end
 
       def attach_remarks(ctx, node)
-        remark_tokens = get_tokens(ctx).select{|x| x.channel == REMARK_CHANNEL}
+        remark_tokens = get_tokens(ctx)
+        remark_tokens = remark_tokens.select{ |x| x.channel == REMARK_CHANNEL
+      }
 
         # skip already attached remarks
         remark_tokens = remark_tokens.select{|x| !@attached_remark_tokens.include?(x)}

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.2.3".freeze
+  VERSION = "1.2.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor