Skip to content

Use typed data APIs #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianmario merged 1 commit into from
Dec 27, 2025
Merged

Use typed data APIs #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions ext/yajl/yajl_ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@ static void yajl_encoder_wrapper_mark(void * wrapper) {
}
}

static const rb_data_type_t yajl_encoder_wrapper_type = {
"YAJL::Encoder",
{
yajl_encoder_wrapper_mark,
yajl_encoder_wrapper_free,
}
};

static VALUE yajl_key_to_string(VALUE obj) {
switch (TYPE(obj)) {
case T_STRING:
Expand Down Expand Up @@ -309,6 +317,14 @@ void yajl_parser_wrapper_mark(void * wrapper) {
}
}

static const rb_data_type_t yajl_parser_wrapper_type = {
"YAJL::Parser",
{
yajl_parser_wrapper_mark,
yajl_parser_wrapper_free,
}
};

void yajl_parse_chunk(const unsigned char * chunk, unsigned int len, yajl_handle parser) {
yajl_status stat;

Expand Down Expand Up @@ -486,7 +502,7 @@ static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
}
cfg = (yajl_parser_config){allowComments, checkUTF8};

obj = Data_Make_Struct(klass, yajl_parser_wrapper, yajl_parser_wrapper_mark, yajl_parser_wrapper_free, wrapper);
obj = TypedData_Make_Struct(klass, yajl_parser_wrapper, &yajl_parser_wrapper_type, wrapper);
wrapper->parser = yajl_alloc(&callbacks, &cfg, &rb_alloc_funcs, (void *)obj);
wrapper->nestedArrayLevel = 0;
wrapper->nestedHashLevel = 0;
Expand Down Expand Up @@ -1089,7 +1105,7 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
}
cfg = (yajl_gen_config){beautify, (const char *)indentString, htmlSafe};

obj = Data_Make_Struct(klass, yajl_encoder_wrapper, yajl_encoder_wrapper_mark, yajl_encoder_wrapper_free, wrapper);
obj = TypedData_Make_Struct(klass, yajl_encoder_wrapper, &yajl_encoder_wrapper_type, wrapper);
wrapper->indentString = actualIndent;
wrapper->encoder = yajl_gen_alloc(&cfg, &rb_alloc_funcs);
wrapper->on_progress_callback = Qnil;
Expand Down
6 changes: 4 additions & 2 deletions ext/yajl/yajl_ext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ static ID intern_io_read, intern_call, intern_keys, intern_to_s,
intern_to_json, intern_has_key, intern_to_sym, intern_as_json;
static ID sym_allow_comments, sym_check_utf8, sym_pretty, sym_indent, sym_terminator, sym_symbolize_keys, sym_symbolize_names, sym_html_safe, sym_entities;

#define GetParser(obj, sval) Data_Get_Struct(obj, yajl_parser_wrapper, sval);
#define GetEncoder(obj, sval) Data_Get_Struct(obj, yajl_encoder_wrapper, sval);
static const rb_data_type_t yajl_parser_wrapper_type, yajl_encoder_wrapper_type;

#define GetParser(obj, sval) TypedData_Get_Struct(obj, yajl_parser_wrapper, &yajl_parser_wrapper_type, sval)
#define GetEncoder(obj, sval) TypedData_Get_Struct(obj, yajl_encoder_wrapper, &yajl_encoder_wrapper_type, sval)

static void yajl_check_and_fire_callback(void * ctx);
static void yajl_set_static_value(void * ctx, VALUE val);
Expand Down