1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[flori/json] Cleanup useless ifdef

Browse Source 
The json gem now requires Ruby 2.3, so there is no point keeping
compatibility code for older releases that don't have the
TypedData API.

https://github.com/flori/json/commit/45c86e153f
This commit is contained in:
Jean Boussier 2024-05-31 09:59:09 +02:00 committed by Hiroshi SHIBATA
parent 255ca83fb8
commit c5ae432ec8
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
5 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/json/generator/generator.c
View File

@ -636,16 +636,12 @@ static size_t State_memsize(const void *ptr)
# define RUBY_TYPED_FROZEN_SHAREABLE 0 # define RUBY_TYPED_FROZEN_SHAREABLE 0
#endif #endif
#ifdef NEW_TYPEDDATA_WRAPPER
static const rb_data_type_t JSON_Generator_State_type = { static const rb_data_type_t JSON_Generator_State_type = {
"JSON/Generator/State", "JSON/Generator/State",
{NULL, State_free, State_memsize,}, {NULL, State_free, State_memsize,},
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
0, 0, 0, 0,
RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
#endif
}; };
#endif
static VALUE cState_s_allocate(VALUE klass) static VALUE cState_s_allocate(VALUE klass)
{ {

7
ext/json/generator/generator.h
View File

@ -166,12 +166,7 @@ static inline void *ruby_zalloc(size_t n)
return p; return p;
} }
#endif #endif
#ifdef TypedData_Make_Struct
static const rb_data_type_t JSON_Generator_State_type; static const rb_data_type_t JSON_Generator_State_type;
#define NEW_TYPEDDATA_WRAPPER 1
#else
#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, State_free, json)
#define TypedData_Get_Struct(self, JSON_Generator_State, ignore, json) Data_Get_Struct(self, JSON_Generator_State, json)
#endif
#endif #endif

16
ext/json/parser/parser.c
View File

@ -2097,12 +2097,12 @@ case 9:
static void JSON_mark(void *ptr) static void JSON_mark(void *ptr)
{ {
JSON_Parser *json = ptr; JSON_Parser *json = ptr;
rb_gc_mark_maybe(json->Vsource); rb_gc_mark(json->Vsource);
rb_gc_mark_maybe(json->create_id); rb_gc_mark(json->create_id);
rb_gc_mark_maybe(json->object_class); rb_gc_mark(json->object_class);
rb_gc_mark_maybe(json->array_class); rb_gc_mark(json->array_class);
rb_gc_mark_maybe(json->decimal_class); rb_gc_mark(json->decimal_class);
rb_gc_mark_maybe(json->match_string); rb_gc_mark(json->match_string);
} }
static void JSON_free(void *ptr) static void JSON_free(void *ptr)
@ -2118,16 +2118,12 @@ static size_t JSON_memsize(const void *ptr)
return sizeof(*json) + FBUFFER_CAPA(json->fbuffer); return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
} }
#ifdef NEW_TYPEDDATA_WRAPPER
static const rb_data_type_t JSON_Parser_type = { static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser", "JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,}, {JSON_mark, JSON_free, JSON_memsize,},
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
0, 0, 0, 0,
RUBY_TYPED_FREE_IMMEDIATELY, RUBY_TYPED_FREE_IMMEDIATELY,
#endif
}; };
#endif
static VALUE cJSON_parser_s_allocate(VALUE klass) static VALUE cJSON_parser_s_allocate(VALUE klass)
{ {

7
ext/json/parser/parser.h
View File

@ -85,12 +85,7 @@ static inline void *ruby_zalloc(size_t n)
return p; return p;
} }
#endif #endif
#ifdef TypedData_Make_Struct
static const rb_data_type_t JSON_Parser_type; static const rb_data_type_t JSON_Parser_type;
#define NEW_TYPEDDATA_WRAPPER 1
#else
#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, JSON_free, json)
#define TypedData_Get_Struct(self, JSON_Parser, ignore, json) Data_Get_Struct(self, JSON_Parser, json)
#endif
#endif #endif

16
ext/json/parser/parser.rl
View File

@ -857,12 +857,12 @@ static VALUE cParser_parse(VALUE self)
static void JSON_mark(void *ptr) static void JSON_mark(void *ptr)
{ {
JSON_Parser *json = ptr; JSON_Parser *json = ptr;
rb_gc_mark_maybe(json->Vsource); rb_gc_mark(json->Vsource);
rb_gc_mark_maybe(json->create_id); rb_gc_mark(json->create_id);
rb_gc_mark_maybe(json->object_class); rb_gc_mark(json->object_class);
rb_gc_mark_maybe(json->array_class); rb_gc_mark(json->array_class);
rb_gc_mark_maybe(json->decimal_class); rb_gc_mark(json->decimal_class);
rb_gc_mark_maybe(json->match_string); rb_gc_mark(json->match_string);
} }
static void JSON_free(void *ptr) static void JSON_free(void *ptr)
@ -878,16 +878,12 @@ static size_t JSON_memsize(const void *ptr)
return sizeof(*json) + FBUFFER_CAPA(json->fbuffer); return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
} }
#ifdef NEW_TYPEDDATA_WRAPPER
static const rb_data_type_t JSON_Parser_type = { static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser", "JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,}, {JSON_mark, JSON_free, JSON_memsize,},
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
0, 0, 0, 0,
RUBY_TYPED_FREE_IMMEDIATELY, RUBY_TYPED_FREE_IMMEDIATELY,
#endif
}; };
#endif
static VALUE cJSON_parser_s_allocate(VALUE klass) static VALUE cJSON_parser_s_allocate(VALUE klass)
{ {