plan9-archive/lua

README+1−1

@@ -1,5 +1,5 @@
1		1
2	This is Lua 5.3.0, released on 02 Jan 2015.	2	This is Lua 5.3.0, released on 06 Jan 2015.
3		3
4	For installation instructions, license details, and	4	For installation instructions, license details, and
5	further information about Lua, see doc/readme.html.	5	further information about Lua, see doc/readme.html.

doc/manual.html+17−12

 <!-- ====================================================================== -->
 <p>
-<!-- $Id: manual.of,v 1.143 2015/01/02 13:07:38 roberto Exp $ -->
+<!-- $Id: manual.of,v 1.146 2015/01/06 11:23:01 roberto Exp $ -->
 with the following code:
 <pre>
-     rawget(getmetatable(obj) or {}, event_name)
+     rawget(getmetatable(obj) or {}, "__" .. event_name)
 </pre>
 <p>
 it is not collected immediately by the garbage collector.
 Instead, Lua puts it in a list.
 After the collection,
-Lua goes through that list:
+Lua goes through that list.
 For each object in the list,
-it checks the object's <code>__gc</code> metamethod;
+it checks the object's <code>__gc</code> metamethod:
-if it is a function,
+If it is a function,
-Lua calls it with the object as its single argument.
+Lua calls it with the object as its single argument;
-If the metamethod is not a function,
+if the metamethod is not a function,
 Lua simply ignores it.
      end
 </pre>
+<p>
+The order of the assignments in a constructor is undefined.
+(This order would be relevant only when there are repeated keys.)
 <p>
 If the last field in the list has the form <code>exp</code>
 and the expression is a function call or a vararg expression,
 <p>
 The panic function runs as if it were a message handler (see <a href="#2.3">&sect;2.3</a>);
 in particular, the error message is at the top of the stack.
-However, there is no guarantees about stack space.
+However, there is no guarantee about stack space.
 To push anything on the stack,
 the panic function must first check the available space (see <a href="#4.2">&sect;4.2</a>).
      }
 </pre><p>
 Now we want to allow
-the Lua code being ran by <a href="#lua_pcall"><code>lua_pcall</code></a> to yield.
+the Lua code being run by <a href="#lua_pcall"><code>lua_pcall</code></a> to yield.
 First, we can rewrite our function like here:
 <pre>
 which should do all the work that the original function
 was doing after calling <a href="#lua_pcall"><code>lua_pcall</code></a>.
 Now, we must inform Lua that it must call <code>k</code> if the Lua code
-begin running by <a href="#lua_pcall"><code>lua_pcall</code></a> gets interrupted in some way
+being executed by <a href="#lua_pcall"><code>lua_pcall</code></a> gets interrupted in some way
 (errors or yielding),
 so we rewrite the code as here,
 replacing <a href="#lua_pcall"><code>lua_pcall</code></a> by <a href="#lua_pcallk"><code>lua_pcallk</code></a>:
 <pre>int lua_pcallk (lua_State *L,
                 int nargs,
                 int nresults,
-                int errfunc,
+                int msgh,
                 lua_KContext ctx,
                 lua_KFunction k);</pre>
 <HR>
 <SMALL CLASS="footer">
 Last update:
-Fri Jan  2 11:29:40 BRST 2015
+Tue Jan  6 10:10:50 BRST 2015
 </SMALL>
 <!--
 Last change: revised for Lua 5.3.0 (final)

src/Makefile+1−1

@@ -6,7 +6,7 @@ · 5 unmodified lines
6	# Your platform. See PLATS for possible values.	6	# Your platform. See PLATS for possible values.
7	PLAT= none	7	PLAT= none
8		8
9	CC= gcc -std=c99	9	CC= gcc -std=gnu99
10	CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)	10	CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
11	LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)	11	LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
12	LIBS= -lm $(SYSLIBS) $(MYLIBS)	12	LIBS= -lm $(SYSLIBS) $(MYLIBS)

src/linit.c+6−4

 /*
-** $Id: linit.c,v 1.37 2014/12/09 15:00:17 roberto Exp $
+** $Id: linit.c,v 1.38 2015/01/05 13:48:33 roberto Exp $
 ** Initialization of libraries for lua.c and other clients
 ** See Copyright Notice in lua.h
 */
 #define linit_c
 #define LUA_LIB
-#include "lprefix.h"
 /*
 ** If you embed Lua in your program and need to open the standard
 ** libraries, call luaL_openlibs in your program. If you need a
 **  lua_pop(L, 1);  // remove _PRELOAD table
 */
+#include "lprefix.h"
+#include <stddef.h>
 #include "lua.h"
 #include "lualib.h"

src/loadlib.c+14−2

 /*
-** $Id: loadlib.c,v 1.123 2014/11/12 13:31:51 roberto Exp $
+** $Id: loadlib.c,v 1.124 2015/01/05 13:51:39 roberto Exp $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
 #include <dlfcn.h>
+/*
+** Macro to covert pointer to void* to pointer to function. This cast
+** is undefined according to ISO C, but POSIX assumes that it must work.
+** (The '__extension__' in gnu compilers is only to avoid warnings.)
+*/
+#if defined(__GNUC__)
+#define cast_func(p) (__extension__ (lua_CFunction)(p))
+#else
+#define cast_func(p) ((lua_CFunction)(p))
+#endif
 static void lsys_unloadlib (void *lib) {
   dlclose(lib);
 }
 static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
+  lua_CFunction f = cast_func(dlsym(lib, sym));
   if (f == NULL) lua_pushstring(L, dlerror());
   return f;
 }

src/lobject.h+2−2

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: lobject.h,v 2.105 2014/12/19 13:36:32 roberto Exp $	2	** $Id: lobject.h,v 2.106 2015/01/05 13:52:37 roberto Exp $
3	** Type definitions for Lua objects	3	** Type definitions for Lua objects
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -473,7 +473,7 @@ typedef union TKey { · 467 unmodified lines
473		473
474		474
475	/* copy a value into a key without messing up field 'next' */	475	/* copy a value into a key without messing up field 'next' */
476	#define setkey(L,key,obj) \	476	#define setnodekey(L,key,obj) \
477	{ TKey k_=(key); const TValue io_=(obj); \	477	{ TKey k_=(key); const TValue io_=(obj); \
478	k_->nk.value_ = io_->value_; k_->nk.tt_ = io_->tt_; \	478	k_->nk.value_ = io_->value_; k_->nk.tt_ = io_->tt_; \
479	(void)L; checkliveness(G(L),io_); }	479	(void)L; checkliveness(G(L),io_); }

src/lopcodes.c+3−1

 /*
-** $Id: lopcodes.c,v 1.54 2014/11/02 19:19:04 roberto Exp $
+** $Id: lopcodes.c,v 1.55 2015/01/05 13:48:33 roberto Exp $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
 #include "lprefix.h"
+#include <stddef.h>
 #include "lopcodes.h"

src/ltable.c+2−2

@@ -1,5 +1,5 @@
1	/*	1	/*
2	** $Id: ltable.c,v 2.99 2014/11/02 19:19:04 roberto Exp $	2	** $Id: ltable.c,v 2.100 2015/01/05 13:52:37 roberto Exp $
3	** Lua tables (hash)	3	** Lua tables (hash)
4	** See Copyright Notice in lua.h	4	** See Copyright Notice in lua.h
5	*/	5	*/
@@ -484,7 +484,7 @@ TValue luaH_newkey (lua_State L, Table t, const TValue key) { · 478 unmodified lines
484	mp = f;	484	mp = f;
485	}	485	}
486	}	486	}
487	setkey(L, &mp->i_key, key);	487	setnodekey(L, &mp->i_key, key);
488	luaC_barrierback(L, t, key);	488	luaC_barrierback(L, t, key);
489	lua_assert(ttisnil(gval(mp)));	489	lua_assert(ttisnil(gval(mp)));
490	return gval(mp);	490	return gval(mp);

src/luac.c+11−6

 /*
-** $Id: luac.c,v 1.71 2014/11/26 12:08:59 lhf Exp $
+** $Id: luac.c,v 1.72 2015/01/06 03:09:13 lhf Exp $
 ** Lua compiler (saves bytecodes to files; also lists bytecodes)
 ** See Copyright Notice in lua.h
 */
 static void usage(const char* message)
 {
  if (*message=='-')
-  fprintf(stderr,"%s: unrecognized option " LUA_QS "\n",progname,message);
+  fprintf(stderr,"%s: unrecognized option '%s'\n",progname,message);
  else
   fprintf(stderr,"%s: %s\n",progname,message);
  fprintf(stderr,
   "usage: %s [options] [filenames]\n"
   "Available options are:\n"
   "  -l       list (use -l -l for full listing)\n"
-  "  -o name  output to file " LUA_QL("name") " (default is \"%s\")\n"
+  "  -o name  output to file 'name' (default is \"%s\")\n"
   "  -p       parse only\n"
   "  -s       strip debug information\n"
   "  -v       show version information\n"
   {
    output=argv[++i];
    if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
-    usage(LUA_QL("-o") " needs argument");
+    usage("'-o' needs argument");
    if (IS("-")) output=NULL;
   }
   else if (IS("-p"))			/* parse only */
 }
 /*
-** $Id: print.c,v 1.74 2014/07/21 01:41:45 lhf Exp $
+** $Id: print.c,v 1.76 2015/01/05 16:12:50 lhf Exp $
 ** print bytecodes
 ** See Copyright Notice in lua.h
 */
 	printf(bvalue(o) ? "true" : "false");
 	break;
   case LUA_TNUMFLT:
-	printf(LUA_NUMBER_FMT,fltvalue(o));
+	{
+	char buff[100];
+	sprintf(buff,LUA_NUMBER_FMT,fltvalue(o));
+	printf("%s",buff);
+	if (buff[strspn(buff,"-0123456789")]=='\0') printf(".0");
 	break;
+	}
   case LUA_TNUMINT:
 	printf(LUA_INTEGER_FMT,ivalue(o));
 	break;