mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-01-31 11:37:35 +00:00
0dbf01bf1d
This essentially re-does the work of #875 on top of master. This is what I did to check that Cosmo's Lua extensions still worked: ``` $ build/bootstrap/make MODE=aarch64 o/aarch64/third_party/lua/lua $ ape o/aarch64/third_party/lua/lua >: 10 10 >: 010 8 >: 0b10 2 >: string.byte("\e") 27 >: "Hello, %s" % {"world"} Hello, world >: "*" * 3 *** ``` `luaL_traceback2` was used to show the stack trace with parameter values; it's used in `LuaCallWithTrace`, which is used in Redbean to run Lua code. You should be able to see the extended stack trace by running something like this: `redbean -e "function a(b)c()end a(2)"` (with "params" indicating the extended stack trace): ``` stack traceback: [string "function a(b)c()end a(2)"]:1: in function 'a', params: b = 2; [string "function a(b)c()end a(2)"]:1: in main chunk ``` @pkulchenko confirmed that I get the expected result with the updated code. This is what I did to check that Lua itself still worked: ``` $ cd third_party/lua/test/ $ ape ../../../o/aarch64/third_party/lua/lua all.lua ``` There's one test failure, in `files.lua`: ``` ***** FILE 'files.lua'***** testing i/o ../../../o/aarch64/third_party/lua/lua: files.lua:84: assertion failed! stack traceback: [C]: in function 'assert' files.lua:84: in main chunk (...tail calls...) all.lua:195: in main chunk [C]: in ? .>>> closing state <<< ``` That isn't a result of these changes; the same test is failing in master. The failure is here: ```lua if not _port then -- invalid seek local status, msg, code = io.stdin:seek("set", 1000) assert(not status and type(msg) == "string" and type(code) == "number") end ``` The test expects a seek to offset 1,000 on stdin to fail — but it doesn't. `status` ends up being the new offset rather than `nil`. If I comment out that one test, the remaining tests succeed.
83 lines
2.3 KiB
C
83 lines
2.3 KiB
C
#ifndef llex_h
|
|
#define llex_h
|
|
|
|
#include "third_party/lua/lobject.h"
|
|
#include "third_party/lua/lzio.h"
|
|
|
|
|
|
/*
|
|
** Single-char tokens (terminal symbols) are represented by their own
|
|
** numeric code. Other tokens start at the following value.
|
|
*/
|
|
#define FIRST_RESERVED (UCHAR_MAX + 1)
|
|
|
|
|
|
#if !defined(LUA_ENV)
|
|
#define LUA_ENV "_ENV"
|
|
#endif
|
|
|
|
|
|
/*
|
|
* WARNING: if you change the order of this enumeration,
|
|
* grep "ORDER RESERVED"
|
|
*/
|
|
enum RESERVED {
|
|
/* terminal symbols denoted by reserved words */
|
|
TK_AND = FIRST_RESERVED, TK_BREAK,
|
|
TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
|
|
TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
|
|
TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
|
|
/* other terminal symbols */
|
|
TK_IDIV, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE,
|
|
TK_SHL, TK_SHR,
|
|
TK_DBCOLON, TK_EOS,
|
|
TK_FLT, TK_INT, TK_NAME, TK_STRING
|
|
};
|
|
|
|
/* number of reserved words */
|
|
#define NUM_RESERVED (cast_int(TK_WHILE-FIRST_RESERVED + 1))
|
|
|
|
|
|
typedef union {
|
|
lua_Number r;
|
|
lua_Integer i;
|
|
TString *ts;
|
|
} SemInfo; /* semantics information */
|
|
|
|
|
|
typedef struct Token {
|
|
int token;
|
|
SemInfo seminfo;
|
|
} Token;
|
|
|
|
|
|
/* state of the lexer plus state of the parser when shared by all
|
|
functions */
|
|
typedef struct LexState {
|
|
int current; /* current character (charint) */
|
|
int linenumber; /* input line counter */
|
|
int lastline; /* line of last token 'consumed' */
|
|
Token t; /* current token */
|
|
Token lookahead; /* look ahead token */
|
|
struct FuncState *fs; /* current function (parser) */
|
|
struct lua_State *L;
|
|
ZIO *z; /* input stream */
|
|
Mbuffer *buff; /* buffer for tokens */
|
|
Table *h; /* to avoid collection/reuse strings */
|
|
struct Dyndata *dyd; /* dynamic structures used by the parser */
|
|
TString *source; /* current source name */
|
|
TString *envn; /* environment variable name */
|
|
} LexState;
|
|
|
|
|
|
LUAI_FUNC void luaX_init (lua_State *L);
|
|
LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z,
|
|
TString *source, int firstchar);
|
|
LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l);
|
|
LUAI_FUNC void luaX_next (LexState *ls);
|
|
LUAI_FUNC int luaX_lookahead (LexState *ls);
|
|
LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s);
|
|
LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);
|
|
|
|
|
|
#endif
|