diff --git a/src/deps/lua-5.3.4/CMakeLists.txt b/src/deps/lua-5.3.4/CMakeLists.txt deleted file mode 100644 index b5e98a0..0000000 --- a/src/deps/lua-5.3.4/CMakeLists.txt +++ /dev/null @@ -1,80 +0,0 @@ -cmake_minimum_required (VERSION 2.6) - -project (lua) - -if(WIN32) - add_definitions( -D_CRT_SECURE_NO_WARNINGS ) -endif() - -# 1. src/lua static src/library -# how to rename src/library name? - -set(coresrc - src/lapi.c - src/lcode.c - src/lctype.c - src/ldebug.c - src/ldo.c - src/ldump.c - src/lfunc.c - src/lgc.c - src/llex.c - src/lmem.c - src/lobject.c - src/lopcodes.c - src/lparser.c - src/lstate.c - src/lstring.c - src/ltable.c - src/ltm.c - src/lundump.c - src/lvm.c - src/lzio.c - ) - -set(libsrc - src/lauxlib.c - src/lbaselib.c - src/lbitlib.c - src/lcorolib.c - src/ldblib.c - src/liolib.c - src/lmathlib.c - src/loslib.c - src/lstrlib.c - src/ltablib.c - src/lutf8lib.c - src/loadlib.c - src/linit.c - ) - -add_library (lualib STATIC - ${coresrc} - ${libsrc} - ) - - - - -if(UNIX) - target_link_libraries( lualib m ) -endif() - -#set_target_properties(lualib PROPERTIES -# OUTPUT_NAME "lua") # rename the src/library output name - -# 2. src/lua interpreter -#link_directories (${LUA_BINARY_DIR}) -#add_executable (lua src/lua.c) -#target_link_libraries (lua src/lualib) -#if(UNIX) -# target_link_libraries( src/lua m ) -#endif() - -# 3. src/lua compiler -#link_directories (${LUA_BINARY_DIR}) -#add_executable (luac src/luac.c) -#target_link_libraries (luac src/lualib) -#if(UNIX) -# -#endif() diff --git a/src/deps/lua-5.3.5/CMakeLists.txt b/src/deps/lua-5.3.5/CMakeLists.txt new file mode 100644 index 0000000..8a5e67a --- /dev/null +++ b/src/deps/lua-5.3.5/CMakeLists.txt @@ -0,0 +1,80 @@ +cmake_minimum_required (VERSION 2.6) + +project (lua) + +if(WIN32) + add_definitions( -D_CRT_SECURE_NO_WARNINGS ) +endif() + +# 1. src/lua static src/library +# how to rename src/library name? + +set(coresrc + src/lapi.c + src/lcode.c + src/lctype.c + src/ldebug.c + src/ldo.c + src/ldump.c + src/lfunc.c + src/lgc.c + src/llex.c + src/lmem.c + src/lobject.c + src/lopcodes.c + src/lparser.c + src/lstate.c + src/lstring.c + src/ltable.c + src/ltm.c + src/lundump.c + src/lvm.c + src/lzio.c + ) + +set(libsrc + src/lauxlib.c + src/lbaselib.c + src/lbitlib.c + src/lcorolib.c + src/ldblib.c + src/liolib.c + src/lmathlib.c + src/loslib.c + src/lstrlib.c + src/ltablib.c + src/lutf8lib.c + src/loadlib.c + src/linit.c + ) + +add_library (lualib STATIC + ${coresrc} + ${libsrc} + ) + + + + +if(UNIX) + target_link_libraries( lualib m ) +endif() + +#set_target_properties(lualib PROPERTIES +# OUTPUT_NAME "lua") # rename the src/library output name + +# 2. src/lua interpreter +#link_directories (${LUA_BINARY_DIR}) +#add_executable (lua src/lua.c) +#target_link_libraries (lua src/lualib) +#if(UNIX) +# target_link_libraries( src/lua m ) +#endif() + +# 3. src/lua compiler +#link_directories (${LUA_BINARY_DIR}) +#add_executable (luac src/luac.c) +#target_link_libraries (luac src/lualib) +#if(UNIX) +# +#endif() diff --git a/src/deps/lua-5.3.4/Makefile b/src/deps/lua-5.3.5/Makefile similarity index 100% rename from src/deps/lua-5.3.4/Makefile rename to src/deps/lua-5.3.5/Makefile diff --git a/src/deps/lua-5.3.4/README b/src/deps/lua-5.3.5/README similarity index 70% rename from src/deps/lua-5.3.4/README rename to src/deps/lua-5.3.5/README index 0b31908..ed424de 100644 --- a/src/deps/lua-5.3.4/README +++ b/src/deps/lua-5.3.5/README @@ -1,5 +1,5 @@ -This is Lua 5.3.4, released on 12 Jan 2017. +This is Lua 5.3.5, released on 26 Jun 2018. For installation instructions, license details, and further information about Lua, see doc/readme.html. diff --git a/src/deps/lua-5.3.4/doc/contents.html b/src/deps/lua-5.3.5/doc/contents.html similarity index 99% rename from src/deps/lua-5.3.4/doc/contents.html rename to src/deps/lua-5.3.5/doc/contents.html index 445556f..c4eb267 100644 --- a/src/deps/lua-5.3.4/doc/contents.html +++ b/src/deps/lua-5.3.5/doc/contents.html @@ -32,7 +32,7 @@ For a complete introduction to Lua programming, see the book

-Copyright © 2015–2017 Lua.org, PUC-Rio. +Copyright © 2015–2018 Lua.org, PUC-Rio. Freely available under the terms of the Lua license. @@ -609,10 +609,10 @@ Freely available under the terms of the

Last update: -Thu Dec 22 18:29:39 BRST 2016 +Mon Jun 18 22:56:06 -03 2018

diff --git a/src/deps/lua-5.3.4/doc/index.css b/src/deps/lua-5.3.5/doc/index.css similarity index 100% rename from src/deps/lua-5.3.4/doc/index.css rename to src/deps/lua-5.3.5/doc/index.css diff --git a/src/deps/lua-5.3.4/doc/logo.gif b/src/deps/lua-5.3.5/doc/logo.gif similarity index 100% rename from src/deps/lua-5.3.4/doc/logo.gif rename to src/deps/lua-5.3.5/doc/logo.gif diff --git a/src/deps/lua-5.3.4/doc/lua.1 b/src/deps/lua-5.3.5/doc/lua.1 similarity index 100% rename from src/deps/lua-5.3.4/doc/lua.1 rename to src/deps/lua-5.3.5/doc/lua.1 diff --git a/src/deps/lua-5.3.4/doc/lua.css b/src/deps/lua-5.3.5/doc/lua.css similarity index 94% rename from src/deps/lua-5.3.4/doc/lua.css rename to src/deps/lua-5.3.5/doc/lua.css index 5bedf7e..cbd0799 100644 --- a/src/deps/lua-5.3.4/doc/lua.css +++ b/src/deps/lua-5.3.5/doc/lua.css @@ -10,7 +10,7 @@ body { line-height: 1.25 ; margin: 16px auto ; padding: 32px ; - border: solid #a0a0a0 1px ; + border: solid #ccc 1px ; border-radius: 20px ; max-width: 70em ; width: 90% ; @@ -111,36 +111,29 @@ pre.session { border-radius: 8px ; } -td.gutter { - width: 4% ; -} - -table.columns { +table { border: none ; border-spacing: 0 ; border-collapse: collapse ; } +td { + padding: 0 ; + margin: 0 ; +} + +td.gutter { + width: 4% ; +} + table.columns td { vertical-align: top ; - padding: 0 ; padding-bottom: 1em ; text-align: justify ; line-height: 1.25 ; } -p.logos a:link:hover, p.logos a:visited:hover { - background-color: inherit ; -} - -table.book { - border: none ; - border-spacing: 0 ; - border-collapse: collapse ; -} - table.book td { - padding: 0 ; vertical-align: top ; } @@ -159,6 +152,10 @@ table.book span { margin-top: 0.25em ; } +p.logos a:link:hover, p.logos a:visited:hover { + background-color: inherit ; +} + img { background-color: white ; } diff --git a/src/deps/lua-5.3.4/doc/luac.1 b/src/deps/lua-5.3.5/doc/luac.1 similarity index 100% rename from src/deps/lua-5.3.4/doc/luac.1 rename to src/deps/lua-5.3.5/doc/luac.1 diff --git a/src/deps/lua-5.3.4/doc/manual.css b/src/deps/lua-5.3.5/doc/manual.css similarity index 100% rename from src/deps/lua-5.3.4/doc/manual.css rename to src/deps/lua-5.3.5/doc/manual.css diff --git a/src/deps/lua-5.3.4/doc/manual.html b/src/deps/lua-5.3.5/doc/manual.html similarity index 99% rename from src/deps/lua-5.3.4/doc/manual.html rename to src/deps/lua-5.3.5/doc/manual.html index 3126b5d..89a642a 100644 --- a/src/deps/lua-5.3.4/doc/manual.html +++ b/src/deps/lua-5.3.5/doc/manual.html @@ -19,7 +19,7 @@ by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes

-Copyright © 2015–2017 Lua.org, PUC-Rio. +Copyright © 2015–2018 Lua.org, PUC-Rio. Freely available under the terms of the Lua license. @@ -35,7 +35,7 @@ Freely available under the terms of the

- + @@ -203,8 +203,8 @@ even those that do not support threads natively.

The type table implements associative arrays, -that is, arrays that can be indexed not only with numbers, -but with any Lua value except nil and NaN. +that is, arrays that can have as indices not only numbers, +but any Lua value except nil and NaN. (Not a Number is a special value used to represent undefined or unrepresentable numerical results, such as 0/0.) Tables can be heterogeneous; @@ -400,6 +400,8 @@ with the event name prefixed by two underscores; the corresponding values are called metamethods. In the previous example, the key is "__add" and the metamethod is the function that performs the addition. +Unless stated otherwise, +metamethods should be function values.

@@ -597,7 +599,7 @@ it is also slower than a real __le metamethod.)

  • __index: -The indexing access table[key]. +The indexing access operation table[key]. This event happens when table is not a table or when key is not present in table. The metamethod is looked up in table. @@ -1276,13 +1278,8 @@ Square brackets are used to index a table: 
     	var ::= prefixexp ‘[’ exp ‘]’

    -The meaning of accesses to table fields can be changed via metatables. -An access to an indexed variable t[i] is equivalent to -a call gettable_event(t,i). -(See §2.4 for a complete description of the -gettable_event function. -This function is not defined or callable in Lua. -We use it here only for explanatory purposes.) +The meaning of accesses to table fields can be changed via metatables +(see §2.4).

    @@ -1476,23 +1473,18 @@ and cyclically permutes the values of x, y, and z. -

    -The meaning of assignments to global variables -and table fields can be changed via metatables. -An assignment to an indexed variable t[i] = val is equivalent to -settable_event(t,i,val). -(See §2.4 for a complete description of the -settable_event function. -This function is not defined or callable in Lua. -We use it here only for explanatory purposes.) - -

    An assignment to a global name x = val is equivalent to the assignment _ENV.x = val (see §2.2). +

    +The meaning of assignments to table fields and +global variables (which are actually table fields, too) +can be changed via metatables (see §2.4). + + @@ -1831,17 +1823,17 @@ Here are some examples: g(f(), x) -- f() is adjusted to 1 result g(x, f()) -- g gets x plus all results from f() a,b,c = f(), x -- f() is adjusted to 1 result (c gets nil) - a,b = ... -- a gets the first vararg parameter, b gets + a,b = ... -- a gets the first vararg argument, b gets -- the second (both a and b can get nil if there - -- is no corresponding vararg parameter) + -- is no corresponding vararg argument) a,b,c = x, f() -- f() is adjusted to 2 results a,b,c = f() -- f() is adjusted to 3 results return f() -- returns all results from f() - return ... -- returns all received vararg parameters + return ... -- returns all received vararg arguments return x,y,f() -- returns x, y, and all results from f() {f()} -- creates a list with all results from f() - {...} -- creates a list with all vararg parameters + {...} -- creates a list with all vararg arguments {f(), nil} -- f() is adjusted to 1 result @@ -2039,9 +2031,12 @@ two objects are considered equal only if they are the same object. Every time you create a new object (a table, userdata, or thread), this new object is different from any previously existing object. -Closures with the same reference are always equal. +A closure is always equal to itself. Closures with any detectable difference (different behavior, different definition) are always different. +Closures created at different times but with no detectable differences +may be classified as equal or not +(depending on internal caching details).

    @@ -2303,7 +2298,7 @@ If the value of prefixexp has type function, then this function is called with the given arguments. Otherwise, the prefixexp "call" metamethod is called, -having as first parameter the value of prefixexp, +having as first argument the value of prefixexp, followed by the original call arguments (see §2.4). @@ -2881,7 +2876,7 @@ it can do whatever it wants on that Lua state, as it should be already protected. However, when C code operates on other Lua states -(e.g., a Lua parameter to the function, +(e.g., a Lua argument to the function, a Lua state stored in the registry, or the result of lua_newthread), it should use them only in API calls that cannot raise errors. @@ -3370,7 +3365,7 @@ it is left unchanged. Destroys all objects in the given Lua state (calling the corresponding garbage-collection metamethods, if any) and frees all dynamic memory used by this state. -On several platforms, you may not need to call this function, +In several platforms, you may not need to call this function, because all resources are naturally released when the host program ends. On the other hand, long-running programs that create multiple states, such as daemons or web servers, @@ -5584,7 +5579,7 @@ given as argument to a hook (see lua_Hook).

    -To get information about a function you push it onto the stack +To get information about a function, you push it onto the stack and start the what string with the character '>'. (In that case, lua_getinfo pops the function from the top of the stack.) @@ -6462,7 +6457,7 @@ file-related functions in the standard library

    Pushes onto the stack the field e from the metatable -of the object at index obj and returns the type of pushed value. +of the object at index obj and returns the type of the pushed value. If the object does not have a metatable, or if the metatable does not have this field, pushes nothing and returns LUA_TNIL. @@ -6749,7 +6744,7 @@ In words, if the argument arg is nil or absent, the macro results in the default dflt. Otherwise, it results in the result of calling func with the state L and the argument index arg as -parameters. +arguments. Note that it evaluates the expression dflt only if needed. @@ -8680,7 +8675,7 @@ the lowercase letters plus the '-' character.

    You can put a closing square bracket in a set by positioning it as the first character in the set. -You can put an hyphen in a set +You can put a hyphen in a set by positioning it as the first or the last character in the set. (You can also use an escape for both cases.) @@ -9082,8 +9077,8 @@ Returns the destination table a2.

    -Returns a new table with all parameters stored into keys 1, 2, etc. -and with a field "n" with the total number of parameters. +Returns a new table with all arguments stored into keys 1, 2, etc. +and with a field "n" with the total number of arguments. Note that the resulting table may not be a sequence. @@ -9215,7 +9210,7 @@ Returns the arc sine of x (in radians).

    Returns the arc tangent of y/x (in radians), -but uses the signs of both parameters to find the +but uses the signs of both arguments to find the quadrant of the result. (It also handles correctly the case of x being zero.) @@ -9516,7 +9511,7 @@ all I/O functions return nil on failure (plus an error message as a second result and a system-dependent error code as a third result) and some value different from nil on success. -On non-POSIX systems, +In non-POSIX systems, the computation of the error message and error code in case of errors may be not thread safe, @@ -9553,7 +9548,7 @@ When called with a file name, it opens the named file (in text mode), and sets its handle as the default input file. When called with a file handle, it simply sets this file handle as the default input file. -When called without parameters, +When called without arguments, it returns the current default input file. @@ -9580,7 +9575,7 @@ it returns no values (to finish the loop) and automatically closes the file. The call io.lines() (with no file name) is equivalent to io.input():lines("*l"); that is, it iterates over the lines of the default input file. -In this case it does not close the file when the loop ends. +In this case, the iterator does not close the file when the loop ends.

    @@ -9963,7 +9958,7 @@ the host system and on the current locale.

    -On non-POSIX systems, +In non-POSIX systems, this function may be not thread safe because of its reliance on C function gmtime and C function localtime. @@ -10163,7 +10158,7 @@ and explicitly removed when no longer needed.

    -On POSIX systems, +In POSIX systems, this function also creates a file with that name, to avoid security risks. (Someone else might create the file with wrong permissions @@ -10301,8 +10296,8 @@ The first parameter or local variable has index 1, and so on, following the order that they are declared in the code, counting only the variables that are active in the current scope of the function. -Negative indices refer to vararg parameters; --1 is the first vararg parameter. +Negative indices refer to vararg arguments; +-1 is the first vararg argument. The function returns nil if there is no variable with the given index, and raises an error when called with a level out of range. (You can call debug.getinfo to check whether the level is valid.) @@ -10400,7 +10395,7 @@ When called without arguments,

    -When the hook is called, its first parameter is a string +When the hook is called, its first argument is a string describing the event that has triggered its call: "call" (or "tail call"), "return", @@ -10551,7 +10546,8 @@ The options are: