Source-Changes-HG archive

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

[src/netbsd-8]: src Pullup the following, requested by alnsn in ticket #970:



details:   https://anonhg.NetBSD.org/src/rev/b709e410a450
branches:  netbsd-8
changeset: 435192:b709e410a450
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Aug 11 14:54:49 2018 +0000

description:
Pullup the following, requested by alnsn in ticket #970:

        external/mit/lua/dist/README.import             up to 1.2
        external/mit/lua/dist/README                    up to 1.8
        external/mit/lua/dist/doc/contents.html         up to 1.7
        external/mit/lua/dist/doc/lua.css               up to 1.7
        external/mit/lua/dist/doc/manual.html           up to 1.8
        external/mit/lua/dist/doc/readme.html           up to 1.7
        external/mit/lua/dist/src/Makefile              up to 1.5
        external/mit/lua/dist/src/lapi.c                up to 1.11
        external/mit/lua/dist/src/lapi.h                up to 1.9
        external/mit/lua/dist/src/lauxlib.c             up to 1.11
        external/mit/lua/dist/src/lauxlib.h             up to 1.8
        external/mit/lua/dist/src/lbaselib.c            up to 1.10
        external/mit/lua/dist/src/lbitlib.c             up to 1.7
        external/mit/lua/dist/src/lcode.c               up to 1.11
        external/mit/lua/dist/src/lcode.h               up to 1.8
        external/mit/lua/dist/src/lcorolib.c            up to 1.7
        external/mit/lua/dist/src/lctype.c              up to 1.7
        external/mit/lua/dist/src/lctype.h              up to 1.7
        external/mit/lua/dist/src/ldblib.c              up to 1.11
        external/mit/lua/dist/src/ldebug.c              up to 1.11
        external/mit/lua/dist/src/ldebug.h              up to 1.9
        external/mit/lua/dist/src/ldo.c                 up to 1.9
        external/mit/lua/dist/src/ldo.h                 up to 1.9
        external/mit/lua/dist/src/ldump.c               up to 1.9
        external/mit/lua/dist/src/lfunc.c               up to 1.8
        external/mit/lua/dist/src/lfunc.h               up to 1.8
        external/mit/lua/dist/src/lgc.c                 up to 1.10
        external/mit/lua/dist/src/lgc.h                 up to 1.8
        external/mit/lua/dist/src/linit.c               up to 1.9
        external/mit/lua/dist/src/liolib.c              up to 1.9
        external/mit/lua/dist/src/llex.c                up to 1.12
        external/mit/lua/dist/src/llex.h                up to 1.8
        external/mit/lua/dist/src/llimits.h             up to 1.10
        external/mit/lua/dist/src/lmathlib.c            up to 1.9
        external/mit/lua/dist/src/lmem.c                up to 1.9
        external/mit/lua/dist/src/lmem.h                up to 1.8
        external/mit/lua/dist/src/loadlib.c             up to 1.9
        external/mit/lua/dist/src/lobject.c             up to 1.12
        external/mit/lua/dist/src/lobject.h             up to 1.10
        external/mit/lua/dist/src/lopcodes.c            up to 1.8
        external/mit/lua/dist/src/lopcodes.h            up to 1.8
        external/mit/lua/dist/src/loslib.c              up to 1.11
        external/mit/lua/dist/src/lparser.c             up to 1.11
        external/mit/lua/dist/src/lparser.h             up to 1.8
        external/mit/lua/dist/src/lprefix.h             up to 1.7
        external/mit/lua/dist/src/lstate.c              up to 1.9
        external/mit/lua/dist/src/lstate.h              up to 1.9
        external/mit/lua/dist/src/lstring.c             up to 1.9
        external/mit/lua/dist/src/lstring.h             up to 1.9
        external/mit/lua/dist/src/lstrlib.c             up to 1.18
        external/mit/lua/dist/src/ltable.c              up to 1.11
        external/mit/lua/dist/src/ltable.h              up to 1.8
        external/mit/lua/dist/src/ltablib.c             up to 1.9
        external/mit/lua/dist/src/ltm.c                 up to 1.9
        external/mit/lua/dist/src/ltm.h                 up to 1.8
        external/mit/lua/dist/src/lua.c                 up to 1.9
        external/mit/lua/dist/src/lua.h                 up to 1.11
        external/mit/lua/dist/src/luac.c                up to 1.10
        external/mit/lua/dist/src/luaconf.h             up to 1.23
        external/mit/lua/dist/src/lualib.h              up to 1.7
        external/mit/lua/dist/src/lundump.c             up to 1.8
        external/mit/lua/dist/src/lundump.h             up to 1.7
        external/mit/lua/dist/src/lutf8lib.c            up to 1.8
        external/mit/lua/dist/src/lvm.c                 up to 1.14
        external/mit/lua/dist/src/lvm.h                 up to 1.10
        external/mit/lua/dist/src/lzio.c                up to 1.8
        external/mit/lua/dist/src/lzio.h                up to 1.8
        doc/3RDPARTY                                    1.1536

Import lua 5.3.5.

Lua 5.3.5 is a minor release. It fixes all bugs listed in
http://www.lua.org/bugs.html#5.3.4:

1. Wrong code generated for a 'goto' followed by a label inside an 'if'.
2. Lua crashes when building sequences with more than 2^30 elements.
3. Table length computation overflows for sequences larger than 2^31 elements.
4. Lua does not check GC when creating error messages.
5. Dead keys with nil values can stay in weak tables.
6. lua_pushcclosure should not call the garbage collector when n is zero.
7. Memory-allocation error when resizing a table can leave it in an
   inconsistent state..

diffstat:

 doc/3RDPARTY                            |    8 +-
 external/mit/lua/dist/README            |    2 +-
 external/mit/lua/dist/README.import     |   20 ++++++
 external/mit/lua/dist/doc/contents.html |    6 +-
 external/mit/lua/dist/doc/lua.css       |   33 ++++-----
 external/mit/lua/dist/doc/manual.html   |  101 +++++++++++++++----------------
 external/mit/lua/dist/doc/readme.html   |    6 +-
 external/mit/lua/dist/src/Makefile      |    4 +-
 external/mit/lua/dist/src/lapi.c        |    9 +-
 external/mit/lua/dist/src/lapi.h        |    4 +-
 external/mit/lua/dist/src/lauxlib.c     |    4 +-
 external/mit/lua/dist/src/lauxlib.h     |    4 +-
 external/mit/lua/dist/src/lbaselib.c    |    4 +-
 external/mit/lua/dist/src/lbitlib.c     |    4 +-
 external/mit/lua/dist/src/lcode.c       |    4 +-
 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      |    4 +-
 external/mit/lua/dist/src/ldebug.c      |    5 +-
 external/mit/lua/dist/src/ldebug.h      |    4 +-
 external/mit/lua/dist/src/ldo.c         |    4 +-
 external/mit/lua/dist/src/ldo.h         |    4 +-
 external/mit/lua/dist/src/ldump.c       |    4 +-
 external/mit/lua/dist/src/lfunc.c       |    4 +-
 external/mit/lua/dist/src/lfunc.h       |    4 +-
 external/mit/lua/dist/src/lgc.c         |    7 +-
 external/mit/lua/dist/src/lgc.h         |    4 +-
 external/mit/lua/dist/src/linit.c       |    4 +-
 external/mit/lua/dist/src/liolib.c      |   15 +++-
 external/mit/lua/dist/src/llex.c        |    4 +-
 external/mit/lua/dist/src/llex.h        |    4 +-
 external/mit/lua/dist/src/llimits.h     |    4 +-
 external/mit/lua/dist/src/lmathlib.c    |    4 +-
 external/mit/lua/dist/src/lmem.c        |    4 +-
 external/mit/lua/dist/src/lmem.h        |    4 +-
 external/mit/lua/dist/src/loadlib.c     |    4 +-
 external/mit/lua/dist/src/lobject.c     |    7 +-
 external/mit/lua/dist/src/lobject.h     |    4 +-
 external/mit/lua/dist/src/lopcodes.c    |    4 +-
 external/mit/lua/dist/src/lopcodes.h    |    4 +-
 external/mit/lua/dist/src/loslib.c      |   10 +-
 external/mit/lua/dist/src/lparser.c     |    4 +-
 external/mit/lua/dist/src/lparser.h     |    4 +-
 external/mit/lua/dist/src/lprefix.h     |    4 +-
 external/mit/lua/dist/src/lstate.c      |    4 +-
 external/mit/lua/dist/src/lstate.h      |   22 ++++++-
 external/mit/lua/dist/src/lstring.c     |    4 +-
 external/mit/lua/dist/src/lstring.h     |    4 +-
 external/mit/lua/dist/src/lstrlib.c     |   10 +-
 external/mit/lua/dist/src/ltable.c      |   37 ++++++++--
 external/mit/lua/dist/src/ltable.h      |    6 +-
 external/mit/lua/dist/src/ltablib.c     |    4 +-
 external/mit/lua/dist/src/ltm.c         |    4 +-
 external/mit/lua/dist/src/ltm.h         |    4 +-
 external/mit/lua/dist/src/lua.c         |    6 +-
 external/mit/lua/dist/src/lua.h         |   10 +-
 external/mit/lua/dist/src/luac.c        |    7 +-
 external/mit/lua/dist/src/luaconf.h     |   15 +++-
 external/mit/lua/dist/src/lualib.h      |    4 +-
 external/mit/lua/dist/src/lundump.c     |    4 +-
 external/mit/lua/dist/src/lundump.h     |    4 +-
 external/mit/lua/dist/src/lutf8lib.c    |    6 +-
 external/mit/lua/dist/src/lvm.c         |    4 +-
 external/mit/lua/dist/src/lvm.h         |    4 +-
 external/mit/lua/dist/src/lzio.c        |    4 +-
 external/mit/lua/dist/src/lzio.h        |    4 +-
 68 files changed, 302 insertions(+), 230 deletions(-)

diffs (truncated from 1628 to 300 lines):

diff -r a4039e5a9503 -r b709e410a450 doc/3RDPARTY
--- a/doc/3RDPARTY      Sat Aug 11 14:47:31 2018 +0000
+++ b/doc/3RDPARTY      Sat Aug 11 14:54:49 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.1444.2.15 2018/07/27 10:22:52 martin Exp $
+#      $NetBSD: 3RDPARTY,v 1.1444.2.16 2018/08/11 14:54:49 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -807,12 +807,12 @@
 into inetd. The provided libwrap2netbsd script handles just libwrap.
 
 Package:       Lua
-Version:       Lua 5.3.4
-Current Vers:  Lua 5.3.4
+Version:       Lua 5.3.5
+Current Vers:  Lua 5.3.5
 Maintainer:    PUC Rio
 Home Page:     http://www.lua.org/
 Mailing List:
-Responsible:   mbalmer, lneto, salazar
+Responsible:   mbalmer, lneto, salazar, alnsn
 License:       MIT
 Location:      external/mit/lua/dist
 Notes:
diff -r a4039e5a9503 -r b709e410a450 external/mit/lua/dist/README
--- a/external/mit/lua/dist/README      Sat Aug 11 14:47:31 2018 +0000
+++ b/external/mit/lua/dist/README      Sat Aug 11 14:54:49 2018 +0000
@@ -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 -r a4039e5a9503 -r b709e410a450 external/mit/lua/dist/README.import
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/lua/dist/README.import       Sat Aug 11 14:54:49 2018 +0000
@@ -0,0 +1,20 @@
+How to import Lua x.y.z
+=======================
+
+1. Untar a new version to a directory called dist.work or even
+   somethere outside of the tree.
+2. Run lua2netbsd script inside that directory.
+3. Run 'cvs import src/external/mit/lua/dist LUA LUA_<<x_y_z>>'.
+   It's very important to run it from inside the right direcory!
+4. Move the dist directory away (is it optional?).
+5. Run 'cvs up -dP' to bring the new import to the tree.
+6. Run 'cvs up -j LUA_<<previous_version>> -j LUA_<<x_y_z>>'.
+   It will generate many conflicts.
+7. Resolve conflicts. Most (if not all) conflicts are around RCS
+   identifiers.
+8. Commit your changes.
+
+Vendor branches are usually named LUA_<<x_y_z>> but if there was a problem
+with cvs import, they can be named differently.
+
+The last imported vendor branch is called LUA_5_3_5_try2.
diff -r a4039e5a9503 -r b709e410a450 external/mit/lua/dist/doc/contents.html
--- a/external/mit/lua/dist/doc/contents.html   Sat Aug 11 14:47:31 2018 +0000
+++ b/external/mit/lua/dist/doc/contents.html   Sat Aug 11 14:54:49 2018 +0000
@@ -32,7 +32,7 @@
 
 <P>
 <SMALL>
-Copyright &copy; 2015&ndash;2017 Lua.org, PUC-Rio.
+Copyright &copy; 2015&ndash;2018 Lua.org, PUC-Rio.
 Freely available under the terms of the
 <A HREF="http://www.lua.org/license.html";>Lua license</A>.
 </SMALL>
@@ -609,10 +609,10 @@
 
 <P CLASS="footer">
 Last update:
-Thu Dec 22 18:29:39 BRST 2016
+Mon Jun 18 22:56:06 -03 2018
 </P>
 <!--
-Last change: revised for Lua 5.3.4
+Last change: revised for Lua 5.3.5
 -->
 
 </BODY>
diff -r a4039e5a9503 -r b709e410a450 external/mit/lua/dist/doc/lua.css
--- a/external/mit/lua/dist/doc/lua.css Sat Aug 11 14:47:31 2018 +0000
+++ b/external/mit/lua/dist/doc/lua.css Sat Aug 11 14:54:49 2018 +0000
@@ -10,7 +10,7 @@
        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 @@
        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 @@
        margin-top: 0.25em ;
 }
 
+p.logos a:link:hover, p.logos a:visited:hover {
+       background-color: inherit ;
+}
+
 img {
        background-color: white ;
 }
diff -r a4039e5a9503 -r b709e410a450 external/mit/lua/dist/doc/manual.html
--- a/external/mit/lua/dist/doc/manual.html     Sat Aug 11 14:47:31 2018 +0000
+++ b/external/mit/lua/dist/doc/manual.html     Sat Aug 11 14:54:49 2018 +0000
@@ -19,7 +19,7 @@
 
 <P>
 <SMALL>
-Copyright &copy; 2015&ndash;2017 Lua.org, PUC-Rio.
+Copyright &copy; 2015&ndash;2018 Lua.org, PUC-Rio.
 Freely available under the terms of the
 <a href="http://www.lua.org/license.html";>Lua license</a>.
 </SMALL>
@@ -35,7 +35,7 @@
 <!-- ====================================================================== -->
 <p>
 
-<!-- Id: manual.of,v 1.167 2017/01/09 15:18:11 roberto Exp  -->
+<!-- Id: manual.of,v 1.167.1.2 2018/06/26 15:49:07 roberto Exp  -->
 
 
 
@@ -203,8 +203,8 @@
 
 <p>
 The type <em>table</em> implements associative arrays,
-that is, arrays that can be indexed not only with numbers,
-but with any Lua value except <b>nil</b> and NaN.
+that is, arrays that can have as indices not only numbers,
+but any Lua value except <b>nil</b> and NaN.
 (<em>Not a Number</em> is a special value used to represent
 undefined or unrepresentable numerical results, such as <code>0/0</code>.)
 Tables can be <em>heterogeneous</em>;
@@ -400,6 +400,8 @@
 the corresponding values are called <em>metamethods</em>.
 In the previous example, the key is "<code>__add</code>"
 and the metamethod is the function that performs the addition.
+Unless stated otherwise,
+metamethods should be function values.
 
 
 <p>
@@ -597,7 +599,7 @@
 </li>
 
 <li><b><code>__index</code>: </b>
-The indexing access <code>table[key]</code>.
+The indexing access operation <code>table[key]</code>.
 This event happens when <code>table</code> is not a table or
 when <code>key</code> is not present in <code>table</code>.
 The metamethod is looked up in <code>table</code>.
@@ -1276,13 +1278,8 @@
 <pre>
        var ::= prefixexp &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo;
 </pre><p>
-The meaning of accesses to table fields can be changed via metatables.
-An access to an indexed variable <code>t[i]</code> is equivalent to
-a call <code>gettable_event(t,i)</code>.
-(See <a href="#2.4">&sect;2.4</a> for a complete description of the
-<code>gettable_event</code> 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 <a href="#2.4">&sect;2.4</a>).
 
 
 <p>
@@ -1477,22 +1474,17 @@
 
 
 <p>
-The meaning of assignments to global variables
-and table fields can be changed via metatables.
-An assignment to an indexed variable <code>t[i] = val</code> is equivalent to
-<code>settable_event(t,i,val)</code>.
-(See <a href="#2.4">&sect;2.4</a> for a complete description of the
-<code>settable_event</code> function.
-This function is not defined or callable in Lua.
-We use it here only for explanatory purposes.)
-
-
-<p>
 An assignment to a global name <code>x = val</code>
 is equivalent to the assignment
 <code>_ENV.x = val</code> (see <a href="#2.2">&sect;2.2</a>).
 
 
+<p>
+The meaning of assignments to table fields and
+global variables (which are actually table fields, too)
+can be changed via metatables (see <a href="#2.4">&sect;2.4</a>).
+
+
 
 
 
@@ -1831,17 +1823,17 @@
      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
 </pre>
 
@@ -2039,9 +2031,12 @@
 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).
 
 
 <p>
@@ -2303,7 +2298,7 @@
 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 <a href="#2.4">&sect;2.4</a>).
 
@@ -2881,7 +2876,7 @@
 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,



Home | Main Index | Thread Index | Old Index