rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sai strtod, entra sscanf. permite conversao de numeros com espacos em volta.

This commit is contained in:
Waldemar Celes 1994-09-20 12:11:11 -03:00
parent 98263e2ef1
commit 98d9509676
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
opcode.c
View File

@ -3,7 +3,7 @@
** TecCGraf - PUC-Rio ** TecCGraf - PUC-Rio
*/ */
char *rcs_opcode="$Id: opcode.c,v 2.5 1994/08/17 15:02:03 celes Exp celes $"; char *rcs_opcode="$Id: opcode.c,v 2.6 1994/09/08 16:51:49 celes Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -90,20 +90,26 @@ static char *lua_strconc (char *l, char *r)
return strcat(strcpy(buffer,l),r); return strcat(strcpy(buffer,l),r);
} }
static int ToReal (char* s, float* f)
{
int n;
float t;
sscanf(s,"%f %n",&t,&n);
if (s[n]==0) { *f=t; return 1; } else return 0;
}
/* /*
** Convert, if possible, to a number tag. ** Convert, if possible, to a number object.
** Return 0 in success or not 0 on error. ** Return 0 if success, not 0 if error.
*/ */
static int lua_tonumber (Object *obj) static int lua_tonumber (Object *obj)
{ {
char *ptr;
if (tag(obj) != T_STRING) if (tag(obj) != T_STRING)
{ {
lua_reportbug ("unexpected type at conversion to number"); lua_reportbug ("unexpected type at conversion to number");
return 1; return 1;
} }
nvalue(obj) = strtod(svalue(obj), &ptr); if (!ToReal(svalue(obj), &nvalue(obj)))
if (*ptr)
{ {
lua_reportbug ("string to number convertion failed"); lua_reportbug ("string to number convertion failed");
return 2; return 2;
@ -113,7 +119,7 @@ static int lua_tonumber (Object *obj)
} }
/* /*
** Test if is possible to convert an object to a number one. ** Test if is possible to convert an object to a number object.
** If possible, return the converted object, otherwise return nil object. ** If possible, return the converted object, otherwise return nil object.
*/ */
static Object *lua_convtonumber (Object *obj) static Object *lua_convtonumber (Object *obj)
@ -126,14 +132,11 @@ static Object *lua_convtonumber (Object *obj)
return &cvt; return &cvt;
} }
tag(&cvt) = T_NIL; if (tag(obj) == T_STRING && ToReal(svalue(obj), &nvalue(obj)))
if (tag(obj) == T_STRING)
{
char *ptr;
nvalue(&cvt) = strtod(svalue(obj), &ptr);
if (*ptr == 0)
tag(&cvt) = T_NUMBER; tag(&cvt) = T_NUMBER;
} else
tag(&cvt) = T_NIL;
return &cvt; return &cvt;
} }