diff options
| author | Akira TAGOH <akira@tagoh.org> | 2006-10-09 13:49:57 +0000 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2006-10-09 13:49:57 +0000 |
| commit | 3176bc5af0d666bb36bbdee747ce3f6ddfcbbeab (patch) | |
| tree | 0915bc77917fdd2be4fcdbdde577d34fcca460d2 | |
| parent | c7fbe6220fedf69d8db72b68ef2ac862dbb2393d (diff) | |
* hieroglyph/scanner.c (_hg_scanner_get_object): fixed a typo.
| -rw-r--r-- | hieroglyph/scanner.c | 22 | ||||
| -rw-r--r-- | hieroglyph/version.h.in | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/hieroglyph/scanner.c b/hieroglyph/scanner.c index 5faf358..a863168 100644 --- a/hieroglyph/scanner.c +++ b/hieroglyph/scanner.c @@ -465,11 +465,11 @@ _hg_scanner_get_object(HgVM *vm, if (_hg_scanner_parse_number(vm, file, token_type, 10, sign, !maybe_real, string, &retval, &error)) { - if (error) - return NULL; token_type = HG_SCAN_TOKEN_NUMERIC; need_loop = FALSE; } + if (error) + return NULL; break; case HG_SCAN_TOKEN_NAME: case HG_SCAN_TOKEN_LITERAL: @@ -509,11 +509,11 @@ _hg_scanner_get_object(HgVM *vm, if (_hg_scanner_parse_number(vm, file, token_type, 10, sign, !maybe_real, string, &retval, &error)) { - if (error) - return NULL; token_type = HG_SCAN_TOKEN_NUMERIC; need_loop = FALSE; } + if (error) + return NULL; break; case HG_SCAN_TOKEN_LITERAL: case HG_SCAN_TOKEN_EVAL_NAME: @@ -836,13 +836,6 @@ _hg_scanner_parse_number(HgVM *vm, length = hg_int_array_length(intarray); for (j = 0; j < length; j++) { d += ((gdouble)hg_int_array_index(intarray, j) * exp10((gdouble)((length - j - 1) * 9 + digits + intdigits))); - if (isinf(d) != 0 || isnan(d) != 0) { - _hg_scanner_set_error(vm, - __hg_operator_list[HG_op_token], - VM_e_limitcheck); - *error = TRUE; - return FALSE; - } } if (di != 0) { d += (gdouble)di; @@ -858,6 +851,13 @@ _hg_scanner_parse_number(HgVM *vm, } if (sign < 0) d = -d; + if (isinf(d) != 0 || isnan(d) != 0) { + _hg_scanner_set_error(vm, + __hg_operator_list[HG_op_token], + VM_e_limitcheck); + *error = TRUE; + return FALSE; + } if (is_integer && d <= G_MAXINT32 && d >= G_MININT32) HG_VALUE_MAKE_INTEGER (pool, *node, (gint32)d); else diff --git a/hieroglyph/version.h.in b/hieroglyph/version.h.in index d4eb328..683c736 100644 --- a/hieroglyph/version.h.in +++ b/hieroglyph/version.h.in @@ -29,7 +29,7 @@ G_BEGIN_DECLS #define HIEROGLYPH_VERSION "@VERSION@" -#define HIEROGLYPH_UUID "a8c450d9-bf6c-42f0-bcf3-65fec81e44b7" +#define HIEROGLYPH_UUID "d09c70c1-4ab2-4edf-b803-1cca30163a1d" const char *__hg_rcsid G_GNUC_UNUSED = "$Rev$"; |