ruby-ll 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d49084634bb74f2dbcb1a7b5879b4dc04834eaa5b8fb9b6320f27bb5b3a163a
-  data.tar.gz: 6bb604c577c149786c6786620eb7051ded78c0abbecfaa948dcaa668b276cad8
+  metadata.gz: 2f42d3fc79c6780a3434b380b418e6adfa3680a7c217686af64d8cafec9c1dbf
+  data.tar.gz: 1717b822ca50436a07e00777fc6d15226935c7e3d6126e27669cf80c7690d25b
 SHA512:
-  metadata.gz: 699326ad786887699f305388f7dca6dab8da10492f4f2dc49f7633cce7a8125c087f78a1a3bc31a8547c916ca51175801090c4eecd852a8a6b790a039af9da8a
-  data.tar.gz: 1cbb1b087c2b404b3fc942f148a5c6d9aa0b4289132193cd73a10cef7758e489881733e04e622b49ca4480c878f51955944d287334c2fc2f7e8f79bbad385012
+  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,20 +46,40 @@ 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
+    );
+
+    config = rb_const_get(klass, id_config_const);
 
-    Data_Get_Struct(config, DriverConfig, state->config);
+    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;
 }
 
 /**
@@ -100,7 +123,7 @@ VALUE ll_driver_each_token(
     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 )
     {
@@ -142,8 +165,8 @@ VALUE ll_driver_each_token(
                     self,
                     id_parser_error,
                     4,
-                    INT2NUM(stack_type),
-                    INT2NUM(stack_value),
+                    LONG2NUM(stack_type),
+                    LONG2NUM(stack_value),
                     type,
                     value
                 );
@@ -261,8 +284,8 @@ VALUE ll_driver_each_token(
                     self,
                     id_parser_error,
                     4,
-                    INT2NUM(stack_type),
-                    INT2NUM(stack_value),
+                    LONG2NUM(stack_type),
+                    LONG2NUM(stack_value),
                     type,
                     value
                 );
@@ -320,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);

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.4'
+  VERSION = '2.2.0'
 end # LL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ll
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Yorick Peterse
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: An LL(1) parser generator for Ruby.
 test_files: []