2
0
Эх сурвалжийг харах

defintions for lua_number2str and lua_str2number don't need to be public

Roberto Ierusalimschy 23 жил өмнө
parent
commit
fa23301251
3 өөрчлөгдсөн 15 нэмэгдсэн , 13 устгасан
  1. 6 1
      lobject.c
  2. 1 10
      lua.h
  3. 8 2
      lvm.c

+ 6 - 1
lobject.c

@@ -1,5 +1,5 @@
 /*
 /*
-** $Id: lobject.c,v 1.81 2002/05/16 18:39:46 roberto Exp roberto $
+** $Id: lobject.c,v 1.82 2002/06/03 14:08:43 roberto Exp roberto $
 ** Some generic functions over Lua objects
 ** Some generic functions over Lua objects
 ** See Copyright Notice in lua.h
 ** See Copyright Notice in lua.h
 */
 */
@@ -19,6 +19,11 @@
 #include "lvm.h"
 #include "lvm.h"
 
 
 
 
+/* function to convert a string to a lua_Number */
+#ifndef lua_str2number
+#define lua_str2number(s,p)     strtod((s), (p))
+#endif
+
 
 
 const TObject luaO_nilobject = {LUA_TNIL, {NULL}};
 const TObject luaO_nilobject = {LUA_TNIL, {NULL}};
 
 

+ 1 - 10
lua.h

@@ -1,5 +1,5 @@
 /*
 /*
-** $Id: lua.h,v 1.135 2002/06/03 17:46:34 roberto Exp roberto $
+** $Id: lua.h,v 1.136 2002/06/03 20:11:07 roberto Exp roberto $
 ** Lua - An Extensible Extension Language
 ** Lua - An Extensible Extension Language
 ** Tecgraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil
 ** Tecgraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil
 ** e-mail: [email protected]
 ** e-mail: [email protected]
@@ -300,15 +300,6 @@ LUA_API int lua_pushupvalues (lua_State *L);
 #define LUA_NUMBER_FMT		"%.16g"
 #define LUA_NUMBER_FMT		"%.16g"
 #endif
 #endif
 
 
-/* function to convert a lua_Number to a string */
-#ifndef lua_number2str
-#define lua_number2str(s,n)     sprintf((s), LUA_NUMBER_FMT, (n))
-#endif
-
-/* function to convert a string to a lua_Number */
-#ifndef lua_str2number
-#define lua_str2number(s,p)     strtod((s), (p))
-#endif
 
 
 /* function to convert a lua_Number to int (with any rounding method) */
 /* function to convert a lua_Number to int (with any rounding method) */
 #ifndef lua_number2int
 #ifndef lua_number2int

+ 8 - 2
lvm.c

@@ -1,12 +1,11 @@
 /*
 /*
-** $Id: lvm.c,v 1.233 2002/05/27 20:35:40 roberto Exp roberto $
+** $Id: lvm.c,v 1.234 2002/06/03 14:08:43 roberto Exp roberto $
 ** Lua virtual machine
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 ** See Copyright Notice in lua.h
 */
 */
 
 
 
 
 #include <stdarg.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 
 
@@ -25,6 +24,13 @@
 #include "lvm.h"
 #include "lvm.h"
 
 
 
 
+/* function to convert a lua_Number to a string */
+#ifndef lua_number2str
+#include <stdio.h>
+#define lua_number2str(s,n)     sprintf((s), LUA_NUMBER_FMT, (n))
+#endif
+
+
 /* limit for table tag-method chains (to avoid loops) */
 /* limit for table tag-method chains (to avoid loops) */
 #define MAXTAGLOOP	10000
 #define MAXTAGLOOP	10000