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

`luaX_errorline' was used only in one place

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2003-10-20 10:24:34 -02:00
parent 9914e1bcdd
commit 8502331f69
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
llex.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 1.126 2003/10/03 16:05:34 roberto Exp roberto $ ** $Id: llex.c,v 1.127 2003/10/03 16:07:44 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -69,20 +69,6 @@ void luaX_checklimit (LexState *ls, int val, int limit, const char *msg) {
} }
void luaX_errorline (LexState *ls, const char *s, const char *token, int line) {
lua_State *L = ls->L;
char buff[MAXSRC];
luaO_chunkid(buff, getstr(ls->source), MAXSRC);
luaO_pushfstring(L, "%s:%d: %s near `%s'", buff, line, s, token);
luaD_throw(L, LUA_ERRSYNTAX);
}
static void luaX_error (LexState *ls, const char *s, const char *token) {
luaX_errorline(ls, s, token, ls->linenumber);
}
const char *luaX_token2str (LexState *ls, int token) { const char *luaX_token2str (LexState *ls, int token) {
if (token < FIRST_RESERVED) { if (token < FIRST_RESERVED) {
lua_assert(token == (unsigned char)token); lua_assert(token == (unsigned char)token);
@@ -108,7 +94,11 @@ static const char *txtToken (LexState *ls, int token) {
static void luaX_lexerror (LexState *ls, const char *msg, int token) { static void luaX_lexerror (LexState *ls, const char *msg, int token) {
luaX_error(ls, msg, txtToken(ls, token)); char buff[MAXSRC];
luaO_chunkid(buff, getstr(ls->source), MAXSRC);
luaO_pushfstring(ls->L, "%s:%d: %s near `%s'",
buff, ls->linenumber, msg, txtToken(ls, token));
luaD_throw(ls->L, LUA_ERRSYNTAX);
} }

3
llex.h
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: llex.h,v 1.47 2003/02/28 17:19:47 roberto Exp roberto $ ** $Id: llex.h,v 1.48 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
*/ */
@@ -69,7 +69,6 @@ TString *luaX_newstring (LexState *LS, const char *str, size_t l);
int luaX_lex (LexState *LS, SemInfo *seminfo); int luaX_lex (LexState *LS, SemInfo *seminfo);
void luaX_checklimit (LexState *ls, int val, int limit, const char *msg); void luaX_checklimit (LexState *ls, int val, int limit, const char *msg);
void luaX_syntaxerror (LexState *ls, const char *s); void luaX_syntaxerror (LexState *ls, const char *s);
void luaX_errorline (LexState *ls, const char *s, const char *token, int line);
const char *luaX_token2str (LexState *ls, int token); const char *luaX_token2str (LexState *ls, int token);