github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* ext/json: merge upstream from flori/json 

change usage of TypedData. [Feature #10739][ruby-core:67564]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2015-02-13 05:19:12 +00:00
Родитель 4607f95f73
Коммит f5219fee63
6 изменённых файлов: 23 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
ChangeLog
Просмотреть файл

@ -1,3 +1,8 @@
Fri Feb 13 14:19:06 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/json: merge upstream from flori/json
change usage of TypedData. [Feature #10739][ruby-core:67564]
Thu Feb 12 18:34:01 2015 multisnow <infinity.blick.winkel@gmail.com> Thu Feb 12 18:34:01 2015 multisnow <infinity.blick.winkel@gmail.com>
* ext/openssl/extconf.rb: check RAND_edg to support libressl. * ext/openssl/extconf.rb: check RAND_edg to support libressl.

6
ext/json/generator/generator.c
Просмотреть файл

@ -515,7 +515,7 @@ static size_t State_memsize(const void *ptr)
return size; return size;
} }
#ifdef HAVE_TYPE_RB_DATA_TYPE_T #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,},
@ -535,11 +535,7 @@ static JSON_Generator_State *State_allocate(void)
static VALUE cState_s_allocate(VALUE klass) static VALUE cState_s_allocate(VALUE klass)
{ {
JSON_Generator_State *state = State_allocate(); JSON_Generator_State *state = State_allocate();
#ifdef HAVE_TYPE_RB_DATA_TYPE_T
return TypedData_Wrap_Struct(klass, &JSON_Generator_State_type, state); return TypedData_Wrap_Struct(klass, &JSON_Generator_State_type, state);
#else
return Data_Wrap_Struct(klass, NULL, State_free, state);
#endif
} }
/* /*

18
ext/json/generator/generator.h
Просмотреть файл

@ -78,13 +78,8 @@ typedef struct JSON_Generator_StateStruct {
long buffer_initial_length; long buffer_initial_length;
} JSON_Generator_State; } JSON_Generator_State;
#ifdef HAVE_TYPE_RB_DATA_TYPE_T
#define GET_STATE_TO(self, state) \ #define GET_STATE_TO(self, state) \
TypedData_Get_Struct(self, JSON_Generator_State, &JSON_Generator_State_type, state) TypedData_Get_Struct(self, JSON_Generator_State, &JSON_Generator_State_type, state)
#else
#define GET_STATE_TO(self, state) \
Data_Get_Struct(self, JSON_Generator_State, state)
#endif
#define GET_STATE(self) \ #define GET_STATE(self) \
JSON_Generator_State *state; \ JSON_Generator_State *state; \
@ -97,7 +92,7 @@ typedef struct JSON_Generator_StateStruct {
\ \
rb_scan_args(argc, argv, "01", &Vstate); \ rb_scan_args(argc, argv, "01", &Vstate); \
Vstate = cState_from_state_s(cState, Vstate); \ Vstate = cState_from_state_s(cState, Vstate); \
GET_STATE_TO(Vstate, state); \ TypedData_Get_Struct(Vstate, JSON_Generator_State, &JSON_Generator_State_type, state); \
buffer = cState_prepare_buffer(Vstate); \ buffer = cState_prepare_buffer(Vstate); \
generate_json_##type(buffer, Vstate, state, self); \ generate_json_##type(buffer, Vstate, state, self); \
return fbuffer_to_s(buffer) return fbuffer_to_s(buffer)
@ -152,10 +147,6 @@ static VALUE cState_ascii_only_p(VALUE self);
static VALUE cState_depth(VALUE self); static VALUE cState_depth(VALUE self);
static VALUE cState_depth_set(VALUE self, VALUE depth); static VALUE cState_depth_set(VALUE self, VALUE depth);
static FBuffer *cState_prepare_buffer(VALUE self); static FBuffer *cState_prepare_buffer(VALUE self);
#ifdef HAVE_TYPE_RB_DATA_TYPE_T
static const rb_data_type_t JSON_Generator_State_type;
#endif
#ifndef ZALLOC #ifndef ZALLOC
#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type))) #define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
static inline void *ruby_zalloc(size_t n) static inline void *ruby_zalloc(size_t n)
@ -165,5 +156,12 @@ static inline void *ruby_zalloc(size_t n)
return p; return p;
} }
#endif #endif
#ifdef TypedData_Wrap_Struct
static const rb_data_type_t JSON_Generator_State_type;
#define NEW_TYPEDDATA_WRAPPER 1
#else
#define TypedData_Wrap_Struct(klass, ignore, json) Data_Wrap_Struct(klass, 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

6
ext/json/parser/parser.c
Просмотреть файл

@ -2122,7 +2122,7 @@ static size_t JSON_memsize(const void *ptr)
return sizeof(*json) + FBUFFER_CAPA(json->fbuffer); return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
} }
#ifdef HAVE_TYPE_RB_DATA_TYPE_T #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,},
@ -2136,11 +2136,7 @@ static const rb_data_type_t JSON_Parser_type = {
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();
#ifdef HAVE_TYPE_RB_DATA_TYPE_T
return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json); return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json);
#else
return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
#endif
} }
/* /*

17
ext/json/parser/parser.h
Просмотреть файл

@ -49,15 +49,9 @@ typedef struct JSON_ParserStruct {
#define GET_PARSER \ #define GET_PARSER \
GET_PARSER_INIT; \ GET_PARSER_INIT; \
if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance") if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance")
#ifdef HAVE_TYPE_RB_DATA_TYPE_T
#define GET_PARSER_INIT \ #define GET_PARSER_INIT \
JSON_Parser *json; \ JSON_Parser *json; \
TypedData_Get_Struct(self, JSON_Parser, &JSON_Parser_type, json) TypedData_Get_Struct(self, JSON_Parser, &JSON_Parser_type, json)
#else
#define GET_PARSER_INIT \
JSON_Parser *json; \
Data_Get_Struct(self, JSON_Parser, json)
#endif
#define MinusInfinity "-Infinity" #define MinusInfinity "-Infinity"
#define EVIL 0x666 #define EVIL 0x666
@ -79,10 +73,6 @@ static void JSON_mark(void *json);
static void JSON_free(void *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);
#ifdef HAVE_TYPE_RB_DATA_TYPE_T
static const rb_data_type_t JSON_Parser_type;
#endif
#ifndef ZALLOC #ifndef ZALLOC
#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type))) #define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
static inline void *ruby_zalloc(size_t n) static inline void *ruby_zalloc(size_t n)
@ -92,5 +82,12 @@ static inline void *ruby_zalloc(size_t n)
return p; return p;
} }
#endif #endif
#ifdef TypedData_Wrap_Struct
static const rb_data_type_t JSON_Parser_type;
#define NEW_TYPEDDATA_WRAPPER 1
#else
#define TypedData_Wrap_Struct(klass, ignore, json) Data_Wrap_Struct(klass, JSON_mark, JSON_free, json)
#define TypedData_Get_Struct(self, JSON_Parser, ignore, json) Data_Get_Struct(self, JSON_Parser, json)
#endif
#endif #endif

6
ext/json/parser/parser.rl
Просмотреть файл

@ -845,7 +845,7 @@ static size_t JSON_memsize(const void *ptr)
return sizeof(*json) + FBUFFER_CAPA(json->fbuffer); return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
} }
#ifdef HAVE_TYPE_RB_DATA_TYPE_T #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,},
@ -859,11 +859,7 @@ static const rb_data_type_t JSON_Parser_type = {
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();
#ifdef HAVE_TYPE_RB_DATA_TYPE_T
return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json); return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json);
#else
return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
#endif
} }
/* /*