antlr4-native 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08bed362c4b5695e0e900adb1b9837f284d92e70b7bc2006467bc1888d39f12c'
-  data.tar.gz: 881aac540b1395c0f3e974f4c3d8a3f747ab695deeba95bd5d40c2c7924c5015
+  metadata.gz: 1abe502ed412ef8d9fda78dd371448d290c10bd757c34044c881c110f11c84df
+  data.tar.gz: 7093d010f55d0dac4b9b4e3d9a8f0da004ed40d4595caab9623bd717b879c812
 SHA512:
-  metadata.gz: d02e7aa15bced54e120e5bef5ff5d2be69919a83a0473e025feca86b7e2ee446e4b808a7d56959f3a6e13a2e55eb0666b805f189ad668fe66b68c49fcf2dcd30
-  data.tar.gz: bfa38b403307ffe88aff984d1713af1e7716629c0794512a4fcee432f60199510c588345d1f1005cc1be6ce0f4f68d4a97555024b11436739e2347c1d4877fab
+  metadata.gz: 0d2498b8804a2ba13e8fbc6e90ff0c3b209962712ec7005142d59a3ebe656123d28396a0a278a634bc228304bd9160beff49dd11985db6d5249ebed7857127b5
+  data.tar.gz: 738c3abb9486de9819faaab462a9f65e0823803f382180f3b32347e51d9d330c1072bfe9c1df239e48fc5c82c4f99f8db1e9bb3c6584752b6607b78ae4173c4a

data/README.md

@@ -28,7 +28,7 @@ generator = Antlr4Native::Generator.new(
 generator.generate
 ```
 
-In the example above, the output directory is set to the standard Ruby native extensions directory, 'ext'. Antlr4-native will generate code into ext/<name>, where <name> is the name of the parser as defined in the grammar file(s). In this case, PythonParser.g4 contains:
+In the example above, the output directory is set to the standard Ruby native extensions directory, 'ext'. Antlr4-native will generate code into ext/\<name\>, where \<name\> is the name of the parser as defined in the grammar file(s). In this case, PythonParser.g4 contains:
 
 ```antlr
 parser grammar Python3Parser;
@@ -85,12 +85,13 @@ Finally, if you override `#initialize` in your visitor subclasses, don't forget
 
 ## System Requirements
 
-* A Java runtime (version 1.6 or higher) is required to generate parsers, since ANTLR is a Java tool. The ANTLR .jar file is distributed inside the antlr4-native gem, so there's no need to download it separately.
+* A Java runtime (version 1.6 or higher) is required to generate parsers, since ANTLR is a Java tool. The ANTLR .jar file is distributed inside the antlr4-native gem, so there's no need to download it separately. You can download a Java runtime [here](https://www.java.com/en/download/).
 * Ruby >= 2.3.
+* A C compiler (like gcc or clang) that supports C++14. If Ruby is working on your machine then you likely already have this.
 
 ## License
 
-Licensed under the MIT license. See LICENSE for details.
+Licensed under the MIT license. See LICENSE.txt for details.
 
 ## Authors
 

data/lib/antlr4-native/context.rb

@@ -148,6 +148,11 @@ module Antlr4Native
               }
 
               auto token = ((#{parser_ns}::#{name}*)orig) -> #{token_mtd.name}(#{params});
+
+              if (token == nullptr) {
+                return Qnil;
+              }
+
               TerminalNodeProxy proxy(token);
               return to_ruby(proxy);
             }

data/lib/antlr4-native/generator.rb

@@ -63,7 +63,7 @@ module Antlr4Native
 
     def interop_code
       <<~END
-        #include "iostream"
+        #include <iostream>
 
         #include "antlr4-runtime.h"
 
@@ -76,12 +76,38 @@ module Antlr4Native
         #include "rice/Constructor.hpp"
         #include "rice/Director.hpp"
 
+        #ifdef _WIN32
+        #undef FALSE
+        #undef TRUE
+        #undef OPTIONAL
+        #undef IN
+        #undef OUT
+        #endif
+
         using namespace std;
         using namespace Rice;
         using namespace antlr4;
 
         #{proxy_class_declarations}
 
+        template <>
+        Object to_ruby<Token*>(Token* const &x) {
+          if (!x) return Nil;
+          return Data_Object<Token>(x, rb_cToken, nullptr, nullptr);
+        }
+
+        template <>
+        Object to_ruby<tree::ParseTree*>(tree::ParseTree* const &x) {
+          if (!x) return Nil;
+          return Data_Object<tree::ParseTree>(x, rb_cParseTree, nullptr, nullptr);
+        }
+
+        template <>
+        Object to_ruby<tree::TerminalNode*>(tree::TerminalNode* const &x) {
+          if (!x) return Nil;
+          return Data_Object<tree::TerminalNode>(x, rb_cTerminalNode, nullptr, nullptr);
+        }
+
         class ContextProxy {
         public:
           ContextProxy(tree::ParseTree* orig) {
@@ -96,6 +122,18 @@ module Antlr4Native
             return orig -> getText();
           }
 
+          Object getStart() {
+            auto token = ((ParserRuleContext*) orig) -> getStart();
+
+            return to_ruby(token);
+          }
+
+          Object getStop() {
+            auto token = ((ParserRuleContext*) orig) -> getStop();
+
+            return to_ruby(token);
+          }
+
           Array getChildren() {
             if (children == nullptr) {
               children = new Array();
@@ -191,31 +229,7 @@ module Antlr4Native
     end
 
     def conversions
-      @conversions ||= begin
-        context_conversions = contexts.map(&:conversions).join("\n")
-
-        <<~END
-          template <>
-          Object to_ruby<Token*>(Token* const &x) {
-            if (!x) return Nil;
-            return Data_Object<Token>(x, rb_cToken, nullptr, nullptr);
-          }
-
-          template <>
-          Object to_ruby<tree::ParseTree*>(tree::ParseTree* const &x) {
-            if (!x) return Nil;
-            return Data_Object<tree::ParseTree>(x, rb_cParseTree, nullptr, nullptr);
-          }
-
-          template <>
-          Object to_ruby<tree::TerminalNode*>(tree::TerminalNode* const &x) {
-            if (!x) return Nil;
-            return Data_Object<tree::TerminalNode>(x, rb_cTerminalNode, nullptr, nullptr);
-          }
-
-          #{context_conversions}
-        END
-      end
+      @conversions ||= contexts.map(&:conversions).join("\n")
     end
 
     def proxy_class_methods
@@ -243,14 +257,21 @@ module Antlr4Native
             return parser;
           }
 
-          VALUE visit(VisitorProxy* visitor) {
-            visitor -> visit(this -> parser -> #{parser_root_method}());
+          Object #{parser_root_method}() {
+            auto ctx = this -> parser -> #{parser_root_method}();
+
+            #{capitalize(parser_root_method)}ContextProxy proxy((#{parser_ns}::#{capitalize(parser_root_method)}Context*) ctx);
+            return to_ruby(proxy);
+          }
+
+          Object visit(VisitorProxy* visitor) {
+            auto result = visitor -> visit(this -> parser -> #{parser_root_method}());
 
             // reset for the next visit call
             this -> lexer -> reset();
             this -> parser -> reset();
 
-            return Qnil;
+            return result;
           }
 
           ~ParserProxy() {
@@ -296,12 +317,15 @@ module Antlr4Native
 
           rb_cToken = rb_m#{parser_ns}
             .define_class<Token>("Token")
-            .define_method("text", &Token::getText);
+            .define_method("text", &Token::getText)
+            .define_method("channel", &Token::getChannel)
+            .define_method("token_index", &Token::getTokenIndex);
 
           rb_cParser = rb_m#{parser_ns}
             .define_class<ParserProxy>("Parser")
             .define_singleton_method("parse", &ParserProxy::parse)
             .define_singleton_method("parse_file", &ParserProxy::parseFile)
+            .define_method("#{parser_root_method}", &ParserProxy::#{parser_root_method})
             .define_method("visit", &ParserProxy::visit);
 
           rb_cParseTree = rb_m#{parser_ns}
@@ -312,6 +336,8 @@ module Antlr4Native
             .define_method("children", &ContextProxy::getChildren)
             .define_method("child_count", &ContextProxy::childCount)
             .define_method("text", &ContextProxy::getText)
+            .define_method("start", &ContextProxy::getStart)
+            .define_method("stop", &ContextProxy::getStop)
             .define_method("parent", &ContextProxy::getParent)
             .define_method("==", &ContextProxy::doubleEquals);
 

data/lib/antlr4-native/version.rb

@@ -1,3 +1,3 @@
 module Antlr4Native
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/lib/antlr4-native/visitor_generator.rb

@@ -46,13 +46,13 @@ module Antlr4Native
           #{cpp_class_name}(Object self) : Director(self) { }
 
           Object ruby_visit(ContextProxy* proxy) {
-            visit(proxy -> getOriginal());
-            return Nil;
+            auto result = visit(proxy -> getOriginal());
+            return result.as<Object>();
           }
 
           Object ruby_visitChildren(ContextProxy* proxy) {
-            visitChildren(proxy -> getOriginal());
-            return Nil;
+            auto result = visitChildren(proxy -> getOriginal());
+            return result.as<Object>();
           }
 
         #{vms.join("\n")}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antlr4-native
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies: []
 description: Create a Ruby native extension from any ANTLR4 grammar.
 email:
@@ -33,7 +33,7 @@ files:
 homepage: http://github.com/camertron/antlr4-native-rb
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -48,8 +48,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Create a Ruby native extension from any ANTLR4 grammar.
 test_files: []