antlr4-native 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f14d05febd863a51c3e111e7ef3493eb2fe1b72fe72b0b3d1c5c114a2947f7c7
-  data.tar.gz: e8f3fe771ae21c552a1074e2f0608f9c87da1e7bd9063f2f8e18363531c37e6b
+  metadata.gz: 8bed5c4bbb574d8ad5cbef067bee9fff704a1f0bf8d5fa0b522393d5fa771be3
+  data.tar.gz: 44dcb2987d8f3c04bc2f9a4769853b6bdfbf390b0aebdff9fcc783b98a389896
 SHA512:
-  metadata.gz: 64cf7e6628edbaff365daf278c1e70dccd7ca083128d604efe8fcb4850c77efc621ce204fe250a7ffb91adb5d6cb4d02de9f1f68bbbb32c4c8c79d725c308a26
-  data.tar.gz: 1c5ba3ec3908cc1a951794d0e70f87afa0f01694ef623b38269ad5f22569fd8b587c1c6a7e820d32de273f6c87e77d15abcf604e83b0edd13f2a0636c09c5d86
+  metadata.gz: 25961945b37da84af109e20b39728f57108d3e7490165d936898c95a76bec6add1e18086609c0085f14614efcd801b31723a17032a111ec86236f31709f52ec6
+  data.tar.gz: 20e79181660b66a56c94ef35fccd369c7590ed676703854f91aafa7147398fea220fb26c6e7f7ccb1bc3810fcc4c64f0db0018dda887b6344f6ae97930e24f3e

data/README.md

@@ -79,9 +79,8 @@ Finally, if you override `#initialize` in your visitor subclasses, don't forget
 
 ## Caveats
 
-1. Avoid retaining references to contexts, tokens, etc anywhere in your Ruby code. Contexts (i.e. the `ctx` variables in the examples above) and other objects that are created by ANTLR's C++ runtime are automatically cleaned up without the Ruby interpreter's knowledge. You'll almost surely see a segfault if you retain a reference to one of these objects and try to use it after the call to `Parser#visit`.
-2. Due to an ANTLR limitation, parsers cannot be used in a multi-threaded environment, even if each parser instance is used entirely in the context of a single thread (i.e. parsers are not shared between threads). According to the ANTLR C++ developers, parsers should be threadsafe. Unfortunately firsthand experience has proven otherwise. Your mileage may vary.
-3. The description of this gem says "(almost) any ANTLR4 grammar" because many grammars contain target-specific code. For example, the Python3 grammar referenced in the examples above contains inline Java code that the C++ compiler won't understand. You'll need to port any such code to C++ before you'll be able to compile and use the native extension.
+1. Due to an ANTLR limitation, parsers cannot be used in a multi-threaded environment, even if each parser instance is used entirely in the context of a single thread (i.e. parsers are not shared between threads). According to the ANTLR C++ developers, parsers should be threadsafe. Unfortunately firsthand experience has proven otherwise. Your mileage may vary.
+1. The description of this gem says "(almost) any ANTLR4 grammar" because many grammars contain target-specific code. For example, the Python3 grammar referenced in the examples above contains inline Java code that the C++ compiler won't understand. You'll need to port any such code to C++ before you'll be able to compile and use the native extension.
 
 ## System Requirements
 

data/lib/antlr4-native/generator.rb

@@ -2,10 +2,10 @@ require 'fileutils'
 
 module Antlr4Native
   class Generator
-    ANTLR_VERSION = '4.8'.freeze
+    ANTLR_VERSION = '4.10.1'.freeze
 
     ANTLR_JAR = File.expand_path(
-      File.join('..', '..', 'vendor', 'antlr4-4.8-1-complete.jar'), __dir__
+      File.join('..', '..', 'vendor', "antlr-#{ANTLR_VERSION}-complete.jar"), __dir__
     ).freeze
 
     include StringHelpers
@@ -16,6 +16,7 @@ module Antlr4Native
       @grammar_files = grammar_files
       @output_dir = output_dir
       @parser_root_method = parser_root_method
+
     end
 
     def generate
@@ -24,7 +25,7 @@ module Antlr4Native
     end
 
     def gem_name
-      @gem_name ||= dasherize(parser_ns)
+      @gem_name ||= underscore(parser_ns)
     end
 
     def antlr_ns
@@ -147,39 +148,25 @@ module Antlr4Native
           }
 
           Array getChildren() {
-            if (children == nullptr) {
-              children = new Array();
-
-              if (orig != nullptr) {
-                for (auto it = orig -> children.begin(); it != orig -> children.end(); it ++) {
-                  Object parseTree = ContextProxy::wrapParseTree(*it);
+            Array children;
+            if (orig != nullptr) {
+              for (auto it = orig -> children.begin(); it != orig -> children.end(); it ++) {
+                Object parseTree = ContextProxy::wrapParseTree(*it);
 
-                  if (parseTree != Nil) {
-                    children -> push(parseTree);
-                  }
+                if (parseTree != Nil) {
+                  children.push(parseTree);
                 }
               }
             }
-
-            return *children;
+            return children;
           }
 
           Object getParent() {
-            if (parent == Nil) {
-              if (orig != nullptr) {
-                parent = ContextProxy::wrapParseTree(orig -> parent);
-              }
-            }
-
-            return parent;
+            return orig == nullptr ? Nil : ContextProxy::wrapParseTree(orig -> parent);
           }
 
           size_t childCount() {
-            if (orig == nullptr) {
-              return 0;
-            }
-
-            return getChildren().size();
+            return orig == nullptr ? 0 : orig -> children.size();
           }
 
           bool doubleEquals(Object other) {
@@ -196,8 +183,6 @@ module Antlr4Native
 
         protected:
           tree::ParseTree* orig = nullptr;
-          Array* children = nullptr;
-          Object parent = Nil;
         };
 
         class TerminalNodeProxy : public ContextProxy {
@@ -284,7 +269,7 @@ module Antlr4Native
             this -> lexer -> reset();
             this -> parser -> reset();
 
-            return result;
+            return std::any_cast<Object>(result);
           }
 
           ~ParserProxy() {
@@ -331,7 +316,7 @@ module Antlr4Native
       <<~END
         extern "C"
         void Init_#{ext_name}() {
-          Module rb_m#{parser_ns} = define_module("#{parser_ns}");
+          Module rb_m#{parser_ns} = define_module("#{capitalize(parser_ns)}");
 
           rb_cToken = define_class_under<Token>(rb_m#{parser_ns}, "Token")
             .define_method("text", &Token::getText)
@@ -361,8 +346,8 @@ module Antlr4Native
           rb_cParser = define_class_under<ParserProxy>(rb_m#{parser_ns}, "Parser")
             .define_singleton_function("parse", &ParserProxy::parse)
             .define_singleton_function("parse_file", &ParserProxy::parseFile)
-            .define_method("#{parser_root_method}", &ParserProxy::#{parser_root_method})
-            .define_method("visit", &ParserProxy::visit);
+            .define_method("#{parser_root_method}", &ParserProxy::#{parser_root_method}, Return().keepAlive())
+            .define_method("visit", &ParserProxy::visit, Return().keepAlive());
 
         #{class_wrappers_str('  ')}
         }

data/lib/antlr4-native/version.rb

@@ -1,3 +1,3 @@
 module Antlr4Native
-  VERSION = '2.0.0'
+  VERSION = '2.2.0'
 end

data/lib/antlr4-native/visitor_generator.rb

@@ -48,7 +48,7 @@ module Antlr4Native
           Object ruby_visit(ContextProxy* proxy) {
             auto result = visit(proxy -> getOriginal());
             try {
-              return result.as<Object>();
+              return std::any_cast<Object>(result);
             } catch(std::bad_cast) {
               return Qnil;
             }
@@ -57,7 +57,7 @@ module Antlr4Native
           Object ruby_visitChildren(ContextProxy* proxy) {
             auto result = visitChildren(proxy -> getOriginal());
             try {
-              return result.as<Object>();
+              return std::any_cast<Object>(result);
             } catch(std::bad_cast) {
               return Qnil;
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antlr4-native
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -43,7 +43,7 @@ files:
 - lib/antlr4-native/string_helpers.rb
 - lib/antlr4-native/version.rb
 - lib/antlr4-native/visitor_generator.rb
-- vendor/antlr4-4.8-1-complete.jar
+- vendor/antlr-4.10.1-complete.jar
 homepage: http://github.com/camertron/antlr4-native-rb
 licenses: []
 metadata: {}