History

Lua 5.3.0-work2

Lua Team committed 12 years ago

Commit ad386d91 parent b83a40a60 files · +3280 −2672Browse files

Showing the changes to src/lua.h (1 of 60 files). Show all

Unified · Split

src/lua.h+25−21
@@ -1,5 +1,5 @@
1/*1/*
2** $Id: lua.h,v 1.292 2013/07/05 14:29:51 roberto Exp $2** $Id: lua.h,v 1.302 2014/03/20 19:42:35 roberto Exp $
3** Lua - A Scripting Language3** Lua - A Scripting Language
4** Lua.org, PUC-Rio, Brazil (http://www.lua.org)4** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
5** See Copyright Notice at the end of this file5** See Copyright Notice at the end of this file
@@ -19,11 +19,11 @@ · 13 unmodified lines
19#define LUA_VERSION_MAJOR "5"19#define LUA_VERSION_MAJOR "5"
20#define LUA_VERSION_MINOR "3"20#define LUA_VERSION_MINOR "3"
21#define LUA_VERSION_NUM 50321#define LUA_VERSION_NUM 503
22#define LUA_VERSION_RELEASE "0 (work1)"22#define LUA_VERSION_RELEASE "0 (work2)"
23 23
24#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR24#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
25#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE25#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
26#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2013 Lua.org, PUC-Rio"26#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2014 Lua.org, PUC-Rio"
27#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"27#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
28 28
29 29
@@ -182,14 +182,20 @@ LUA_API const void *(lua_topointer) (lua_State *L, int idx); · 152 unmodified lines
182** Comparison and arithmetic functions182** Comparison and arithmetic functions
183*/183*/
184 184
185#define LUA_OPADD 0 /* ORDER TM */185#define LUA_OPADD 0 /* ORDER TM, ORDER OP */
186#define LUA_OPSUB 1186#define LUA_OPSUB 1
187#define LUA_OPMUL 2187#define LUA_OPMUL 2
188#define LUA_OPDIV 3188#define LUA_OPMOD 3
189#define LUA_OPIDIV 4189#define LUA_OPPOW 4
190#define LUA_OPMOD 5190#define LUA_OPDIV 5
191#define LUA_OPPOW 6191#define LUA_OPIDIV 6
192#define LUA_OPUNM 7192#define LUA_OPBAND 7
193#define LUA_OPBOR 8
194#define LUA_OPBXOR 9
195#define LUA_OPSHL 10
196#define LUA_OPSHR 11
197#define LUA_OPUNM 12
198#define LUA_OPBNOT 13
193 199
194LUA_API void (lua_arith) (lua_State *L, int op);200LUA_API void (lua_arith) (lua_State *L, int op);
195 201
@@ -222,12 +228,13 @@ LUA_API int (lua_pushthread) (lua_State *L); · 26 unmodified lines
222/*228/*
223** get functions (Lua -> stack)229** get functions (Lua -> stack)
224*/230*/
225LUA_API void (lua_getglobal) (lua_State *L, const char *var);231LUA_API int (lua_getglobal) (lua_State *L, const char *var);
226LUA_API void (lua_gettable) (lua_State *L, int idx);232LUA_API int (lua_gettable) (lua_State *L, int idx);
227LUA_API void (lua_getfield) (lua_State *L, int idx, const char *k);233LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
228LUA_API void (lua_rawget) (lua_State *L, int idx);234LUA_API int (lua_rawget) (lua_State *L, int idx);
229LUA_API void (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);235LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
230LUA_API void (lua_rawgetp) (lua_State *L, int idx, const void *p);236LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
237
231LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec);238LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec);
232LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);239LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
233LUA_API int (lua_getmetatable) (lua_State *L, int objindex);240LUA_API int (lua_getmetatable) (lua_State *L, int objindex);
@@ -264,7 +271,7 @@ LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt, · 30 unmodified lines
264 const char *chunkname,271 const char *chunkname,
265 const char *mode);272 const char *mode);
266 273
267LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);274LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
268 275
269 276
270/*277/*
@@ -288,10 +295,7 @@ LUA_API int (lua_status) (lua_State *L); · 17 unmodified lines
288#define LUA_GCSTEP 5295#define LUA_GCSTEP 5
289#define LUA_GCSETPAUSE 6296#define LUA_GCSETPAUSE 6
290#define LUA_GCSETSTEPMUL 7297#define LUA_GCSETSTEPMUL 7
291#define LUA_GCSETMAJORINC 8
292#define LUA_GCISRUNNING 9298#define LUA_GCISRUNNING 9
293#define LUA_GCGEN 10
294#define LUA_GCINC 11
295 299
296LUA_API int (lua_gc) (lua_State *L, int what, int data);300LUA_API int (lua_gc) (lua_State *L, int what, int data);
297 301
@@ -394,7 +398,7 @@ LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n); · 96 unmodified lines
394LUA_API void (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,398LUA_API void (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
395 int fidx2, int n2);399 int fidx2, int n2);
396 400
397LUA_API int (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);401LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
398LUA_API lua_Hook (lua_gethook) (lua_State *L);402LUA_API lua_Hook (lua_gethook) (lua_State *L);
399LUA_API int (lua_gethookmask) (lua_State *L);403LUA_API int (lua_gethookmask) (lua_State *L);
400LUA_API int (lua_gethookcount) (lua_State *L);404LUA_API int (lua_gethookcount) (lua_State *L);
@@ -422,7 +426,7 @@ struct lua_Debug { · 21 unmodified lines
422 426
423 427
424/******************************************************************************428/******************************************************************************
425* Copyright (C) 1994-2013 Lua.org, PUC-Rio.429* Copyright (C) 1994-2014 Lua.org, PUC-Rio.
426*430*
427* Permission is hereby granted, free of charge, to any person obtaining431* Permission is hereby granted, free of charge, to any person obtaining
428* a copy of this software and associated documentation files (the432* a copy of this software and associated documentation files (the