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

stop using strtol (via readint) except in load.c; use custom readint_float

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-06-13 23:16:53 +09:00
parent 8004168725
commit 6919ca61ed
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mrbconf.h
-1
View File
@@ -19,7 +19,6 @@ typedef double mrb_float;
typedef int mrb_int;
typedef intptr_t mrb_sym;
#define readint(p,base) strtol((p),NULL,(base))
#undef PARSER_DUMP /* do not print out parser state */
//#define PARSER_DUMP /* print out parser state */
src/codegen.c
+11 -8
View File
@@ -1575,16 +1575,18 @@ codegen(codegen_scope *s, node *tree, int val)
if (val) {
char *p = (char*)tree->car;
int base = (intptr_t)tree->cdr->car;
long i = readint(p, base);
mrb_float f;
mrb_int i;
mrb_code co;
if ((i == LONG_MAX && errno == ERANGE) || !FIXABLE(i)) {
mrb_float f = readint_float(s, p, base);
f = readint_float(s, p, base);
if (!FIXABLE(f)) {
int off = new_lit(s, mrb_float_value(f));
genop(s, MKOP_ABx(OP_LOADL, cursp(), off));
}
else {
i = (mrb_int)f;
if (i < MAXARG_sBx && i > -MAXARG_sBx) {
co = MKOP_AsBx(OP_LOADI, cursp(), i);
}
@@ -1629,17 +1631,18 @@ codegen(codegen_scope *s, node *tree, int val)
{
char *p = (char*)tree->car;
int base = (intptr_t)tree->cdr->car;
long i = readint(p, base);
mrb_float f;
mrb_int i;
mrb_code co;
if ((i == LONG_MAX && errno == ERANGE) || !FIXABLE(i)) {
mrb_float f = readint_float(s, p, base);
f = readint_float(s, p, base);
if (!FIXABLE(f)) {
int off = new_lit(s, mrb_float_value(-f));
genop(s, MKOP_ABx(OP_LOADL, cursp(), off));
}
else {
i = -i;
i = (mrb_int)-f;
if (i < MAXARG_sBx && i > -MAXARG_sBx) {
co = MKOP_AsBx(OP_LOADI, cursp(), i);
}
src/load.c
+1 -1
View File
@@ -413,7 +413,7 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, mrb_irep *irep, uint32
switch (tt) { //pool data
case MRB_TT_FIXNUM:
fix_num = readint(buf, 10);
fix_num = strtol(buf, NULL, 10);
irep->pool[i] = mrb_fixnum_value(fix_num);
break;