diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2001-06-28 11:45:44 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2001-06-28 11:45:44 -0300 |
commit | 61a036eaa5918bdf5d7f01443b43288030337d20 (patch) | |
tree | 36d337a57e9aaec56c0d5612c2ad446335ffbcd5 | |
parent | 37f3a1c0452439bce1f5c2069ca015af148bf62f (diff) | |
download | lua-61a036eaa5918bdf5d7f01443b43288030337d20.tar.gz lua-61a036eaa5918bdf5d7f01443b43288030337d20.tar.bz2 lua-61a036eaa5918bdf5d7f01443b43288030337d20.zip |
new macro to control format for `read"*n"'
-rw-r--r-- | liolib.c | 4 | ||||
-rw-r--r-- | lua.h | 12 |
2 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: liolib.c,v 1.115 2001/06/08 16:48:32 roberto Exp roberto $ | 2 | ** $Id: liolib.c,v 1.116 2001/06/22 13:49:42 roberto Exp roberto $ |
3 | ** Standard I/O (and system) library | 3 | ** Standard I/O (and system) library |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -263,7 +263,7 @@ static int read_until (lua_State *L, FILE *f, const l_char *p, int pl) { | |||
263 | 263 | ||
264 | static int read_number (lua_State *L, FILE *f) { | 264 | static int read_number (lua_State *L, FILE *f) { |
265 | double d; | 265 | double d; |
266 | if (fscanf(f, l_s("%lf"), &d) == 1) { | 266 | if (fscanf(f, l_s(LUA_SCAN_NUMBER), &d) == 1) { |
267 | lua_pushnumber(L, d); | 267 | lua_pushnumber(L, d); |
268 | return 1; | 268 | return 1; |
269 | } | 269 | } |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lua.h,v 1.97 2001/04/23 16:35:45 roberto Exp roberto $ | 2 | ** $Id: lua.h,v 1.98 2001/06/06 18:00:19 roberto Exp roberto $ |
3 | ** Lua - An Extensible Extension Language | 3 | ** Lua - An Extensible Extension Language |
4 | ** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil | 4 | ** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil |
5 | ** e-mail: info@lua.org | 5 | ** e-mail: info@lua.org |
@@ -292,10 +292,16 @@ LUA_API void lua_pushusertag (lua_State *L, void *u, int tag); | |||
292 | #define l_charint int | 292 | #define l_charint int |
293 | #endif | 293 | #endif |
294 | 294 | ||
295 | /* function to convert a lua_Number to a string */ | 295 | /* |
296 | ** formats for Lua numbers | ||
297 | */ | ||
298 | #ifndef LUA_SCAN_NUMBER | ||
299 | #define LUA_SCAN_NUMBER "%lf" | ||
300 | #endif | ||
296 | #ifndef LUA_NUMBER_FMT | 301 | #ifndef LUA_NUMBER_FMT |
297 | #define LUA_NUMBER_FMT "%.16g" | 302 | #define LUA_NUMBER_FMT "%.16g" |
298 | #endif | 303 | #endif |
304 | /* function to convert a lua_Number to a string */ | ||
299 | #ifndef lua_number2str | 305 | #ifndef lua_number2str |
300 | #define lua_number2str(s,n) sprintf((s), l_s(LUA_NUMBER_FMT), (n)) | 306 | #define lua_number2str(s,n) sprintf((s), l_s(LUA_NUMBER_FMT), (n)) |
301 | #endif | 307 | #endif |