nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a null lua_Object is LUA_NOOBJECT, not NULL.

Browse Source
This commit is contained in:
Roberto Ierusalimschy
1995-02-02 18:05:37 -02:00
parent 572ee14b52
commit dd28b830e9
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opcode.c
View File

@@ -3,7 +3,7 @@
** TecCGraf - PUC-Rio ** TecCGraf - PUC-Rio
*/ */
char *rcs_opcode="$Id: opcode.c,v 3.31 1994/12/30 17:45:11 roberto Exp celes $"; char *rcs_opcode="$Id: opcode.c,v 3.32 1995/01/27 17:19:06 celes Exp roberto $";
#include <setjmp.h> #include <setjmp.h>
#include <stdio.h> #include <stdio.h>
@@ -373,7 +373,7 @@ static int do_protectedmain (void)
*/ */
int lua_callfunction (lua_Object function) int lua_callfunction (lua_Object function)
{ {
if (function == NULL) if (function == LUA_NOOBJECT)
return 1; return 1;
else else
return do_protectedrun (Address(function), MULT_RET); return do_protectedrun (Address(function), MULT_RET);

17
strlib.c
View File

@@ -3,12 +3,13 @@
** String library to LUA ** String library to LUA
*/ */
char *rcs_strlib="$Id: strlib.c,v 1.8 1995/01/06 20:31:10 roberto Exp roberto $"; char *rcs_strlib="$Id: strlib.c,v 1.10 1995/02/02 18:54:58 roberto Exp $";
#include <string.h> #include <string.h>
#include <strings.h>
#include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include "mem.h"
#include "lua.h" #include "lua.h"
#include "lualib.h" #include "lualib.h"
@@ -87,7 +88,7 @@ static void str_sub (void)
lua_error ("incorrect third argument to function `strsub'"); lua_error ("incorrect third argument to function `strsub'");
s = lua_copystring(o1); s = lua_copystring(o1);
start = lua_getnumber (o2); start = lua_getnumber (o2);
end = o3 == NULL ? strlen(s) : lua_getnumber (o3); end = o3 == LUA_NOOBJECT ? strlen(s) : lua_getnumber (o3);
if (end < start || start < 1 || end > strlen(s)) if (end < start || start < 1 || end > strlen(s))
lua_pushliteral(""); lua_pushliteral("");
else else
@@ -95,7 +96,7 @@ static void str_sub (void)
s[end] = 0; s[end] = 0;
lua_pushstring (&s[start-1]); lua_pushstring (&s[start-1]);
} }
luaI_free(s); free(s);
} }
/* /*
@@ -109,14 +110,14 @@ static void str_lower (void)
lua_Object o = lua_getparam (1); lua_Object o = lua_getparam (1);
if (!lua_isstring(o)) if (!lua_isstring(o))
lua_error ("incorrect arguments to function `strlower'"); lua_error ("incorrect arguments to function `strlower'");
c = s = luaI_strdup(lua_getstring(o)); c = s = lua_copystring(o);
while (*c != 0) while (*c != 0)
{ {
*c = tolower(*c); *c = tolower(*c);
c++; c++;
} }
lua_pushstring(s); lua_pushstring(s);
luaI_free(s); free(s);
} }
@@ -131,14 +132,14 @@ static void str_upper (void)
lua_Object o = lua_getparam (1); lua_Object o = lua_getparam (1);
if (!lua_isstring(o)) if (!lua_isstring(o))
lua_error ("incorrect arguments to function `strlower'"); lua_error ("incorrect arguments to function `strlower'");
c = s = luaI_strdup(lua_getstring(o)); c = s = lua_copystring(o);
while (*c != 0) while (*c != 0)
{ {
*c = toupper(*c); *c = toupper(*c);
c++; c++;
} }
lua_pushstring(s); lua_pushstring(s);
luaI_free(s); free(s);
} }