admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

added support for E in pack (double)

Browse Source
This commit is contained in:
Julien Ammous
2013-05-07 21:08:03 +02:00
parent 8c5cb5e782
commit c869bdedc0
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1
View File
@@ -14,6 +14,7 @@ rake ENABLE_GEMS="true"
## support template string
- C : 8-bit unsigned (unsigned char)
- c : 8-bit signed (signed char)
- E : 64-bit double, little endian
- S : 16-bit unsigned, native endian (uint16_t)
- s : 16-bit signed, native endian (int16_t)
- L : 32-bit unsigned, native endian (uint32_t)
src/pack.c
+34 -1
View File
@@ -30,7 +30,7 @@ enum {
//PACK_DIR_VAX,
//PACK_DIR_UTF8, /* U */
//PACK_DIR_BER,
//PACK_DIR_DOUBLE, /* d */
PACK_DIR_DOUBLE, /* E */
//PACK_DIR_FLOAT, /* f */
PACK_DIR_STR, /* A */
PACK_DIR_HEX, /* h */
@@ -188,6 +188,26 @@ pack_l(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int fl
return 4;
}
static int
pack_double(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, unsigned int flags)
{
int i;
double d;
str = str_len_ensure(mrb, str, sidx + 8);
d = mrb_float(o);
uint8_t *buffer = (uint8_t *)&d;
#ifdef MRB_ENDIAN_BIG
#error unsupported
#else
for(i = 0; i< 8; i++){
RSTRING_PTR(str)[sidx+i] = buffer[i];
}
#endif
return 8;
}
static int
unpack_l(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, unsigned int flags)
{
@@ -541,6 +561,12 @@ read_tmpl(mrb_state *mrb, struct tmpl *tmpl, int *dirp, int *typep, int *sizep,
size = 1;
flags |= PACK_FLAG_SIGNED;
break;
case 'E':
dir = PACK_DIR_DOUBLE;
type = PACK_TYPE_FLOAT;
size = 8;
flags |= PACK_FLAG_SIGNED;
break;
case 'H':
dir = PACK_DIR_HEX;
type = PACK_TYPE_STRING;
@@ -683,6 +709,10 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary)
} else if (!mrb_fixnum_p(o)) {
mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %s into Integer", mrb_obj_classname(mrb, o));
}
} else if (type == PACK_TYPE_FLOAT) {
if (!mrb_float_p(o)) {
o = mrb_funcall(mrb, o, "to_f", 0);
}
} else if (type == PACK_TYPE_STRING) {
if (!mrb_string_p(o)) {
mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %s into String", mrb_obj_classname(mrb, o));
@@ -708,6 +738,9 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary)
case PACK_DIR_STR:
ridx += pack_a(mrb, o, result, ridx, count, flags);
break;
case PACK_DIR_DOUBLE:
ridx += pack_double(mrb, o, result, ridx, flags);
break;
default:
break;
}