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

simpler way to create messages for errors in escape sequences

This commit is contained in:
Roberto Ierusalimschy 2014-01-31 13:14:22 -02:00
parent 86dd8bf3f5
commit 5a73e3ad9e
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
llex.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 2.69 2013/08/30 16:01:37 roberto Exp roberto $ ** $Id: llex.c,v 2.70 2013/12/30 20:47:58 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -320,40 +320,39 @@ static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
} }
static void escerror (LexState *ls, int *c, int n, const char *msg) { static void escerror (LexState *ls, const char *msg) {
int i; if (ls->current != EOZ)
luaZ_resetbuffer(ls->buff); /* prepare error message */ save_and_next(ls); /* add current to buffer for error message */
save(ls, '\\');
for (i = 0; i < n && c[i] != EOZ; i++)
save(ls, c[i]);
lexerror(ls, msg, TK_STRING); lexerror(ls, msg, TK_STRING);
} }
static int gethexa (LexState *ls) {
save_and_next(ls);
if (!lisxdigit(ls->current))
escerror(ls, "hexadecimal digit expected");
return luaO_hexavalue(ls->current);
}
static int readhexaesc (LexState *ls) { static int readhexaesc (LexState *ls) {
int c[3], i; /* keep input for error message */ int r = gethexa(ls);
int r = 0; /* result accumulator */ r = (r << 4) + gethexa(ls);
c[0] = 'x'; /* for error message */ luaZ_buffremove(ls->buff, 2); /* remove saved chars from buffer */
for (i = 1; i < 3; i++) { /* read two hexadecimal digits */
c[i] = next(ls);
if (!lisxdigit(c[i]))
escerror(ls, c, i + 1, "hexadecimal digit expected");
r = (r << 4) + luaO_hexavalue(c[i]);
}
return r; return r;
} }
static int readdecesc (LexState *ls) { static int readdecesc (LexState *ls) {
int c[3], i; int i;
int r = 0; /* result accumulator */ int r = 0; /* result accumulator */
for (i = 0; i < 3 && lisdigit(ls->current); i++) { /* read up to 3 digits */ for (i = 0; i < 3 && lisdigit(ls->current); i++) { /* read up to 3 digits */
c[i] = ls->current; r = 10*r + ls->current - '0';
r = 10*r + c[i] - '0'; save_and_next(ls);
next(ls);
} }
if (r > UCHAR_MAX) if (r > UCHAR_MAX)
escerror(ls, c, i, "decimal escape too large"); escerror(ls, "decimal escape too large");
luaZ_buffremove(ls->buff, i); /* remove read digits from buffer */
return r; return r;
} }
@ -371,7 +370,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
break; /* to avoid warnings */ break; /* to avoid warnings */
case '\\': { /* escape sequences */ case '\\': { /* escape sequences */
int c; /* final character to be saved */ int c; /* final character to be saved */
next(ls); /* do not save the `\' */ save_and_next(ls); /* keep '\\' for error messages */
switch (ls->current) { switch (ls->current) {
case 'a': c = '\a'; goto read_save; case 'a': c = '\a'; goto read_save;
case 'b': c = '\b'; goto read_save; case 'b': c = '\b'; goto read_save;
@ -387,6 +386,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
c = ls->current; goto read_save; c = ls->current; goto read_save;
case EOZ: goto no_save; /* will raise an error next loop */ case EOZ: goto no_save; /* will raise an error next loop */
case 'z': { /* zap following span of spaces */ case 'z': { /* zap following span of spaces */
luaZ_buffremove(ls->buff, 1); /* remove '\\' */
next(ls); /* skip the 'z' */ next(ls); /* skip the 'z' */
while (lisspace(ls->current)) { while (lisspace(ls->current)) {
if (currIsNewline(ls)) inclinenumber(ls); if (currIsNewline(ls)) inclinenumber(ls);
@ -396,14 +396,18 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
} }
default: { default: {
if (!lisdigit(ls->current)) if (!lisdigit(ls->current))
escerror(ls, &ls->current, 1, "invalid escape sequence"); escerror(ls, "invalid escape sequence");
/* digital escape \ddd */ c = readdecesc(ls); /* digital escape \ddd */
c = readdecesc(ls);
goto only_save; goto only_save;
} }
} }
read_save: next(ls); /* read next character */ read_save:
only_save: save(ls, c); /* save 'c' */ next(ls);
/* go through */
only_save:
luaZ_buffremove(ls->buff, 1); /* remove '\\' */
save(ls, c);
/* go through */
no_save: break; no_save: break;
} }
default: default:

3
lzio.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lzio.h,v 1.26 2011/07/15 12:48:03 roberto Exp roberto $ ** $Id: lzio.h,v 1.27 2013/06/07 14:51:10 roberto Exp roberto $
** Buffered streams ** Buffered streams
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -32,6 +32,7 @@ typedef struct Mbuffer {
#define luaZ_sizebuffer(buff) ((buff)->buffsize) #define luaZ_sizebuffer(buff) ((buff)->buffsize)
#define luaZ_bufflen(buff) ((buff)->n) #define luaZ_bufflen(buff) ((buff)->n)
#define luaZ_buffremove(buff,i) ((buff)->n -= (i))
#define luaZ_resetbuffer(buff) ((buff)->n = 0) #define luaZ_resetbuffer(buff) ((buff)->n = 0)