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 @@
11 /*
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 $
33 ** Lua - A Scripting Language
44 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
55 ** See Copyright Notice at the end of this file
@@ -19,11 +19,11 @@ · 13 unmodified lines
1919 #define LUA_VERSION_MAJOR "5"
2020 #define LUA_VERSION_MINOR "3"
2121 #define LUA_VERSION_NUM 503
22−#define LUA_VERSION_RELEASE "0 (work1)"
22+#define LUA_VERSION_RELEASE "0 (work2)"
2323
2424 #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
2525 #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"
2727 #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
2828
2929
@@ -182,14 +182,20 @@ LUA_API const void *(lua_topointer) (lua_State *L, int idx); · 152 unmodified lines
182182 ** Comparison and arithmetic functions
183183 */
184184
185−#define LUA_OPADD 0 /* ORDER TM */
185+#define LUA_OPADD 0 /* ORDER TM, ORDER OP */
186186 #define LUA_OPSUB 1
187187 #define LUA_OPMUL 2
188−#define LUA_OPDIV 3
189−#define LUA_OPIDIV 4
190−#define LUA_OPMOD 5
191−#define LUA_OPPOW 6
192−#define LUA_OPUNM 7
188+#define LUA_OPMOD 3
189+#define LUA_OPPOW 4
190+#define LUA_OPDIV 5
191+#define LUA_OPIDIV 6
192+#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
193199
194200 LUA_API void (lua_arith) (lua_State *L, int op);
195201
@@ -222,12 +228,13 @@ LUA_API int (lua_pushthread) (lua_State *L); · 26 unmodified lines
222228 /*
223229 ** get functions (Lua -> stack)
224230 */
225−LUA_API void (lua_getglobal) (lua_State *L, const char *var);
226−LUA_API void (lua_gettable) (lua_State *L, int idx);
227−LUA_API void (lua_getfield) (lua_State *L, int idx, const char *k);
228−LUA_API void (lua_rawget) (lua_State *L, int idx);
229−LUA_API void (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
230−LUA_API void (lua_rawgetp) (lua_State *L, int idx, const void *p);
231+LUA_API int (lua_getglobal) (lua_State *L, const char *var);
232+LUA_API int (lua_gettable) (lua_State *L, int idx);
233+LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
234+LUA_API int (lua_rawget) (lua_State *L, int idx);
235+LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
236+LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
237+
231238 LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec);
232239 LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
233240 LUA_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
264271 const char *chunkname,
265272 const char *mode);
266273
267−LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
274+LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
268275
269276
270277 /*
@@ -288,10 +295,7 @@ LUA_API int (lua_status) (lua_State *L); · 17 unmodified lines
288295 #define LUA_GCSTEP 5
289296 #define LUA_GCSETPAUSE 6
290297 #define LUA_GCSETSTEPMUL 7
291−#define LUA_GCSETMAJORINC 8
292298 #define LUA_GCISRUNNING 9
293−#define LUA_GCGEN 10
294−#define LUA_GCINC 11
295299
296300 LUA_API int (lua_gc) (lua_State *L, int what, int data);
297301
@@ -394,7 +398,7 @@ LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n); · 96 unmodified lines
394398 LUA_API void (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
395399 int fidx2, int n2);
396400
397−LUA_API int (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
401+LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
398402 LUA_API lua_Hook (lua_gethook) (lua_State *L);
399403 LUA_API int (lua_gethookmask) (lua_State *L);
400404 LUA_API int (lua_gethookcount) (lua_State *L);
@@ -422,7 +426,7 @@ struct lua_Debug { · 21 unmodified lines
422426
423427
424428 /******************************************************************************
425−* Copyright (C) 1994-2013 Lua.org, PUC-Rio.
429+* Copyright (C) 1994-2014 Lua.org, PUC-Rio.
426430 *
427431 * Permission is hereby granted, free of charge, to any person obtaining
428432 * a copy of this software and associated documentation files (the