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

json/parser: typed data

Browse Source 
* ext/json/parser/parser.rl (JSON_Parser_type): turn into typed
  data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-04 23:33:11 +00:00
parent bdfc2e2942
commit 1e46f02394
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2100,8 +2100,9 @@ static JSON_Parser *JSON_allocate(void)
return json; return json;
} }
static void JSON_mark(JSON_Parser *json) static void JSON_mark(void *ptr)
{ {
JSON_Parser *json = ptr;
rb_gc_mark_maybe(json->Vsource); rb_gc_mark_maybe(json->Vsource);
rb_gc_mark_maybe(json->create_id); rb_gc_mark_maybe(json->create_id);
rb_gc_mark_maybe(json->object_class); rb_gc_mark_maybe(json->object_class);
@ -2109,16 +2110,30 @@ static void JSON_mark(JSON_Parser *json)
rb_gc_mark_maybe(json->match_string); rb_gc_mark_maybe(json->match_string);
} }
static void JSON_free(JSON_Parser *json) static void JSON_free(void *ptr)
{ {
JSON_Parser *json = ptr;
fbuffer_free(json->fbuffer); fbuffer_free(json->fbuffer);
ruby_xfree(json); ruby_xfree(json);
} }
static size_t JSON_memsize(const void *ptr)
{
const JSON_Parser *json = ptr;
return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
}
static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,},
NULL, NULL,
RUBY_TYPED_FREE_IMMEDIATELY,
};
static VALUE cJSON_parser_s_allocate(VALUE klass) static VALUE cJSON_parser_s_allocate(VALUE klass)
{ {
JSON_Parser *json = JSON_allocate(); JSON_Parser *json = JSON_allocate();
return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json); return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json);
} }
/* /*

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

@ -51,7 +51,7 @@ typedef struct JSON_ParserStruct {
if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance") if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance")
#define GET_PARSER_INIT \ #define GET_PARSER_INIT \
JSON_Parser *json; \ JSON_Parser *json; \
Data_Get_Struct(self, JSON_Parser, json) TypedData_Get_Struct(self, JSON_Parser, &JSON_Parser_type, json)
#define MinusInfinity "-Infinity" #define MinusInfinity "-Infinity"
#define EVIL 0x666 #define EVIL 0x666
@ -69,9 +69,10 @@ static VALUE convert_encoding(VALUE source);
static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self); static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self);
static VALUE cParser_parse(VALUE self); static VALUE cParser_parse(VALUE self);
static JSON_Parser *JSON_allocate(void); static JSON_Parser *JSON_allocate(void);
static void JSON_mark(JSON_Parser *json); static void JSON_mark(void *json);
static void JSON_free(JSON_Parser *json); static void JSON_free(void *json);
static VALUE cJSON_parser_s_allocate(VALUE klass); static VALUE cJSON_parser_s_allocate(VALUE klass);
static VALUE cParser_source(VALUE self); static VALUE cParser_source(VALUE self);
static const rb_data_type_t JSON_Parser_type;
#endif #endif

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

@ -815,7 +815,7 @@ static VALUE cParser_parse(VALUE self)
} }
static JSON_Parser *JSON_allocate() static JSON_Parser *JSON_allocate(void)
{ {
JSON_Parser *json = ALLOC(JSON_Parser); JSON_Parser *json = ALLOC(JSON_Parser);
MEMZERO(json, JSON_Parser, 1); MEMZERO(json, JSON_Parser, 1);
@ -823,8 +823,9 @@ static JSON_Parser *JSON_allocate()
return json; return json;
} }
static void JSON_mark(JSON_Parser *json) static void JSON_mark(void *ptr)
{ {
JSON_Parser *json = ptr;
rb_gc_mark_maybe(json->Vsource); rb_gc_mark_maybe(json->Vsource);
rb_gc_mark_maybe(json->create_id); rb_gc_mark_maybe(json->create_id);
rb_gc_mark_maybe(json->object_class); rb_gc_mark_maybe(json->object_class);
@ -832,16 +833,30 @@ static void JSON_mark(JSON_Parser *json)
rb_gc_mark_maybe(json->match_string); rb_gc_mark_maybe(json->match_string);
} }
static void JSON_free(JSON_Parser *json) static void JSON_free(void *ptr)
{ {
JSON_Parser *json = ptr;
fbuffer_free(json->fbuffer); fbuffer_free(json->fbuffer);
ruby_xfree(json); ruby_xfree(json);
} }
static size_t JSON_memsize(const void *ptr)
{
const JSON_Parser *json = ptr;
return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
}
static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,},
NULL, NULL,
RUBY_TYPED_FREE_IMMEDIATELY,
};
static VALUE cJSON_parser_s_allocate(VALUE klass) static VALUE cJSON_parser_s_allocate(VALUE klass)
{ {
JSON_Parser *json = JSON_allocate(); JSON_Parser *json = JSON_allocate();
return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json); return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json);
} }
/* /*