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

simpler manipulation of buffer count in scanner

This commit is contained in:
Roberto Ierusalimschy 2003-08-28 11:38:46 -03:00
parent beb896b082
commit b27664e0db
2 changed files with 178 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

349
llex.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 1.121 2003/08/21 14:16:43 roberto Exp roberto $ ** $Id: llex.c,v 1.122 2003/08/27 21:01:44 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -22,10 +22,12 @@
#define next(LS) (LS->current = zgetc(LS->z)) #define next(ls) (ls->current = zgetc(ls->z))
#define save(ls,c) luaZ_save(ls->L,ls->buff,c)
#define nextIsNewline(LS) (LS->current == '\n' || LS->current == '\r') #define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r')
/* ORDER RESERVED */ /* ORDER RESERVED */
@ -83,6 +85,7 @@ void luaX_syntaxerror (LexState *ls, const char *msg) {
break; break;
case TK_STRING: case TK_STRING:
case TK_NUMBER: case TK_NUMBER:
save(ls, '\0');
lasttoken = luaZ_buffer(ls->buff); lasttoken = luaZ_buffer(ls->buff);
break; break;
default: default:
@ -106,41 +109,43 @@ const char *luaX_token2str (LexState *ls, int token) {
static void luaX_lexerror (LexState *ls, const char *s, int token) { static void luaX_lexerror (LexState *ls, const char *s, int token) {
if (token == TK_EOS) if (token == TK_EOS)
luaX_error(ls, s, luaX_token2str(ls, token)); luaX_error(ls, s, luaX_token2str(ls, token));
else else {
save(ls, '\0');
luaX_error(ls, s, luaZ_buffer(ls->buff)); luaX_error(ls, s, luaZ_buffer(ls->buff));
}
} }
TString *luaX_newstring (LexState *LS, const char *str, size_t l) { TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
lua_State *L = LS->L; lua_State *L = ls->L;
TString *ts = luaS_newlstr(L, str, l); TString *ts = luaS_newlstr(L, str, l);
TObject *o = luaH_setstr(L, LS->fs->h, ts); /* entry for `str' */ TObject *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */
if (ttisnil(o)) if (ttisnil(o))
setbvalue(o, 1); /* make sure `str' will not be collected */ setbvalue(o, 1); /* make sure `str' will not be collected */
return ts; return ts;
} }
static void inclinenumber (LexState *LS) { static void inclinenumber (LexState *ls) {
int old = LS->current; int old = ls->current;
lua_assert(nextIsNewline(LS)); lua_assert(currIsNewline(ls));
next(LS); /* skip `\n' or `\r' */ next(ls); /* skip `\n' or `\r' */
if (nextIsNewline(LS) && LS->current != old) if (currIsNewline(ls) && ls->current != old)
next(LS); /* skip `\n\r' or `\r\n' */ next(ls); /* skip `\n\r' or `\r\n' */
++LS->linenumber; ++ls->linenumber;
luaX_checklimit(LS, LS->linenumber, MAX_INT, "lines in a chunk"); luaX_checklimit(ls, ls->linenumber, MAX_INT, "lines in a chunk");
} }
void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source) { void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source) {
LS->L = L; ls->L = L;
LS->lookahead.token = TK_EOS; /* no look-ahead token */ ls->lookahead.token = TK_EOS; /* no look-ahead token */
LS->z = z; ls->z = z;
LS->fs = NULL; ls->fs = NULL;
LS->linenumber = 1; ls->linenumber = 1;
LS->lastline = 1; ls->lastline = 1;
LS->source = source; ls->source = source;
next(LS); /* read first char */ next(ls); /* read first char */
} }
@ -152,246 +157,214 @@ void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source) {
*/ */
/* use buffer to store names, literal strings and numbers */
/* extra space to allocate when growing buffer */ static void save_and_next (LexState *ls) {
#define EXTRABUFF 32 save(ls, ls->current);
next(ls);
/* maximum number of chars that can be read without checking buffer size */
#define MAXNOCHECK 5
#define checkbuffer(LS, len) \
if (((len)+MAXNOCHECK)*sizeof(char) > luaZ_sizebuffer((LS)->buff)) \
luaZ_openspace((LS)->L, (LS)->buff, (len)+EXTRABUFF)
#define save(LS, c, l) \
(luaZ_buffer((LS)->buff)[l++] = cast(char, c))
#define save_and_next(LS, l) (save(LS, LS->current, l), next(LS))
static size_t readname (LexState *LS) {
size_t l = 0;
checkbuffer(LS, l);
do {
checkbuffer(LS, l);
save_and_next(LS, l);
} while (isalnum(LS->current) || LS->current == '_');
save(LS, '\0', l);
return l-1;
} }
/* LUA_NUMBER */ /* LUA_NUMBER */
static void read_numeral (LexState *LS, int comma, SemInfo *seminfo) { static void read_numeral (LexState *ls, SemInfo *seminfo) {
size_t l = 0; while (isdigit(ls->current)) {
checkbuffer(LS, l); save_and_next(ls);
if (comma) save(LS, '.', l);
while (isdigit(LS->current)) {
checkbuffer(LS, l);
save_and_next(LS, l);
} }
if (LS->current == '.') { if (ls->current == '.') {
save_and_next(LS, l); save_and_next(ls);
if (LS->current == '.') { if (ls->current == '.') {
save_and_next(LS, l); save_and_next(ls);
save(LS, '\0', l); luaX_lexerror(ls,
luaX_lexerror(LS,
"ambiguous syntax (decimal point x string concatenation)", "ambiguous syntax (decimal point x string concatenation)",
TK_NUMBER); TK_NUMBER);
} }
} }
while (isdigit(LS->current)) { while (isdigit(ls->current)) {
checkbuffer(LS, l); save_and_next(ls);
save_and_next(LS, l);
} }
if (LS->current == 'e' || LS->current == 'E') { if (ls->current == 'e' || ls->current == 'E') {
save_and_next(LS, l); /* read `E' */ save_and_next(ls); /* read `E' */
if (LS->current == '+' || LS->current == '-') if (ls->current == '+' || ls->current == '-')
save_and_next(LS, l); /* optional exponent sign */ save_and_next(ls); /* optional exponent sign */
while (isdigit(LS->current)) { while (isdigit(ls->current)) {
checkbuffer(LS, l); save_and_next(ls);
save_and_next(LS, l);
} }
} }
save(LS, '\0', l); save(ls, '\0');
if (!luaO_str2d(luaZ_buffer(LS->buff), &seminfo->r)) if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r))
luaX_lexerror(LS, "malformed number", TK_NUMBER); luaX_lexerror(ls, "malformed number", TK_NUMBER);
} }
static void read_long_string (LexState *LS, SemInfo *seminfo) { static void read_long_string (LexState *ls, SemInfo *seminfo) {
int cont = 0; int cont = 0;
size_t l = 0; save_and_next(ls); /* pass the second `[' */
checkbuffer(LS, l); if (currIsNewline(ls)) /* string starts with a newline? */
save(LS, '[', l); /* save first `[' */ inclinenumber(ls); /* skip it */
save_and_next(LS, l); /* pass the second `[' */
if (nextIsNewline(LS)) /* string starts with a newline? */
inclinenumber(LS); /* skip it */
for (;;) { for (;;) {
checkbuffer(LS, l); switch (ls->current) {
switch (LS->current) {
case EOZ: case EOZ:
save(LS, '\0', l); luaX_lexerror(ls, (seminfo) ? "unfinished long string" :
luaX_lexerror(LS, (seminfo) ? "unfinished long string" :
"unfinished long comment", TK_EOS); "unfinished long comment", TK_EOS);
break; /* to avoid warnings */ break; /* to avoid warnings */
case '[': case '[':
save_and_next(LS, l); save_and_next(ls);
if (LS->current == '[') { if (ls->current == '[') {
cont++; cont++;
save_and_next(LS, l); save_and_next(ls);
} }
continue; continue;
case ']': case ']':
save_and_next(LS, l); save_and_next(ls);
if (LS->current == ']') { if (ls->current == ']') {
if (cont == 0) goto endloop; if (cont == 0) goto endloop;
cont--; cont--;
save_and_next(LS, l); save_and_next(ls);
} }
continue; continue;
case '\n': case '\n':
case '\r': case '\r':
save(LS, '\n', l); save(ls, '\n');
inclinenumber(LS); inclinenumber(ls);
if (!seminfo) l = 0; /* reset buffer to avoid wasting space */ if (!seminfo) luaZ_resetbuffer(ls->buff); /* avoid wasting space */
continue; continue;
default: default:
save_and_next(LS, l); if (seminfo) save_and_next(ls);
else next(ls);
} }
} endloop: } endloop:
save_and_next(LS, l); /* skip the second `]' */ save_and_next(ls); /* skip the second `]' */
save(LS, '\0', l);
if (seminfo) if (seminfo)
seminfo->ts = luaX_newstring(LS, luaZ_buffer(LS->buff) + 2, l - 5); seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 2,
luaZ_bufflen(ls->buff) - 4);
} }
static void read_string (LexState *LS, int del, SemInfo *seminfo) { static void read_string (LexState *ls, int del, SemInfo *seminfo) {
size_t l = 0; save_and_next(ls);
checkbuffer(LS, l); while (ls->current != del) {
save_and_next(LS, l); switch (ls->current) {
while (LS->current != del) {
checkbuffer(LS, l);
switch (LS->current) {
case EOZ: case EOZ:
save(LS, '\0', l); luaX_lexerror(ls, "unfinished string", TK_EOS);
luaX_lexerror(LS, "unfinished string", TK_EOS); continue; /* to avoid warnings */
break; /* to avoid warnings */
case '\n': case '\n':
case '\r': case '\r':
save(LS, '\0', l); luaX_lexerror(ls, "unfinished string", TK_STRING);
luaX_lexerror(LS, "unfinished string", TK_STRING); continue; /* to avoid warnings */
break; /* to avoid warnings */ case '\\': {
case '\\': int c;
next(LS); /* do not save the `\' */ next(ls); /* do not save the `\' */
switch (LS->current) { switch (ls->current) {
case 'a': save(LS, '\a', l); next(LS); break; case 'a': c = '\a'; break;
case 'b': save(LS, '\b', l); next(LS); break; case 'b': c = '\b'; break;
case 'f': save(LS, '\f', l); next(LS); break; case 'f': c = '\f'; break;
case 'n': save(LS, '\n', l); next(LS); break; case 'n': c = '\n'; break;
case 'r': save(LS, '\r', l); next(LS); break; case 'r': c = '\r'; break;
case 't': save(LS, '\t', l); next(LS); break; case 't': c = '\t'; break;
case 'v': save(LS, '\v', l); next(LS); break; case 'v': c = '\v'; break;
case '\n': /* go through */ case '\n': /* go through */
case '\r': save(LS, '\n', l); inclinenumber(LS); break; case '\r': save(ls, '\n'); inclinenumber(ls); continue;
case EOZ: break; /* will raise an error next loop */ case EOZ: continue; /* will raise an error next loop */
default: { default: {
if (!isdigit(LS->current)) if (!isdigit(ls->current))
save_and_next(LS, l); /* handles \\, \", \', and \? */ save_and_next(ls); /* handles \\, \", \', and \? */
else { /* \xxx */ else { /* \xxx */
int c = 0;
int i = 0; int i = 0;
c = 0;
do { do {
c = 10*c + (LS->current-'0'); c = 10*c + (ls->current-'0');
next(LS); next(ls);
} while (++i<3 && isdigit(LS->current)); } while (++i<3 && isdigit(ls->current));
if (c > UCHAR_MAX) { if (c > UCHAR_MAX)
save(LS, '\0', l); luaX_lexerror(ls, "escape sequence too large", TK_STRING);
luaX_lexerror(LS, "escape sequence too large", TK_STRING); save(ls, c);
}
save(LS, c, l);
} }
continue;
} }
} }
break; save(ls, c);
next(ls);
continue;
}
default: default:
save_and_next(LS, l); save_and_next(ls);
} }
} }
save_and_next(LS, l); /* skip delimiter */ save_and_next(ls); /* skip delimiter */
save(LS, '\0', l); seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
seminfo->ts = luaX_newstring(LS, luaZ_buffer(LS->buff) + 1, l - 3); luaZ_bufflen(ls->buff) - 2);
} }
int luaX_lex (LexState *LS, SemInfo *seminfo) { int luaX_lex (LexState *ls, SemInfo *seminfo) {
luaZ_resetbuffer(ls->buff);
for (;;) { for (;;) {
switch (LS->current) { switch (ls->current) {
case '\n': case '\n':
case '\r': { case '\r': {
inclinenumber(LS); inclinenumber(ls);
continue; continue;
} }
case '-': { case '-': {
next(LS); next(ls);
if (LS->current != '-') return '-'; if (ls->current != '-') return '-';
/* else is a comment */ /* else is a comment */
next(LS); next(ls);
if (LS->current == '[' && (next(LS), LS->current == '[')) if (ls->current == '[' && (next(ls), ls->current == '[')) {
read_long_string(LS, NULL); /* long comment */ read_long_string(ls, NULL); /* long comment */
luaZ_resetbuffer(ls->buff);
}
else /* short comment */ else /* short comment */
while (!nextIsNewline(LS) && LS->current != EOZ) while (!currIsNewline(ls) && ls->current != EOZ)
next(LS); next(ls);
continue; continue;
} }
case '[': { case '[': {
next(LS); save_and_next(ls);
if (LS->current != '[') return '['; if (ls->current != '[') return '[';
else { else {
read_long_string(LS, seminfo); read_long_string(ls, seminfo);
return TK_STRING; return TK_STRING;
} }
} }
case '=': { case '=': {
next(LS); next(ls);
if (LS->current != '=') return '='; if (ls->current != '=') return '=';
else { next(LS); return TK_EQ; } else { next(ls); return TK_EQ; }
} }
case '<': { case '<': {
next(LS); next(ls);
if (LS->current != '=') return '<'; if (ls->current != '=') return '<';
else { next(LS); return TK_LE; } else { next(ls); return TK_LE; }
} }
case '>': { case '>': {
next(LS); next(ls);
if (LS->current != '=') return '>'; if (ls->current != '=') return '>';
else { next(LS); return TK_GE; } else { next(ls); return TK_GE; }
} }
case '~': { case '~': {
next(LS); next(ls);
if (LS->current != '=') return '~'; if (ls->current != '=') return '~';
else { next(LS); return TK_NE; } else { next(ls); return TK_NE; }
} }
case '"': case '"':
case '\'': { case '\'': {
read_string(LS, LS->current, seminfo); read_string(ls, ls->current, seminfo);
return TK_STRING; return TK_STRING;
} }
case '.': { case '.': {
next(LS); save_and_next(ls);
if (LS->current == '.') { if (ls->current == '.') {
next(LS); next(ls);
if (LS->current == '.') { if (ls->current == '.') {
next(LS); next(ls);
return TK_DOTS; /* ... */ return TK_DOTS; /* ... */
} }
else return TK_CONCAT; /* .. */ else return TK_CONCAT; /* .. */
} }
else if (!isdigit(LS->current)) return '.'; else if (!isdigit(ls->current)) return '.';
else { else {
read_numeral(LS, 1, seminfo); read_numeral(ls, seminfo);
return TK_NUMBER; return TK_NUMBER;
} }
} }
@ -399,30 +372,34 @@ int luaX_lex (LexState *LS, SemInfo *seminfo) {
return TK_EOS; return TK_EOS;
} }
default: { default: {
if (isspace(LS->current)) { if (isspace(ls->current)) {
lua_assert(!nextIsNewline(LS)); lua_assert(!currIsNewline(ls));
next(LS); next(ls);
continue; continue;
} }
else if (isdigit(LS->current)) { else if (isdigit(ls->current)) {
read_numeral(LS, 0, seminfo); read_numeral(ls, seminfo);
return TK_NUMBER; return TK_NUMBER;
} }
else if (isalpha(LS->current) || LS->current == '_') { else if (isalpha(ls->current) || ls->current == '_') {
/* identifier or reserved word */ /* identifier or reserved word */
size_t l = readname(LS); TString *ts;
TString *ts = luaX_newstring(LS, luaZ_buffer(LS->buff), l); do {
save_and_next(ls);
} while (isalnum(ls->current) || ls->current == '_');
ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
luaZ_bufflen(ls->buff));
if (ts->tsv.reserved > 0) /* reserved word? */ if (ts->tsv.reserved > 0) /* reserved word? */
return ts->tsv.reserved - 1 + FIRST_RESERVED; return ts->tsv.reserved - 1 + FIRST_RESERVED;
seminfo->ts = ts; seminfo->ts = ts;
return TK_NAME; return TK_NAME;
} }
else { else {
int c = LS->current; int c = ls->current;
if (iscntrl(c)) if (iscntrl(c))
luaX_error(LS, "invalid control char", luaX_error(ls, "invalid control char",
luaO_pushfstring(LS->L, "char(%d)", c)); luaO_pushfstring(ls->L, "char(%d)", c));
next(LS); next(ls);
return c; /* single-char tokens (+ - / ...) */ return c; /* single-char tokens (+ - / ...) */
} }
} }

18
lzio.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lzio.h,v 1.16 2003/08/25 19:51:54 roberto Exp roberto $ ** $Id: lzio.h,v 1.17 2003/08/25 20:00:50 roberto Exp roberto $
** Buffered streams ** Buffered streams
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -10,6 +10,8 @@
#include "lua.h" #include "lua.h"
#include "lmem.h"
#define EOZ (-1) /* end of stream */ #define EOZ (-1) /* end of stream */
@ -28,7 +30,8 @@ int luaZ_lookahead (ZIO *z);
typedef struct Mbuffer { typedef struct Mbuffer {
char *buffer; char *buffer;
size_t buffsize; int n;
int buffsize;
} Mbuffer; } Mbuffer;
@ -36,8 +39,12 @@ char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0) #define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
#define luaZ_sizebuffer(buff) ((buff)->buffsize)
#define luaZ_buffer(buff) ((buff)->buffer) #define luaZ_buffer(buff) ((buff)->buffer)
#define luaZ_sizebuffer(buff) ((buff)->buffsize)
#define luaZ_bufflen(buff) ((buff)->n)
#define luaZ_resetbuffer(buff) ((buff)->n = 0)
#define luaZ_resizebuffer(L, buff, size) \ #define luaZ_resizebuffer(L, buff, size) \
(luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \ (luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
@ -45,6 +52,11 @@ char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
#define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0) #define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0)
#define luaZ_save(L,b,c) { \
luaM_growvector(L, b->buffer, b->n, b->buffsize, char, \
MAX_INT, "token too long"); \
b->buffer[b->n++] = cast(char, c); }
/* --------- Private Part ------------------ */ /* --------- Private Part ------------------ */