Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src Pull up following revision(s) (requested by salazar in ti...



details:   https://anonhg.NetBSD.org/src/rev/df16c953fdb7
branches:  netbsd-7
changeset: 799926:df16c953fdb7
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Jul 01 06:35:02 2016 +0000

description:
Pull up following revision(s) (requested by salazar in ticket #1173):
        doc/3RDPARTY: 1.1277, 1.331 via patch
        external/mit/lua/Makefile: up to 1.4
        external/mit/lua/dist/Makefile: up to 1.5
        external/mit/lua/dist/README: up to 1.5
        external/mit/lua/dist/doc/index.css: up to 1.1.1.1
        external/mit/lua/dist/doc/lua.css: up to 1.5
        external/mit/lua/dist/doc/luac.1: up to 1.3
        external/mit/lua/dist/doc/manual.html: up to 1.5
        external/mit/lua/dist/src/lapi.c: up to 1.6
        external/mit/lua/dist/src/lauxlib.c: up to 1.6
        external/mit/lua/dist/src/lauxlib.h: up to 1.4
        external/mit/lua/dist/src/lbaselib.c: up to 1.6
        external/mit/lua/dist/src/lbitlib.c: up to 1.3
        external/mit/lua/dist/src/lcode.c: up to 1.5
        external/mit/lua/dist/src/lcode.h: up to 1.4
        external/mit/lua/dist/src/lcorolib.c: up to 1.3
        external/mit/lua/dist/src/lctype.c: up to 1.3
        external/mit/lua/dist/src/lctype.h: up to 1.3
        external/mit/lua/dist/src/ldblib.c: up to 1.7
        external/mit/lua/dist/src/ldebug.c: up to 1.6
        external/mit/lua/dist/src/ldo.c: up to 1.5
        external/mit/lua/dist/src/ldo.h: up to 1.5
        external/mit/lua/dist/src/ldump.c: up to 1.5
        external/mit/lua/dist/src/lfunc.c: up to 1.4
        external/mit/lua/dist/src/lgc.c: up to 1.5
        external/mit/lua/dist/src/lgc.h: up to 1.4
        external/mit/lua/dist/src/linit.c: up to 1.5
        external/mit/lua/dist/src/liolib.c: up to 1.5
        external/mit/lua/dist/src/llex.c: up to 1.7
        external/mit/lua/dist/src/llex.h: up to 1.4
        external/mit/lua/dist/src/llimits.h: up to 1.6
        external/mit/lua/dist/src/lmathlib.c: up to 1.5
        external/mit/lua/dist/src/lmem.c: up to 1.5
        external/mit/lua/dist/src/lmem.h: up to 1.4
        external/mit/lua/dist/src/loadlib.c: up to 1.5
        external/mit/lua/dist/src/lobject.c: up to 1.8
        external/mit/lua/dist/src/lobject.h: up to 1.6
        external/mit/lua/dist/src/lopcodes.c: up to 1.4
        external/mit/lua/dist/src/lopcodes.h: up to 1.4
        external/mit/lua/dist/src/loslib.c: up to 1.5
        external/mit/lua/dist/src/lparser.c: up to 1.5
        external/mit/lua/dist/src/lparser.h: up to 1.4
        external/mit/lua/dist/src/lprefix.h: up to 1.3
        external/mit/lua/dist/src/lstate.c: up to 1.5
        external/mit/lua/dist/src/lstate.h: up to 1.5
        external/mit/lua/dist/src/lstring.c: up to 1.5
        external/mit/lua/dist/src/lstring.h: up to 1.5
        external/mit/lua/dist/src/lstrlib.c: up to 1.12
        external/mit/lua/dist/src/ltable.c: up to 1.6
        external/mit/lua/dist/src/ltable.h: up to 1.4
        external/mit/lua/dist/src/ltablib.c: up to 1.5
        external/mit/lua/dist/src/ltm.c: up to 1.5
        external/mit/lua/dist/src/ltm.h: up to 1.4
        external/mit/lua/dist/src/lua.c: up to 1.5
        external/mit/lua/dist/src/lua.h: up to 1.6
        external/mit/lua/dist/src/luac.c: up to 1.6
        external/mit/lua/dist/src/luaconf.h: up to 1.16
        external/mit/lua/dist/src/lualib.h: up to 1.3
        external/mit/lua/dist/src/lundump.c: up to 1.4
        external/mit/lua/dist/src/lundump.h: up to 1.3
        external/mit/lua/dist/src/lutf8lib.c: up to 1.4
        external/mit/lua/dist/src/lvm.c: up to 1.10
        external/mit/lua/dist/src/lvm.h: up to 1.6
        external/mit/lua/dist/src/lzio.c: up to 1.4
        external/mit/lua/dist/src/lzio.h: up to 1.4
        external/mit/lua/lib/liblua/Makefile: up to 1.8
Update Lua to 5.3.2.

diffstat:

 doc/3RDPARTY                          |    6 +-
 external/mit/lua/Makefile             |    4 +-
 external/mit/lua/dist/Makefile        |    2 +-
 external/mit/lua/dist/README          |    2 +-
 external/mit/lua/dist/doc/index.css   |   21 +
 external/mit/lua/dist/doc/lua.css     |   26 ++
 external/mit/lua/dist/doc/luac.1      |    6 +-
 external/mit/lua/dist/doc/manual.html |  156 ++++++++-----
 external/mit/lua/dist/src/lapi.c      |  155 ++++++++-----
 external/mit/lua/dist/src/lauxlib.c   |  104 ++++++--
 external/mit/lua/dist/src/lauxlib.h   |   20 +-
 external/mit/lua/dist/src/lbaselib.c  |   53 +---
 external/mit/lua/dist/src/lbitlib.c   |   53 ++--
 external/mit/lua/dist/src/lcode.c     |   40 +-
 external/mit/lua/dist/src/lcode.h     |    4 +-
 external/mit/lua/dist/src/lcorolib.c  |    4 +-
 external/mit/lua/dist/src/lctype.c    |    4 +-
 external/mit/lua/dist/src/lctype.h    |    4 +-
 external/mit/lua/dist/src/ldblib.c    |   14 +-
 external/mit/lua/dist/src/ldebug.c    |   14 +-
 external/mit/lua/dist/src/ldo.c       |  198 ++++++++++++-----
 external/mit/lua/dist/src/ldo.h       |   28 +-
 external/mit/lua/dist/src/ldump.c     |   10 +-
 external/mit/lua/dist/src/lfunc.c     |    4 +-
 external/mit/lua/dist/src/lgc.c       |   32 +-
 external/mit/lua/dist/src/lgc.h       |   43 ++-
 external/mit/lua/dist/src/linit.c     |   10 +-
 external/mit/lua/dist/src/liolib.c    |   33 ++-
 external/mit/lua/dist/src/llex.c      |   25 +-
 external/mit/lua/dist/src/llex.h      |    4 +-
 external/mit/lua/dist/src/llimits.h   |   44 ++-
 external/mit/lua/dist/src/lmathlib.c  |    8 +-
 external/mit/lua/dist/src/lmem.c      |    4 +-
 external/mit/lua/dist/src/lmem.h      |    4 +-
 external/mit/lua/dist/src/loadlib.c   |    6 +-
 external/mit/lua/dist/src/lobject.c   |   56 ++--
 external/mit/lua/dist/src/lobject.h   |  100 ++++----
 external/mit/lua/dist/src/lopcodes.c  |    8 +-
 external/mit/lua/dist/src/lopcodes.h  |    4 +-
 external/mit/lua/dist/src/loslib.c    |   74 ++++--
 external/mit/lua/dist/src/lparser.c   |   27 +-
 external/mit/lua/dist/src/lparser.h   |    6 +-
 external/mit/lua/dist/src/lprefix.h   |    4 +-
 external/mit/lua/dist/src/lstate.c    |   33 +-
 external/mit/lua/dist/src/lstate.h    |   16 +-
 external/mit/lua/dist/src/lstring.c   |   80 ++++--
 external/mit/lua/dist/src/lstring.h   |    6 +-
 external/mit/lua/dist/src/lstrlib.c   |  207 +++++++++++-------
 external/mit/lua/dist/src/ltable.c    |   94 ++++---
 external/mit/lua/dist/src/ltable.h    |    9 +-
 external/mit/lua/dist/src/ltablib.c   |  376 +++++++++++++++++++++------------
 external/mit/lua/dist/src/ltm.c       |   27 +-
 external/mit/lua/dist/src/ltm.h       |    4 +-
 external/mit/lua/dist/src/lua.c       |   22 +-
 external/mit/lua/dist/src/lua.h       |   24 +-
 external/mit/lua/dist/src/luac.c      |    6 +-
 external/mit/lua/dist/src/luaconf.h   |   78 ++++--
 external/mit/lua/dist/src/lualib.h    |    4 +-
 external/mit/lua/dist/src/lundump.c   |   28 +-
 external/mit/lua/dist/src/lundump.h   |    7 +-
 external/mit/lua/dist/src/lutf8lib.c  |    4 +-
 external/mit/lua/dist/src/lvm.c       |  285 ++++++++++++++-----------
 external/mit/lua/dist/src/lvm.h       |   60 ++++-
 external/mit/lua/dist/src/lzio.c      |   16 +-
 external/mit/lua/dist/src/lzio.h      |    5 +-
 external/mit/lua/lib/liblua/Makefile  |    4 +-
 66 files changed, 1684 insertions(+), 1135 deletions(-)

diffs (truncated from 6791 to 300 lines):

diff -r 5e4b23266c2d -r df16c953fdb7 doc/3RDPARTY
--- a/doc/3RDPARTY      Wed Jun 22 08:31:49 2016 +0000
+++ b/doc/3RDPARTY      Fri Jul 01 06:35:02 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.1145.2.25 2016/05/18 09:14:14 snj Exp $
+#      $NetBSD: 3RDPARTY,v 1.1145.2.26 2016/07/01 06:35:02 snj Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -735,8 +735,8 @@
 into inetd. The provided libwrap2netbsd script handles just libwrap.
 
 Package:       Lua
-Version:       Lua 5.3.1
-Current Vers:  Lua 5.3.1
+Version:       Lua 5.3.2
+Current Vers:  Lua 5.3.2
 Maintainer:    PUC Rio
 Home Page:     http://www.lua.org/
 Mailing List:
diff -r 5e4b23266c2d -r df16c953fdb7 external/mit/lua/Makefile
--- a/external/mit/lua/Makefile Wed Jun 22 08:31:49 2016 +0000
+++ b/external/mit/lua/Makefile Fri Jul 01 06:35:02 2016 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.3 2010/10/31 11:26:01 mbalmer Exp $
+#      $NetBSD: Makefile,v 1.3.24.1 2016/07/01 06:35:02 snj Exp $
 
-SUBDIR+=       usr.bin
+SUBDIR+=       lib .WAIT usr.bin
 
 .include <bsd.subdir.mk>
diff -r 5e4b23266c2d -r df16c953fdb7 external/mit/lua/dist/Makefile
--- a/external/mit/lua/dist/Makefile    Wed Jun 22 08:31:49 2016 +0000
+++ b/external/mit/lua/dist/Makefile    Fri Jul 01 06:35:02 2016 +0000
@@ -46,7 +46,7 @@
 
 # Lua version and release.
 V= 5.3
-R= $V.1
+R= $V.2
 
 # Targets start here.
 all:   $(PLAT)
diff -r 5e4b23266c2d -r df16c953fdb7 external/mit/lua/dist/README
--- a/external/mit/lua/dist/README      Wed Jun 22 08:31:49 2016 +0000
+++ b/external/mit/lua/dist/README      Fri Jul 01 06:35:02 2016 +0000
@@ -1,5 +1,5 @@
 
-This is Lua 5.3.1, released on 10 Jun 2015.
+This is Lua 5.3.2, released on 25 Nov 2015.
 
 For installation instructions, license details, and
 further information about Lua, see doc/readme.html.
diff -r 5e4b23266c2d -r df16c953fdb7 external/mit/lua/dist/doc/index.css
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/lua/dist/doc/index.css       Fri Jul 01 06:35:02 2016 +0000
@@ -0,0 +1,21 @@
+ul {
+       list-style-type: none ;
+}
+
+ul.contents {
+       padding: 0 ;
+}
+
+table {
+       border: none ;
+       border-spacing: 0 ;
+       border-collapse: collapse ;
+}
+
+td {
+       vertical-align: top ;
+       padding: 0 ;
+       text-align: left ;
+       line-height: 1.25 ;
+       width: 15% ;
+}
diff -r 5e4b23266c2d -r df16c953fdb7 external/mit/lua/dist/doc/lua.css
--- a/external/mit/lua/dist/doc/lua.css Wed Jun 22 08:31:49 2016 +0000
+++ b/external/mit/lua/dist/doc/lua.css Fri Jul 01 06:35:02 2016 +0000
@@ -131,3 +131,29 @@
 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 ;
+}
+
+table.book td.cover {
+       padding-right: 1em ;
+}
+
+table.book img {
+       border: solid #000080 1px ;
+}
+
+table.book span {
+       font-size: small ;
+       text-align: left ;
+       display: block ;
+       margin-top: 0.25em ;
+}
diff -r 5e4b23266c2d -r df16c953fdb7 external/mit/lua/dist/doc/luac.1
--- a/external/mit/lua/dist/doc/luac.1  Wed Jun 22 08:31:49 2016 +0000
+++ b/external/mit/lua/dist/doc/luac.1  Fri Jul 01 06:35:02 2016 +0000
@@ -1,7 +1,7 @@
-.\"    $NetBSD: luac.1,v 1.2 2014/07/19 18:38:33 lneto Exp $
+.\"    $NetBSD: luac.1,v 1.2.2.1 2016/07/01 06:35:02 snj Exp $
 .\"
-.\" $Id: luac.1,v 1.2 2014/07/19 18:38:33 lneto Exp $
-.TH LUAC 1 "$Date: 2014/07/19 18:38:33 $"
+.\" Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp 
+.TH LUAC 1 "Date: 2011/11/16 13:53:40 "
 .SH NAME
 luac \- Lua compiler
 .SH SYNOPSIS
diff -r 5e4b23266c2d -r df16c953fdb7 external/mit/lua/dist/doc/manual.html
--- a/external/mit/lua/dist/doc/manual.html     Wed Jun 22 08:31:49 2016 +0000
+++ b/external/mit/lua/dist/doc/manual.html     Fri Jul 01 06:35:02 2016 +0000
@@ -35,7 +35,7 @@
 <!-- ====================================================================== -->
 <p>
 
-<!-- Id: manual.of,v 1.151 2015/06/10 21:08:57 roberto Exp  -->
+<!-- Id: manual.of,v 1.153 2015/11/25 16:57:42 roberto Exp  -->
 
 
 
@@ -398,7 +398,7 @@
 using the <a href="#pdf-setmetatable"><code>setmetatable</code></a> function.
 You cannot change the metatable of other types from Lua code
 (except by using the debug library (<a href="#6.10">&sect;6.10</a>));
-you must use the C&nbsp;API for that.
+you should use the C&nbsp;API for that.
 
 
 <p>
@@ -589,7 +589,7 @@
 the <code>&lt;=</code> (less equal) operation.
 
 Unlike other operations,
-The less-equal operation can use two different events.
+the less-equal operation can use two different events.
 First, Lua looks for the "<code>__le</code>" metamethod in both operands,
 like in the "lt" operation.
 If it cannot find such a metamethod,
@@ -1051,7 +1051,8 @@
 (also called <em>identifiers</em>)
 in Lua can be any string of letters,
 digits, and underscores,
-not beginning with a digit.
+not beginning with a digit and
+not being a reserved word.
 Identifiers are used to name variables, table fields, and labels.
 
 
@@ -2706,7 +2707,9 @@
 <code>lua_upvalueindex(1)</code>, and so on.
 Any access to <code>lua_upvalueindex(<em>n</em>)</code>,
 where <em>n</em> is greater than the number of upvalues of the
-current function (but not greater than 256),
+current function
+(but not greater than 256,
+which is one plus the maximum number of upvalues in a closure),
 produces an acceptable but invalid index.
 
 
@@ -2971,6 +2974,7 @@
 The third field, <code>x</code>,
 tells whether the function may raise errors:
 '<code>-</code>' means the function never raises any error;
+'<code>m</code>' means the function may raise memory errors;
 '<code>e</code>' means the function may raise errors;
 '<code>v</code>' means the function may raise an error on purpose.
 
@@ -3143,7 +3147,8 @@
 The number of results is adjusted to <code>nresults</code>,
 unless <code>nresults</code> is <a name="pdf-LUA_MULTRET"><code>LUA_MULTRET</code></a>.
 In this case, all results from the function are pushed.
-Lua takes care that the returned values fit into the stack space.
+Lua takes care that the returned values fit into the stack space,
+but it does not ensure any extra space in the stack.
 The function results are pushed onto the stack in direct order
 (the first result is pushed first),
 so that after the call the last result is on the top of the stack.
@@ -3253,14 +3258,15 @@
 <pre>int lua_checkstack (lua_State *L, int n);</pre>
 
 <p>
-Ensures that the stack has space for at least <code>n</code> extra slots.
+Ensures that the stack has space for at least <code>n</code> extra slots
+(that is, that you can safely push up to <code>n</code> values into it).
 It returns false if it cannot fulfill the request,
 either because it would cause the stack
 to be larger than a fixed maximum size
 (typically at least several thousand elements) or
 because it cannot allocate memory for the extra space.
 This function never shrinks the stack;
-if the stack is already larger than the new size,
+if the stack already has space for the extra slots,
 it is left unchanged.
 
 
@@ -3345,7 +3351,7 @@
 
 
 <hr><h3><a name="lua_createtable"><code>lua_createtable</code></a></h3><p>
-<span class="apii">[-0, +1, <em>e</em>]</span>
+<span class="apii">[-0, +1, <em>m</em>]</span>
 <pre>void lua_createtable (lua_State *L, int narr, int nrec);</pre>
 
 <p>
@@ -3355,7 +3361,7 @@
 parameter <code>nrec</code> is a hint for how many other elements
 the table will have.
 Lua may use these hints to preallocate memory for the new table.
-This pre-allocation is useful for performance when you know in advance
+This preallocation is useful for performance when you know in advance
 how many elements the table will have.
 Otherwise you can use the function <a href="#lua_newtable"><code>lua_newtable</code></a>.
 
@@ -3364,7 +3370,7 @@
 
 
 <hr><h3><a name="lua_dump"><code>lua_dump</code></a></h3><p>
-<span class="apii">[-0, +0, <em>e</em>]</span>
+<span class="apii">[-0, +0, &ndash;]</span>
 <pre>int lua_dump (lua_State *L,
                         lua_Writer writer,
                         void *data,
@@ -3978,7 +3984,7 @@
 
 
 <hr><h3><a name="lua_newtable"><code>lua_newtable</code></a></h3><p>
-<span class="apii">[-0, +1, <em>e</em>]</span>
+<span class="apii">[-0, +1, <em>m</em>]</span>
 <pre>void lua_newtable (lua_State *L);</pre>
 
 <p>
@@ -3990,7 +3996,7 @@
 
 
 <hr><h3><a name="lua_newthread"><code>lua_newthread</code></a></h3><p>
-<span class="apii">[-0, +1, <em>e</em>]</span>
+<span class="apii">[-0, +1, <em>m</em>]</span>
 <pre>lua_State *lua_newthread (lua_State *L);</pre>
 
 <p>
@@ -4011,7 +4017,7 @@
 
 
 <hr><h3><a name="lua_newuserdata"><code>lua_newuserdata</code></a></h3><p>
-<span class="apii">[-0, +1, <em>e</em>]</span>
+<span class="apii">[-0, +1, <em>m</em>]</span>
 <pre>void *lua_newuserdata (lua_State *L, size_t size);</pre>
 
 <p>
@@ -4221,7 +4227,7 @@
 
 
 <hr><h3><a name="lua_pushcclosure"><code>lua_pushcclosure</code></a></h3><p>
-<span class="apii">[-n, +1, <em>e</em>]</span>
+<span class="apii">[-n, +1, <em>m</em>]</span>
 <pre>void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);</pre>
 
 <p>
@@ -4278,7 +4284,7 @@
 
 
 <hr><h3><a name="lua_pushfstring"><code>lua_pushfstring</code></a></h3><p>
-<span class="apii">[-0, +1, <em>e</em>]</span>
+<span class="apii">[-0, +1, <em>m</em>]</span>
 <pre>const char *lua_pushfstring (lua_State *L, const char *fmt, ...);</pre>
 
 <p>
@@ -4358,7 +4364,7 @@
 
 
 <hr><h3><a name="lua_pushliteral"><code>lua_pushliteral</code></a></h3><p>
-<span class="apii">[-0, +1, <em>e</em>]</span>
+<span class="apii">[-0, +1, <em>m</em>]</span>
 <pre>const char *lua_pushliteral (lua_State *L, const char *s);</pre>
 
 <p>
@@ -4370,7 +4376,7 @@
 
 
 <hr><h3><a name="lua_pushlstring"><code>lua_pushlstring</code></a></h3><p>
-<span class="apii">[-0, +1, <em>e</em>]</span>
+<span class="apii">[-0, +1, <em>m</em>]</span>
 <pre>const char *lua_pushlstring (lua_State *L, const char *s, size_t len);</pre>



Home | Main Index | Thread Index | Old Index