fly/fgdata
1
0
Fork 0
Code Activity

string.scanf(): more efficient and (more :) correct %f detection

Browse source
This commit is contained in:
mfranz 2008-09-28 20:23:14 +00:00
parent 7458142f70
commit 3197bc3f24
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Nasal/string.nas
View file

@ -274,49 +274,51 @@ var scanf = func(str, format) {
if (f == `%` and str.getc() != `%`)
return nil;
var fnum = nil;
if (isdigit(f)) {
fnum = f - `0`;
var fnum = f - `0`;
while ((f = format.getc()) != nil and isdigit(f))
fnum = fnum * 10 + f - `0`;
} else {
var fnum = -2; # because we add one if !prefix
}
var numstr = "";
var plus = 0;
if (f == `d` or f == `f`) { # int or float with optional minus
var prefix = 0;
var sign = 1;
if (f == `d` or f == `f` or f == `u`) {
var c = str.getc();
if (c == `+`)
plus = 1;
elsif (c == `-`)
numstr = chr(c);
else
if (c == `+`) {
prefix = 1;
} elsif (c == `-`) {
if (f == `u`)
return nil;
(prefix, sign) = (1, -1);
} else {
str.ungetc();
}
if (f == `D` or f == `F` or f == `d` or f == `f`) { # integer part
while ((var c = str.getc()) != nil and isdigit(c))
numstr ~= chr(c);
if (c != nil)
str.ungetc();
}
if (f == `f` or f == `F`) { # fractional part
while ((var c = str.getc()) != nil) {
if (num(numstr ~ chr(c)) != nil)
}
if (!prefix)
fnum += 1;
while ((var c = str.getc()) != nil and (fnum -= 1)) {
if (f != `f` and c == `.`)
break;
elsif (num(numstr ~ chr(c) ~ '0') != nil)
numstr ~= chr(c);
else
break;
}
if (c != nil)
str.ungetc();
if (num(numstr) == nil)
return nil;
} else {
die("scanf: bad format %" ~ chr(f));
}
if (!size(numstr) and plus or numstr == "-")
if (!size(numstr) and prefix)
return nil;
if (fnum != nil and size(numstr) > fnum)
for (var i = size(numstr) - fnum; i; i -= 1)
str.ungetc();
append(result, num(numstr));
append(result, sign * num(numstr));
} elsif (f != (var c = str.getc())) {
return nil;