luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Val() correctly reads thousand separators again.

Browse source 
[INTERPRETER]
* BUG: Val() correctly reads thousand separators again.
This commit is contained in:
gambas 2018-08-10 23:37:55 +02:00
parent d189a564e3
commit c13f650c8f
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/gbx/gbx_number.c
View file

@ -84,6 +84,8 @@ static bool read_integer(int base, bool minus, int64_t *result, bool local)
{ {
if (local) if (local)
{ {
COMMON_pos--;
if (has_string(thsep, lthsep) && (ndigit_thsep == 3 || (!first_thsep && ndigit_thsep >= 1 && ndigit_thsep <= 3))) if (has_string(thsep, lthsep) && (ndigit_thsep == 3 || (!first_thsep && ndigit_thsep >= 1 && ndigit_thsep <= 3)))
{ {
COMMON_pos += lthsep; COMMON_pos += lthsep;
@ -91,6 +93,8 @@ static bool read_integer(int base, bool minus, int64_t *result, bool local)
first_thsep = TRUE; first_thsep = TRUE;
ndigit_thsep = 0; ndigit_thsep = 0;
} }
else
COMMON_pos++;
} }
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
@ -237,6 +241,8 @@ static bool read_float(double *result, bool local)
if (local && !frac) if (local && !frac)
{ {
COMMON_pos--;
if (has_string(thsep, lthsep) && (ndigit_thsep == 3 || (!first_thsep && ndigit_thsep >= 1 && ndigit_thsep <= 3))) if (has_string(thsep, lthsep) && (ndigit_thsep == 3 || (!first_thsep && ndigit_thsep >= 1 && ndigit_thsep <= 3)))
{ {
COMMON_pos += lthsep; COMMON_pos += lthsep;
@ -244,6 +250,8 @@ static bool read_float(double *result, bool local)
ndigit_thsep = 0; ndigit_thsep = 0;
c = get_char(); c = get_char();
} }
else
COMMON_pos++;
} }
if (!isdigit(c) || (c < 0)) if (!isdigit(c) || (c < 0))