Source-Changes-HG archive

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

[src/trunk]: src/external/mit/lua/dist Resolve conflicts.



details:   https://anonhg.NetBSD.org/src/rev/49c7b81f03f7
branches:  trunk
changeset: 363648:49c7b81f03f7
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Sat Aug 04 17:30:01 2018 +0000

description:
Resolve conflicts.

diffstat:

 external/mit/lua/dist/README            |    2 +-
 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        |    4 +-
 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      |    4 +-
 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         |    4 +-
 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      |   18 +++--
 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     |   11 ++-
 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 +-
 66 files changed, 251 insertions(+), 221 deletions(-)

diffs (truncated from 1493 to 300 lines):

diff -r 54877119dde6 -r 49c7b81f03f7 external/mit/lua/dist/README
--- a/external/mit/lua/dist/README      Sat Aug 04 16:21:40 2018 +0000
+++ b/external/mit/lua/dist/README      Sat Aug 04 17:30:01 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 54877119dde6 -r 49c7b81f03f7 external/mit/lua/dist/doc/contents.html
--- a/external/mit/lua/dist/doc/contents.html   Sat Aug 04 16:21:40 2018 +0000
+++ b/external/mit/lua/dist/doc/contents.html   Sat Aug 04 17:30:01 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 54877119dde6 -r 49c7b81f03f7 external/mit/lua/dist/doc/lua.css
--- a/external/mit/lua/dist/doc/lua.css Sat Aug 04 16:21:40 2018 +0000
+++ b/external/mit/lua/dist/doc/lua.css Sat Aug 04 17:30:01 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 54877119dde6 -r 49c7b81f03f7 external/mit/lua/dist/doc/manual.html
--- a/external/mit/lua/dist/doc/manual.html     Sat Aug 04 16:21:40 2018 +0000
+++ b/external/mit/lua/dist/doc/manual.html     Sat Aug 04 17:30:01 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,
 a Lua state stored in the registry, or
 the result of <a href="#lua_newthread"><code>lua_newthread</code></a>),
 it should use them only in API calls that cannot raise errors.
@@ -3370,7 +3365,7 @@
 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 @@
 
 
 <p>
-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 <code>what</code> string with the character '<code>&gt;</code>'.
 (In that case,
 <code>lua_getinfo</code> pops the function from the top of the stack.)
@@ -6462,7 +6457,7 @@
 
 <p>
 Pushes onto the stack the field <code>e</code> from the metatable
-of the object at index <code>obj</code> and returns the type of pushed value.
+of the object at index <code>obj</code> 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 <code>LUA_TNIL</code>.
@@ -6749,7 +6744,7 @@
 the macro results in the default <code>dflt</code>.
 Otherwise, it results in the result of calling <code>func</code>
 with the state <code>L</code> and the argument index <code>arg</code> as
-parameters.
+arguments.
 Note that it evaluates the expression <code>dflt</code> only if needed.
 
 
@@ -8680,7 +8675,7 @@
 <p>
 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 @@



Home | Main Index | Thread Index | Old Index