History

Lua 5.1-rc4

Lua Team committed 20 years ago

Commit 4e079f61 parent 010ebd07 files · +34 −35Browse files

Showing the changes to src (2 of 7 files). Show all

Unified · Split

2 files
  1. src/lobject.c +3 −1
  2. src/luaconf.h +4 −4
src/lobject.c+3−1
@@ -1,5 +1,5 @@
11 /*
2−** $Id: lobject.c,v 2.21 2006/01/10 12:50:00 roberto Exp $
2+** $Id: lobject.c,v 2.22 2006/02/10 17:43:52 roberto Exp $
33 ** Some generic functions over Lua objects
44 ** See Copyright Notice in lua.h
55 */
@@ -91,6 +91,8 @@ int luaO_str2d (const char *s, lua_Number *result) { · 85 unmodified lines
9191 char *endptr;
9292 *result = lua_str2number(s, &endptr);
9393 if (endptr == s) return 0; /* conversion failed */
94+ if (*endptr == 'x' || *endptr == 'X') /* maybe an hexadecimal constant? */
95+ *result = cast_num(strtoul(s, &endptr, 16));
9496 if (*endptr == '\0') return 1; /* most common case */
9597 while (isspace(cast(unsigned char, *endptr))) endptr++;
9698 if (*endptr != '\0') return 0; /* invalid trailing characters? */
src/luaconf.h+4−4
@@ -1,5 +1,5 @@
11 /*
2−** $Id: luaconf.h,v 1.80 2006/01/27 13:54:39 roberto Exp $
2+** $Id: luaconf.h,v 1.81 2006/02/10 17:44:06 roberto Exp $
33 ** Configuration file for Lua
44 ** See Copyright Notice in lua.h
55 */
@@ -650,9 +650,9 @@ union luai_Cast { double l_d; long l_l; }; · 644 unmodified lines
650650
651651 #else
652652
653−#define lua_popen(L,c,m) \
654− ((void)c, (void)m, luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
655−#define lua_pclose(L,file) ((void)L, (void)file, 0)
653+#define lua_popen(L,c,m) ((void)((void)c, m), \
654+ luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
655+#define lua_pclose(L,file) ((void)((void)L, file), 0)
656656
657657 #endif
658658