hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attempint to add fpdec parsing elements

Browse Source
This commit is contained in:
hyunghwan.chung 2019-01-08 10:05:27 +00:00
parent 77fee95759
commit 661f36c17c
2 changed files with 99 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
moo/lib/comp.c
View File

@ -701,9 +701,52 @@ static moo_oop_t string_to_num (moo_t* moo, moo_oocs_t* str, int radixed)
/* TODO: handle floating point numbers ... etc */
if (negsign) base = -base;
return moo_strtoint (moo, ptr, end - ptr, base);
return moo_strtoint(moo, ptr, end - ptr, base);
}
#if 0
static moo_oop_t string_to_fpdec (moo_t* moo, moo_oocs_t* str, const moo_ioloc_t* loc)
{
moo_oow_t pos, len;
moo_oow_t scale = 0;
moo_oop_t v;
int base = 10;
pos = str->len;
while (pos > 0)
{
pos--;
if (str->ptr[pos] == '.')
{
scale = str->len - pos - 1;
if (scale > MOO_SMOOI_MAX)
{
moo_setsynerrbfmt (moo, MOO_SYNERR_NUMRANGE, loc, str, "too many digits after decimal point");
return MOO_NULL;
}
MOO_ASSERT (moo, scale > 0);
/*if (scale > 0)*/ MOO_MEMMOVE (&str->ptr[pos], &str->ptr[pos + 1], scale * MOO_SIZEOF(str->ptr[0])); /* remove the decimal point from the string */
break;
}
}
pos = 0;
len = str->len - 1;
if (str->ptr[pos] == '+' || str->ptr[pos] == '-')
{
if (str->ptr[pos] - '+') base = -10;
pos++;
len--;
}
v = moo_strtoint(moo, &str->ptr[pos], len, base);
if (!v) return MOO_NULL;
return moo_makefpdec(moo, v, scale);
}
#endif
static moo_oop_t string_to_error (moo_t* moo, moo_oocs_t* str, moo_ioloc_t* loc)
{
moo_ooi_t num = 0;
@ -1418,7 +1461,39 @@ static int get_numlit (moo_t* moo, int negated)
}
else
{
unget_char (moo, &moo->c->lxc);
#if 0
if (c == '.')
{
do
{
ADD_TOKEN_CHAR (moo, c);
GET_CHAR_TO (moo, c);
if (c == '_')
{
moo_iolxc_t underscore;
underscore = moo->c->lxc;
GET_CHAR_TO(moo, c);
if (!is_digitchar(c))
{
unget_char (moo, &moo->c->lxc);
unget_char (moo, &underscore);
break;
}
else continue;
}
}
while (is_digitchar(c));
/* TODO: handle floating-point? fpdec if only suffixed with 's' like 1.23s4? */
SET_TOKEN_TYPE (moo, MOO_IOTOK_FPDECLIT);
}
else
{
#endif
unget_char (moo, &moo->c->lxc);
#if 0
}
#endif
}
/*
@ -2803,6 +2878,18 @@ static int add_symbol_literal (moo_t* moo, const moo_oocs_t* str, moo_oow_t offs
return add_literal(moo, tmp, index);
}
static int add_fpdec_literal (moo_t* moo, const moo_oocs_t* str, moo_oow_t* index)
{
moo_oop_t tmp;
#if 0
tmp = moo_makefpdec(moo, value, scale);
if (!tmp) return -1;
#endif
return add_literal(moo, tmp, index);
}
static MOO_INLINE int set_class_fqn (moo_t* moo, moo_cunit_class_t* cc, const moo_oocs_t* name)
{
if (copy_string_to(moo, name, &cc->fqn, &cc->fqn_capa, 0, '\0') <= -1) return -1;
@ -5193,7 +5280,7 @@ static int compile_expression_primary (moo_t* moo, const moo_oocs_t* ident, cons
/* TODO: other types of numbers, etc */
moo_oop_t tmp;
tmp = string_to_num (moo, TOKEN_NAME(moo), TOKEN_TYPE(moo) == MOO_IOTOK_RADNUMLIT);
tmp = string_to_num(moo, TOKEN_NAME(moo), TOKEN_TYPE(moo) == MOO_IOTOK_RADNUMLIT);
if (!tmp) return -1;
if (MOO_OOP_IS_SMOOI(tmp))
@ -5210,6 +5297,14 @@ static int compile_expression_primary (moo_t* moo, const moo_oocs_t* ident, cons
break;
}
#if 0
case MOO_IOTOK_FPDECLIT:
if (add_fpdec_literal(moo, TOKEN_NAME(moo, &index) <= -1 ||
emit_single_param_instruction(moo, BCODE_PUSH_LITERAL_0, index) <= -1) return -1;
GET_TOKEN (moo);
break;
#endif
case MOO_IOTOK_SYMLIT:
if (add_symbol_literal(moo, TOKEN_NAME(moo), 1, &index) <= -1 ||
emit_single_param_instruction(moo, BCODE_PUSH_LITERAL_0, index) <= -1) return -1;

2
moo/lib/gc.c
View File

@ -998,7 +998,7 @@ void moo_gc (moo_t* moo)
* if the symbol has not moved to the new heap, the symbol
* is not referenced by any other objects than the symbol
* table itself */
compact_symbol_table (moo, old_nil);
/*if (!moo->igniting) */ compact_symbol_table (moo, old_nil);
/* move the symbol table itself */
moo->symtab = (moo_oop_dic_t)moo_moveoop(moo, (moo_oop_t)moo->symtab);