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

'string.find' as it was in 5.0

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2005-09-19 10:49:12 -03:00
parent c8c2e06899
commit bf96d3fdd9
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lstrlib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lstrlib.c,v 1.122 2005/08/15 14:12:32 roberto Exp roberto $ ** $Id: lstrlib.c,v 1.123 2005/08/26 17:36:32 roberto Exp roberto $
** Standard library for string operations and pattern-matching ** Standard library for string operations and pattern-matching
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -516,12 +516,7 @@ static int str_find_aux (lua_State *L, int find) {
if (find) { if (find) {
lua_pushinteger(L, s1-s+1); /* start */ lua_pushinteger(L, s1-s+1); /* start */
lua_pushinteger(L, res-s); /* end */ lua_pushinteger(L, res-s); /* end */
#if defined(LUA_COMPAT_FIND)
return push_captures(&ms, NULL, 0) + 2; return push_captures(&ms, NULL, 0) + 2;
#else
return 2;
#endif
} }
else else
return push_captures(&ms, s1, res); return push_captures(&ms, s1, res);

10
luaconf.h
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: luaconf.h,v 1.66 2005/09/14 17:23:03 roberto Exp roberto $ ** $Id: luaconf.h,v 1.67 2005/09/14 17:44:48 roberto Exp roberto $
** Configuration file for Lua ** Configuration file for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -315,13 +315,6 @@
*/ */
#define LUA_COMPAT_LSTR 1 #define LUA_COMPAT_LSTR 1
/*
@@ LUA_COMPAT_FIND controls compatibility with old 'string.find' behavior.
** CHANGE it to undefined as soon as your programs use 'string.find' only
** to find patterns.
*/
#define LUA_COMPAT_FIND
/* /*
@@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name. @@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
** CHANGE it to undefined as soon as you rename 'string.gfind' to ** CHANGE it to undefined as soon as you rename 'string.gfind' to
@@ -329,7 +322,6 @@
*/ */
#define LUA_COMPAT_GFIND #define LUA_COMPAT_GFIND
/* /*
@@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib' @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
@* behavior. @* behavior.