rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"[^]]" must mean "not ]".

This commit is contained in:
Roberto Ierusalimschy 1996-08-09 10:14:11 -03:00
parent 25b6dae7c0
commit 36dd1af92d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
strlib.c
View File

@ -3,7 +3,7 @@
** String library to LUA ** String library to LUA
*/ */
char *rcs_strlib="$Id: strlib.c,v 1.25 1996/08/01 14:55:33 roberto Exp roberto $"; char *rcs_strlib="$Id: strlib.c,v 1.26 1996/08/05 20:55:24 roberto Exp roberto $";
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -178,20 +178,25 @@ static void str_ascii (void)
#define ESC '%' #define ESC '%'
#define SPECIALS "^$*?.([%" #define SPECIALS "^$*?.([%"
static char *bracket_end (char *p)
{
return (*p == 0) ? NULL : strchr((*p=='^') ? p+2 : p+1, ']');
}
char *item_end (char *p) char *item_end (char *p)
{ {
switch (*p) { switch (*p++) {
case '\0': return p; case '\0': return p-1;
case ESC: case ESC:
if (*(p+1) == 0) lua_error("incorrect pattern"); if (*p == 0) lua_error("incorrect pattern");
return p+2; return p+1;
case '[': { case '[': {
char *end = (*(p+1) == 0) ? NULL : strchr(p+2, ']'); char *end = bracket_end(p);
if (end == NULL) lua_error("incorrect pattern"); if (end == NULL) lua_error("incorrect pattern");
return end+1; return end+1;
} }
default: default:
return p+1; return p;
} }
} }
@ -219,7 +224,7 @@ int singlematch (int c, char *p)
case '.': return 1; case '.': return 1;
case ESC: return matchclass(c, *(p+1)); case ESC: return matchclass(c, *(p+1));
case '[': { case '[': {
char *end = strchr(p+2, ']'); char *end = bracket_end(p+1);
int sig = *(p+1) == '^' ? (p++, 0) : 1; int sig = *(p+1) == '^' ? (p++, 0) : 1;
while (++p < end) { while (++p < end) {
if (*p == ESC) { if (*p == ESC) {