antlr4-native 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 417a38bde6ca6dfdeca982ed80f0258c00c18feeda5cfecbaab7a5784e941501
-  data.tar.gz: 99531b3de905a08734dc2f421dc8b4e488850ab0021a6619c0581c6a810590d7
+  metadata.gz: e0ba82bae327f0b02ac099beab9b01d8efef600b21dd1f0bac9438303af8d9fc
+  data.tar.gz: f840a00ac13adf1282c77fc2b2376da1b9c986cc32d9affa2232ab0d01c6ae57
 SHA512:
-  metadata.gz: bad5784b07eb34c221c4a1a7a8311dd9c6998a837c5b5f13605564367aa15269055c3046e4894d531b4e9512467200896f0eb0495f08f46972593367d1143012
-  data.tar.gz: a0f02bfbbbff0fb8d06849623f8ced4046ebb2feb28a1f21d48bd03f2d017887c41a289777f30f4016205d01a49e3c77d8df9a83352a9da6b05ba43dc81148b3
+  metadata.gz: a9aec0e46b565763c2e77c6e7af5108e24b7c348afda4d0073a5f99a52813feeb8204b8a554ed3dc500898aa4bb6a023c5646d5f0965c7d0bb25f2acb831889a
+  data.tar.gz: 508ed703bf98e7584c998cbed39b73f788a99cf5b65469b9c82d0adba5467c6bc1bed458ad26bde81dc5d32a73ef755a89a9516c9aa36ee5a550a3516dd30a7f

data/antlr4-native.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.files = Dir['{lib,spec,vendor}/**/*', 'Gemfile', 'README.md', 'Rakefile', 'antlr4-native.gemspec']
 
-  s.add_runtime_dependency "rice", "~> 4.0"
+  s.add_runtime_dependency "rice", "~> 4.11"
 end

data/lib/antlr4-native/context.rb

@@ -56,7 +56,7 @@ module Antlr4Native
           class To_Ruby<#{parser_ns}::#{name}*> {
           public:
             VALUE convert(#{parser_ns}::#{name}* const &x) {
-              if (!x) return Nil;
+              if (!x) return Qnil;
               return Data_Object<#{parser_ns}::#{name}>(x, false, #{proxy_class_variable});
             }
           };
@@ -65,7 +65,7 @@ module Antlr4Native
           class To_Ruby<#{name}Proxy*> {
           public:
             VALUE convert(#{name}Proxy* const &x) {
-              if (!x) return Nil;
+              if (!x) return Qnil;
               return Data_Object<#{name}Proxy>(x, false, #{proxy_class_variable});
             }
           };
@@ -114,11 +114,11 @@ module Antlr4Native
 
               for (auto child : getChildren()) {
                 if (ctx == detail::From_Ruby<ContextProxy>().convert(child.value()).getOriginal()) {
-                  return child;
+                  return Rice::Object(child);
                 }
               }
 
-              return Nil;
+              return Qnil;
             }
           END
         end

data/lib/antlr4-native/generator.rb

@@ -97,7 +97,7 @@ module Antlr4Native
           class To_Ruby<Token*> {
           public:
             VALUE convert(Token* const &x) {
-              if (!x) return Nil;
+              if (!x) return Qnil;
               return Data_Object<Token>(x, false, rb_cToken);
             }
           };
@@ -106,7 +106,7 @@ module Antlr4Native
           class To_Ruby<tree::ParseTree*> {
           public:
             VALUE convert(tree::ParseTree* const &x) {
-              if (!x) return Nil;
+              if (!x) return Qnil;
               return Data_Object<tree::ParseTree>(x, false, rb_cParseTree);
             }
           };
@@ -115,7 +115,7 @@ module Antlr4Native
           class To_Ruby<tree::TerminalNode*> {
           public:
             VALUE convert(tree::TerminalNode* const &x) {
-              if (!x) return Nil;
+              if (!x) return Qnil;
               return Data_Object<tree::TerminalNode>(x, false, rb_cTerminalNode);
             }
           };
@@ -153,7 +153,7 @@ module Antlr4Native
               for (auto it = orig -> children.begin(); it != orig -> children.end(); it ++) {
                 Object parseTree = ContextProxy::wrapParseTree(*it);
 
-                if (parseTree != Nil) {
+                if (!parseTree.is_nil()) {
                   children.push(parseTree);
                 }
               }
@@ -162,7 +162,7 @@ module Antlr4Native
           }
 
           Object getParent() {
-            return orig == nullptr ? Nil : ContextProxy::wrapParseTree(orig -> parent);
+            return orig == nullptr ? Rice::Object(Qnil) : ContextProxy::wrapParseTree(orig -> parent);
           }
 
           size_t childCount() {
@@ -300,13 +300,26 @@ module Antlr4Native
         };
 
         namespace Rice::detail {
+          template <>
+          struct Type<ParserProxy*> {
+            static bool verify() {
+              return true;
+            }
+          };
+
           template <>
           class To_Ruby<ParserProxy*> {
           public:
+            To_Ruby() = default;
+
+            explicit To_Ruby(Arg* arg) : arg_(arg) {}
+
             VALUE convert(ParserProxy* const &x) {
-              if (!x) return Nil;
+              if (!x) return Qnil;
               return Data_Object<ParserProxy>(x, false, rb_cParser);
             }
+          private:
+            Arg* arg_ = nullptr;
           };
         }
       END
@@ -372,7 +385,7 @@ module Antlr4Native
               TerminalNodeProxy proxy(node);
               return detail::To_Ruby<TerminalNodeProxy>().convert(proxy);
             } else {
-              return Nil;
+              return Qnil;
             }
           }
         END

data/lib/antlr4-native/version.rb

@@ -1,3 +1,3 @@
 module Antlr4Native
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: antlr4-native
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.11'
 description: Create a Ruby native extension from any ANTLR4 grammar.
 email:
 - camertron@gmail.com
@@ -56,7 +55,6 @@ files:
 homepage: http://github.com/camertron/antlr4-native-rb
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,8 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Create a Ruby native extension from any ANTLR4 grammar.
 test_files: []