summaryrefslogtreecommitdiff
path: root/strlib.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>1994-12-16 13:53:57 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>1994-12-16 13:53:57 -0200
commitfad57bfa008523c3568b613989a6a3f87f3cb83b (patch)
treeca47286ada599e45f4445e16d6a410833d4735e8 /strlib.c
parent891cab8a31ec73dddb5aa896abedbac53b4c16f8 (diff)
downloadlua-github-fad57bfa008523c3568b613989a6a3f87f3cb83b.tar.gz
new constant LUA_NOOBJECT.
'lua_error' never returns
Diffstat (limited to 'strlib.c')
-rw-r--r--strlib.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/strlib.c b/strlib.c
index ef79ac82..68acc218 100644
--- a/strlib.c
+++ b/strlib.c
@@ -3,7 +3,7 @@
** String library to LUA
*/
-char *rcs_strlib="$Id: strlib.c,v 1.5 1994/11/16 17:38:08 roberto Stab $";
+char *rcs_strlib="$Id: strlib.c,v 1.6 1994/12/13 15:54:21 roberto Exp roberto $";
#include <string.h>
#include <ctype.h>
@@ -23,7 +23,7 @@ static void str_find (void)
lua_Object o1 = lua_getparam (1);
lua_Object o2 = lua_getparam (2);
if (!lua_isstring(o1) || !lua_isstring(o2))
- { lua_error ("incorrect arguments to function `strfind'"); return; }
+ lua_error ("incorrect arguments to function `strfind'");
s1 = lua_getstring(o1);
s2 = lua_getstring(o2);
f = strstr(s1,s2);
@@ -42,7 +42,7 @@ static void str_len (void)
{
lua_Object o = lua_getparam (1);
if (!lua_isstring(o))
- { lua_error ("incorrect arguments to function `strlen'"); return; }
+ lua_error ("incorrect arguments to function `strlen'");
lua_pushnumber(strlen(lua_getstring(o)));
}
@@ -60,9 +60,9 @@ static void str_sub (void)
lua_Object o2 = lua_getparam (2);
lua_Object o3 = lua_getparam (3);
if (!lua_isstring(o1) || !lua_isnumber(o2))
- { lua_error ("incorrect arguments to function `strsub'"); return; }
- if (o3 != NULL && !lua_isnumber(o3))
- { lua_error ("incorrect third argument to function `strsub'"); return; }
+ lua_error ("incorrect arguments to function `strsub'");
+ if (o3 != LUA_NOOBJECT && !lua_isnumber(o3))
+ lua_error ("incorrect third argument to function `strsub'");
s = lua_copystring(o1);
start = lua_getnumber (o2);
end = o3 == NULL ? strlen(s) : lua_getnumber (o3);
@@ -86,7 +86,7 @@ static void str_lower (void)
char *s, *c;
lua_Object o = lua_getparam (1);
if (!lua_isstring(o))
- { lua_error ("incorrect arguments to function `strlower'"); return; }
+ lua_error ("incorrect arguments to function `strlower'");
c = s = strdup(lua_getstring(o));
while (*c != 0)
{
@@ -108,7 +108,7 @@ static void str_upper (void)
char *s, *c;
lua_Object o = lua_getparam (1);
if (!lua_isstring(o))
- { lua_error ("incorrect arguments to function `strlower'"); return; }
+ lua_error ("incorrect arguments to function `strlower'");
c = s = strdup(lua_getstring(o));
while (*c != 0)
{