ruby-ll 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e1faade684ee6c30dbceab3e16db55cd11d94a89933649d324009e1fd033f33
-  data.tar.gz: 2cbd469bbd142d904cbed8feb4557bd813744ab20cb5af9a5decc1f04eaca957
+  metadata.gz: 2f42d3fc79c6780a3434b380b418e6adfa3680a7c217686af64d8cafec9c1dbf
+  data.tar.gz: 1717b822ca50436a07e00777fc6d15226935c7e3d6126e27669cf80c7690d25b
 SHA512:
-  metadata.gz: 3d8910a725c85f891ca9162d7d56893cac42eee64fed9e8cd00ba565e14eb7d34f204ea90ced3b8783b1ab411fb3595fdb849780b7a5babfe4c7674be8822f26
-  data.tar.gz: f9f08de4719772842c6693dc7fde5212b2eb94d1086a673f1557d6ea97a6f8f7f6ec5403a358a4d13fe0c714cdb6518e488fd460d740b0508a9799c59ffceb74
+  metadata.gz: b60a8dac5370391a7824092a8a5ed3a372eed5b0c51de1d9e6fb81eb426008753753270de84bf633d46f39a8c406eac0e3aeb1b5c2fea8b51e93c829d9f6a766
+  data.tar.gz: c26bff018b93851ac2e12e54a73569b2ed174f3aa8f00bc6ebcc3778041e4ae3336415975b4e41b5c335478cd29648f44e121a6562a081df27ec71b6cc1fd933

data/ext/c/driver.c

@@ -21,8 +21,10 @@ ID id_parser_error;
  * This function is called automatically when a Driver instance is garbage
  * collected.
  */
-void ll_driver_free(DriverState *state)
+void ll_driver_free(void *data)
 {
+    DriverState *state = data;
+
     kv_destroy(state->stack);
     kv_destroy(state->value_stack);
 
@@ -33,9 +35,10 @@ void ll_driver_free(DriverState *state)
  * Marks the objects stored in the driver's internal state, preventing them from
  * being garbage collected until the next GC run.
  */
-void ll_driver_mark(DriverState *state)
+void ll_driver_mark(void *data)
 {
     size_t index;
+    DriverState *state = data;
 
     FOR(index, kv_size(state->value_stack))
     {
@@ -43,30 +46,61 @@ void ll_driver_mark(DriverState *state)
     }
 }
 
+static const rb_data_type_t ll_driver_type = {
+    "LL::Driver",
+    {
+        ll_driver_mark,
+        ll_driver_free,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 /**
  * Allocates a new instance of the Driver class and prepares its internal state.
  */
 VALUE ll_driver_allocate(VALUE klass)
 {
-    DriverState *state = ALLOC(DriverState);
-    VALUE config       = rb_const_get(klass, id_config_const);
+    DriverState *state;
+    VALUE config;
+    VALUE obj = TypedData_Make_Struct(
+        klass,
+        DriverState,
+        &ll_driver_type,
+        state
+    );
 
-    Data_Get_Struct(config, DriverConfig, state->config);
+    config = rb_const_get(klass, id_config_const);
+
+    TypedData_Get_Struct(config, DriverConfig, &ll_driver_config_type, state->config);
 
     kv_init(state->stack);
     kv_init(state->value_stack);
 
-    return Data_Wrap_Struct(klass, ll_driver_mark, ll_driver_free, state);
+    return obj;
 }
 
 /**
- * Callback function for iterating over every input token and actually parsing
- * said input.
+ * Callback function for iterating over every input token and parsing it.
+ *
+ * This function is intended to be used as a block callback for Ruby's
+ * `rb_block_call`, and processes a single token per invocation.
  *
  * @param token An Array containing the token type as a Symbol and its value.
  * @param self The Driver instance currently in use.
+ * @param argc The number of additional arguments passed to the block.
+ * @param argv The array of additional arguments passed to the block.
+ * @param block_arg The block argument passed from Ruby (if any).
  */
-VALUE ll_driver_each_token(VALUE token, VALUE self)
+VALUE ll_driver_each_token(
+    VALUE token,
+    VALUE self,
+    int argc,
+    const VALUE *argv,
+    VALUE block_arg
+)
 {
     VALUE method;
     VALUE action_args;
@@ -89,7 +123,7 @@ VALUE ll_driver_each_token(VALUE token, VALUE self)
     VALUE type  = rb_ary_entry(token, 0);
     VALUE value = rb_ary_entry(token, 1);
 
-    Data_Get_Struct(self, DriverState, state);
+    TypedData_Get_Struct(self, DriverState, &ll_driver_type, state);
 
     while ( 1 )
     {
@@ -131,8 +165,8 @@ VALUE ll_driver_each_token(VALUE token, VALUE self)
                     self,
                     id_parser_error,
                     4,
-                    INT2NUM(stack_type),
-                    INT2NUM(stack_value),
+                    LONG2NUM(stack_type),
+                    LONG2NUM(stack_value),
                     type,
                     value
                 );
@@ -250,8 +284,8 @@ VALUE ll_driver_each_token(VALUE token, VALUE self)
                     self,
                     id_parser_error,
                     4,
-                    INT2NUM(stack_type),
-                    INT2NUM(stack_value),
+                    LONG2NUM(stack_type),
+                    LONG2NUM(stack_value),
                     type,
                     value
                 );
@@ -309,7 +343,7 @@ VALUE ll_driver_parse(VALUE self)
 
     DriverState *state;
 
-    Data_Get_Struct(self, DriverState, state);
+    TypedData_Get_Struct(self, DriverState, &ll_driver_type, state);
 
     /* EOF rule */
     kv_push(long, state->stack, T_EOF);
@@ -326,7 +360,7 @@ VALUE ll_driver_parse(VALUE self)
         id_each_token,
         0,
         NULL,
-        RUBY_METHOD_FUNC(ll_driver_each_token),
+        ll_driver_each_token,
         self
     );
 

data/ext/c/driver_config.c

@@ -1,11 +1,42 @@
 #include "driver_config.h"
 
+void ll_driver_config_mark(void *data)
+{
+    DriverConfig *config = data;
+
+    if ( config->terminals != NULL )
+    {
+        khint_t key;
+
+        for (
+            key = kh_begin(config->terminals);
+            key != kh_end(config->terminals);
+            key++
+        )
+        {
+            if ( kh_exist(config->terminals, key) )
+            {
+                rb_gc_mark((VALUE) kh_key(config->terminals, key));
+            }
+        }
+    }
+
+    if ( config->action_names != NULL )
+    {
+        rb_gc_mark_locations(
+            config->action_names,
+            config->action_names + config->actions_count
+        );
+    }
+}
+
 /**
  * Releases memory of the DriverConfig struct and its members.
  */
-void ll_driver_config_free(DriverConfig *config)
+void ll_driver_config_free(void *data)
 {
     long rindex;
+    DriverConfig *config = data;
 
     FOR(rindex, config->rules_count)
     {
@@ -23,22 +54,36 @@ void ll_driver_config_free(DriverConfig *config)
     free(config->action_names);
     free(config->action_arg_amounts);
 
-    kh_destroy(int64_map, config->terminals);
+    if ( config->terminals != NULL )
+    {
+        kh_destroy(int64_map, config->terminals);
+    }
 
     free(config);
 }
 
+const rb_data_type_t ll_driver_config_type = {
+    "LL::DriverConfig",
+    {
+        ll_driver_config_mark,
+        ll_driver_config_free,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 /**
  * Allocates a new DriverConfig.
  */
 VALUE ll_driver_config_allocate(VALUE klass)
 {
-    DriverConfig *config = ALLOC(DriverConfig);
-
-    return Data_Wrap_Struct(
+    DriverConfig *config;
+    return TypedData_Make_Struct(
         klass,
-        NULL,
-        ll_driver_config_free,
+        DriverConfig,
+        &ll_driver_config_type,
         config
     );
 }
@@ -59,7 +104,7 @@ VALUE ll_driver_config_set_terminals(VALUE self, VALUE array)
     DriverConfig *config;
     long count = RARRAY_LEN(array);
 
-    Data_Get_Struct(self, DriverConfig, config);
+    TypedData_Get_Struct(self, DriverConfig, &ll_driver_config_type, config);
 
     config->terminals = kh_init(int64_map);
 
@@ -89,7 +134,7 @@ VALUE ll_driver_config_set_rules(VALUE self, VALUE array)
     VALUE row;
     long row_count = RARRAY_LEN(array);
 
-    Data_Get_Struct(self, DriverConfig, config);
+    TypedData_Get_Struct(self, DriverConfig, &ll_driver_config_type, config);
 
     config->rules        = ALLOC_N(long*, row_count);
     config->rule_lengths = ALLOC_N(long, row_count);
@@ -129,7 +174,7 @@ VALUE ll_driver_config_set_table(VALUE self, VALUE array)
     DriverConfig *config;
     long row_count = RARRAY_LEN(array);
 
-    Data_Get_Struct(self, DriverConfig, config);
+    TypedData_Get_Struct(self, DriverConfig, &ll_driver_config_type, config);
 
     config->table = ALLOC_N(long*, row_count);
 
@@ -164,7 +209,7 @@ VALUE ll_driver_config_set_actions(VALUE self, VALUE array)
     DriverConfig *config;
     long row_count = RARRAY_LEN(array);
 
-    Data_Get_Struct(self, DriverConfig, config);
+    TypedData_Get_Struct(self, DriverConfig, &ll_driver_config_type, config);
 
     config->action_names       = ALLOC_N(VALUE, row_count);
     config->action_arg_amounts = ALLOC_N(long, row_count);

data/ext/c/driver_config.h

@@ -50,4 +50,6 @@ typedef struct
 
 extern void Init_ll_driver_config();
 
+extern const rb_data_type_t ll_driver_config_type;
+
 #endif

data/ext/java/org/libll/Driver.java

@@ -15,7 +15,7 @@ import org.jruby.RubyFixnum;
 
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Arity;
+import org.jruby.runtime.Signature;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.ObjectAllocator;
@@ -307,7 +307,7 @@ public class Driver extends RubyObject
             CallBlock19.newCallClosure(
                 this,
                 this.metaClass,
-                Arity.NO_ARGUMENTS,
+                Signature.NO_ARGUMENTS,
                 callback,
                 context
             )

data/lib/ll/version.rb

@@ -1,3 +1,3 @@
 module LL
-  VERSION = '2.1.3'
+  VERSION = '2.2.0'
 end # LL

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ll
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Yorick Peterse
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -193,7 +192,6 @@ homepage: https://github.com/yorickpeterse/ruby-ll
 licenses:
 - MPL-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: An LL(1) parser generator for Ruby.
 test_files: []