|
 |
066bff |
--- bc-1.06/dc/numeric.c.dc_ibase 2007-08-22 08:37:57.000000000 +0200
|
|
|
066bff |
+++ bc-1.06/dc/numeric.c 2007-08-22 08:37:40.000000000 +0200
|
|
|
066bff |
@@ -285,6 +285,8 @@ dc_getnum DC_DECLARG((input, ibase, read
|
|
|
066bff |
int digit;
|
|
|
066bff |
int decimal;
|
|
|
066bff |
int c;
|
|
|
066bff |
+ int c_buff = 0;
|
|
|
066bff |
+ int multi = 0;
|
|
|
066bff |
|
|
|
066bff |
bc_init_num(&tmp);
|
|
|
066bff |
bc_init_num(&build);
|
|
|
066bff |
@@ -302,6 +304,9 @@ dc_getnum DC_DECLARG((input, ibase, read
|
|
|
066bff |
}
|
|
|
066bff |
while (isspace(c))
|
|
|
066bff |
c = (*input)();
|
|
|
066bff |
+ c_buff = (*input)();
|
|
|
066bff |
+ if (isdigit(c_buff) || ('A' <= c_buff && c_buff <= 'F') || c_buff == '.')
|
|
|
066bff |
+ multi = 1;
|
|
|
066bff |
for (;;){
|
|
|
066bff |
if (isdigit(c))
|
|
|
066bff |
digit = c - '0';
|
|
|
066bff |
@@ -309,10 +314,15 @@ dc_getnum DC_DECLARG((input, ibase, read
|
|
|
066bff |
digit = 10 + c - 'A';
|
|
|
066bff |
else
|
|
|
066bff |
break;
|
|
|
066bff |
- c = (*input)();
|
|
|
066bff |
+ digit = multi ? (digit >= ibase ? ibase -1 : digit) : digit;
|
|
|
066bff |
bc_int2num(&tmp, digit);
|
|
|
066bff |
bc_multiply(result, base, &result, 0);
|
|
|
066bff |
bc_add(result, tmp, &result, 0);
|
|
|
066bff |
+ if (c_buff) {
|
|
|
066bff |
+ c = c_buff;
|
|
|
066bff |
+ c_buff = 0;
|
|
|
066bff |
+ } else
|
|
|
066bff |
+ c = (*input)();
|
|
|
066bff |
}
|
|
|
066bff |
if (c == '.'){
|
|
|
066bff |
bc_free_num(&build);
|
|
|
066bff |
@@ -321,13 +331,18 @@ dc_getnum DC_DECLARG((input, ibase, read
|
|
|
066bff |
build = bc_copy_num(_zero_);
|
|
|
066bff |
decimal = 0;
|
|
|
066bff |
for (;;){
|
|
|
066bff |
- c = (*input)();
|
|
|
066bff |
+ if (c_buff) {
|
|
|
066bff |
+ c = c_buff;
|
|
|
066bff |
+ c_buff = 0;
|
|
|
066bff |
+ } else
|
|
|
066bff |
+ c = (*input)();
|
|
|
066bff |
if (isdigit(c))
|
|
|
066bff |
digit = c - '0';
|
|
|
066bff |
else if ('A' <= c && c <= 'F')
|
|
|
066bff |
digit = 10 + c - 'A';
|
|
|
066bff |
else
|
|
|
066bff |
break;
|
|
|
066bff |
+ digit = digit >= ibase ? ibase -1 : digit;
|
|
|
066bff |
bc_int2num(&tmp, digit);
|
|
|
066bff |
bc_multiply(build, base, &build, 0);
|
|
|
066bff |
bc_add(build, tmp, &build, 0);
|