 @@ -1,14 +1,14 @@
-/*	$NetBSD: lapi.c,v 1.2.2.1 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: lapi.c,v 1.2.2.2 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: lapi.c,v 2.244 2014/12/26 14:43:45 roberto Exp
 ** Lua API
 ** See Copyright Notice in lua.h
 */
 #define lapi_c
 #define LUA_CORE
 #include "lprefix.h"
 @@ -266,33 +266,31 @@ LUA_API const char *lua_typename (lua_St
 LUA_API int lua_iscfunction (lua_State *L, int idx) {
   StkId o = index2addr(L, idx);
   return (ttislcf(o) || (ttisCclosure(o)));
+}
 LUA_API int lua_isinteger (lua_State *L, int idx) {
   StkId o = index2addr(L, idx);
   return ttisinteger(o);
+}
 #ifndef _KERNEL
 LUA_API int lua_isnumber (lua_State *L, int idx) {
   lua_Number n;
   const TValue *o = index2addr(L, idx);
   return tonumber(o, &n);
+}
 #endif
 LUA_API int lua_isstring (lua_State *L, int idx) {
   const TValue *o = index2addr(L, idx);
   return (ttisstring(o) || cvt2str(o));
+}
 LUA_API int lua_isuserdata (lua_State *L, int idx) {
   const TValue *o = index2addr(L, idx);
   return (ttisfulluserdata(o) || ttislightuserdata(o));
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: llex.c,v 1.2.2.1 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: llex.c,v 1.2.2.2 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: llex.c,v 2.89 2014/11/14 16:06:09 roberto Exp
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
 #define llex_c
 #define LUA_CORE
 #include "lprefix.h"
 @@ -192,41 +192,41 @@ void luaX_setinput (lua_State *L, LexSta
 ** =======================================================
 */
 static int check_next1 (LexState *ls, int c) {
   if (ls->current == c) {
     next(ls);
     return 1;
+  }
   else return 0;
+}
 #ifndef _KERNEL
 /*
 ** Check whether current char is in set 'set' (with two chars) and
 ** saves it
 */
 static int check_next2 (LexState *ls, const char *set) {
   lua_assert(set[2] == '\0');
   if (ls->current == set[0] || ls->current == set[1]) {
     save_and_next(ls);
     return 1;
+  }
   else return 0;
+}
 #ifndef _KERNEL
 /*
 ** change all characters 'from' in buffer to 'to'
 */
 static void buffreplace (LexState *ls, char from, char to) {
   if (from != to) {
     size_t n = luaZ_bufflen(ls->buff);
     char *p = luaZ_buffer(ls->buff);
     while (n--)
       if (p[n] == from) p[n] = to;
+  }
+}
 @@ -286,28 +286,31 @@ static int read_numeral (LexState *ls, S
     return TK_INT;
+  }
   else {
     lua_assert(ttisfloat(&obj));
     seminfo->r = fltvalue(&obj);
     return TK_FLT;
+  }
+}
 #else /* _KERNEL */
 static int read_numeral (LexState *ls, SemInfo *seminfo) {
   TValue obj;
   int first = ls->current;
   lua_assert(lisdigit(ls->current));
   save_and_next(ls);
   if (first == '0')
     check_next2(ls, "xX");  /* hexadecimal? */
   for (;;) {
     if (lisxdigit(ls->current))
       save_and_next(ls);
     else break;
+  }
   save(ls, '\0');
   if (!buff2num(ls->buff, &obj))  /* format error? */
     lexerror(ls, "malformed number", TK_INT);
   lua_assert(ttisinteger(&obj));
   seminfo->i = ivalue(&obj);
   return TK_INT;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: llimits.h,v 1.2.2.1 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: llimits.h,v 1.2.2.2 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: llimits.h,v 1.125 2014/12/19 13:30:23 roberto Exp
 ** Limits, basic types, and some other 'installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
 #ifndef llimits_h
 #define llimits_h
 #ifndef _KERNEL
 #include <limits.h>
 @@ -58,33 +58,39 @@ typedef unsigned char lu_byte;
 /*
 ** conversion of pointer to integer:
 ** this is for hashing only; there is no problem if the integer
 ** cannot hold the whole pointer value
 */
 #define point2int(p)	((unsigned int)((size_t)(p) & UINT_MAX))
 /* type to ensure maximum alignment */
 #if defined(LUAI_USER_ALIGNMENT_T)
 typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
 #else
 #ifndef _KERNEL
 typedef union { double u; void *s; lua_Integer i; long l; } L_Umaxalign;
 #else /* _KERNEL */
 typedef union { void *s; lua_Integer i; long l; } L_Umaxalign;
 #endif
 #endif
 /* types of 'usual argument conversions' for lua_Number and lua_Integer */
 #ifndef _KERNEL
 typedef LUAI_UACNUMBER l_uacNumber;
 #endif
 typedef LUAI_UACINT l_uacInt;
 /* internal assertions for in-house debugging */
 #if defined(lua_assert)
 #define check_exp(c,e)		(lua_assert(c), (e))
 /* to avoid problems with conditions too long */
 #define lua_longassert(c)	{ if (!(c)) lua_assert(0); }
 #else
 #define lua_assert(c)		((void)0)
 #define check_exp(c,e)		(e)
 #define lua_longassert(c)	((void)0)
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lua.h,v 1.2.2.1 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: lua.h,v 1.2.2.2 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: lua.h,v 1.325 2014/12/26 17:24:27 roberto Exp
 ** Lua - A Scripting Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
 */
 #ifndef lua_h
 #define lua_h
 #include <stdarg.h>
 @@ -172,31 +172,27 @@ LUA_API int   (lua_gettop) (lua_State *L
 LUA_API void  (lua_settop) (lua_State *L, int idx);
 LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
 LUA_API void  (lua_rotate) (lua_State *L, int idx, int n);
 LUA_API void  (lua_copy) (lua_State *L, int fromidx, int toidx);
 LUA_API int   (lua_checkstack) (lua_State *L, int n);
 LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
 /*
 ** access functions (stack -> C)
 */
 #ifndef _KERNEL
 LUA_API int             (lua_isnumber) (lua_State *L, int idx);
 #else /* _KERNEL */
 #define lua_isnumber	lua_isinteger
 #endif
 LUA_API int             (lua_isstring) (lua_State *L, int idx);
 LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
 LUA_API int             (lua_isinteger) (lua_State *L, int idx);
 LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
 LUA_API int             (lua_type) (lua_State *L, int idx);
 LUA_API const char     *(lua_typename) (lua_State *L, int tp);
 #ifndef _KERNEL
 LUA_API lua_Number      (lua_tonumberx) (lua_State *L, int idx, int *isnum);
 #else /* _KERNEL */
 #define lua_tonumberx	(lua_Integer) lua_tointegerx
 #endif
 LUA_API lua_Integer     (lua_tointegerx) (lua_State *L, int idx, int *isnum);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lstrlib.c,v 1.5.2.1 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: lstrlib.c,v 1.5.2.2 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: lstrlib.c,v 1.221 2014/12/11 14:03:07 roberto Exp
 ** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
 #define lstrlib_c
 #define LUA_LIB
 #include "lprefix.h"
 @@ -975,27 +975,31 @@ static int str_format (lua_State *L) {
 #define SZINT	((int)sizeof(lua_Integer))
 /* dummy union to get native endianness */
 static const union {
   int dummy;
   char little;  /* true iff machine is little endian */
 } nativeendian = {1};
 /* dummy structure to get native alignment requirements */
 struct cD {
   char c;
 #ifndef _KERNEL
   union { double d; void *p; lua_Integer i; lua_Number n; } u;
 #else /* _KERNEL */
   union { void *p; lua_Integer i; lua_Number n; } u;
 #endif
 };
 #define MAXALIGN	(offsetof(struct cD, u))
 #ifndef _KERNEL
 /*
 ** Union for serializing floats
 */
 typedef union Ftypes {
   float f;
   double d;
   lua_Number n;
 @@ -1162,42 +1166,44 @@ static void packint (luaL_Buffer *b, lua
   buff[islittle ? 0 : size - 1] = (char)(n & MC);  /* first byte */
   for (i = 1; i < size; i++) {
     n >>= NB;
     buff[islittle ? i : size - 1 - i] = (char)(n & MC);
+  }
   if (neg && size > SZINT) {  /* negative number need sign extension? */
     for (i = SZINT; i < size; i++)  /* correct extra bytes */
       buff[islittle ? i : size - 1 - i] = (char)MC;
+  }
   luaL_addsize(b, size);  /* add result to buffer */
+}
 #ifndef _KERNEL
 /*
 ** Copy 'size' bytes from 'src' to 'dest', correcting endianness if
 ** given 'islittle' is different from native endianness.
 */
 static void copywithendian (volatile char *dest, volatile const char *src,
                             int size, int islittle) {
   if (islittle == nativeendian.little) {
     while (size-- != 0)
       *(dest++) = *(src++);
+  }
   else {
     dest += size - 1;
     while (size-- != 0)
       *(dest--) = *(src++);
+  }
+}
 #endif
 static int str_pack (lua_State *L) {
   luaL_Buffer b;
   Header h;
   const char *fmt = luaL_checkstring(L, 1);  /* format string */
   int arg = 1;  /* current argument to pack */
   size_t totalsize = 0;  /* accumulate total size of result */
   initheader(L, &h);
   lua_pushnil(L);  /* mark to separate arguments from string buffer */
   luaL_buffinit(L, &b);
   while (*fmt != '\0') {
     int size, ntoalign;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: luaconf.h,v 1.9.2.2 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: luaconf.h,v 1.9.2.3 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: luaconf.h,v 1.238 2014/12/29 13:27:55 roberto Exp
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
 #ifndef luaconf_h
 #define luaconf_h
 #ifndef _KERNEL
 #include <limits.h>
 @@ -382,26 +382,27 @@
 /* }================================================================== */
 /*
 ** {==================================================================
 ** Configuration for Numbers.
 ** Change these definitions if no predefined LUA_REAL_* / LUA_INT_*
 ** satisfy your needs.
 ** ===================================================================
 */
 #ifndef _KERNEL
 /*
 @@ LUA_NUMBER is the floating-point type used by Lua.
 **
 @@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
 @@ over a floating number.
 **
 @@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
 @@ LUA_NUMBER_FMT is the format for writing floats.
 @@ lua_number2str converts a float to a string.
 **
 @@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
 **
 @@ lua_str2number converts a decimal numeric string to a number.
 @@ -468,27 +469,26 @@
 ** and therefore its conversion to float may have an ill-defined value.)
 */
 #define lua_numbertointeger(n,p) \
   ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
    (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
       (*(p) = (LUA_INTEGER)(n), 1))
 /*
 @@ The luai_num* macros define the primitive operations over numbers.
 ** They should work for any size of floating numbers.
 */
 #ifndef _KERNEL
 /* the following operations need the math library */
 #if defined(lobject_c) || defined(lvm_c)
 #include <math.h>
 /* floor division (defined as 'floor(a/b)') */
 #define luai_numidiv(L,a,b)	((void)L, l_mathop(floor)(luai_numdiv(L,a,b)))
 /*
 ** module: defined as 'a - floor(a/b)*b'; the previous definition gives
 ** NaN when 'b' is huge, but the result should be 'a'. 'fmod' gives the
 ** result of 'a - trunc(a/b)*b', and therefore must be corrected when
 ** 'trunc(a/b) ~= floor(a/b)'. That happens when the division has a
 ** non-integer negative result, which is equivalent to the test below
 @@ -761,49 +761,41 @@
 #define LUA_ROOT	"/usr/"
 #define LUA_PATH_DEFAULT  \
 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
 #define LUA_CPATH_DEFAULT \
 		LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
 #ifndef _KERNEL
 #include <stdint.h>
 #else /* _KERNEL */
 #undef LUA_NUMBER
 #undef LUA_NUMBER_FMT
 #undef lua_str2number
 #define LUA_NUMBER		LUA_INTEGER
 #define LUA_NUMBER_FMT		LUA_INTEGER_FMT
 #define lua_str2number(s,p)	strtoimax((s),(p),10)
 #undef lua_numbertointeger
 #define lua_numbertointeger(n,p)	(*(p) = (LUA_INTEGER)(n), 1)
 /* setjmp.h */
 #define LUAI_THROW(L,c)		longjmp(&((c)->b))
 #define LUAI_TRY(L,c,a)		if (setjmp(&((c)->b)) == 0) { a }
 #define luai_jmpbuf		label_t
 /* time.h */
 #include <sys/time.h>
 #define time(p)			(time_uptime)
 /* stdio.h */
 #define lua_writestring(s,l)	printf("%s", (s))
-#define lua_writeline()	printf("\n")
+#define lua_writeline()		printf("\n")
 #define sprintf(s,fmt,...)	snprintf(s, sizeof(s), fmt, __VA_ARGS__)
 /* string.h */
 #define strcoll strcmp
 /* stdlib.h */
 #define abort()			panic("Lua has aborted!")
 #endif /* _KERNEL */
 #endif /* __NetBSD__ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lvm.c,v 1.3.2.1 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: lvm.c,v 1.3.2.2 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: lvm.c,v 2.232 2014/12/27 20:30:38 roberto Exp
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
 #define lvm_c
 #define LUA_CORE
 #include "lprefix.h"
 @@ -55,47 +55,47 @@
 */
 static int tofloat (const TValue *obj, lua_Number *n) {
   if (ttisfloat(obj)) *n = fltvalue(obj);
   else if (ttisinteger(obj)) {
     volatile lua_Number x = cast_num(ivalue(obj));  /* avoid extra precision */
     *n = x;
+  }
   else {
     *n = 0;  /* to avoid warnings */
     return 0;
+  }
   return 1;
+}
 #endif
 /*
 ** Try to convert a value to a float. The float case is already handled
 ** by the macro 'tonumber'.
 */
 int luaV_tonumber_ (const TValue *obj, lua_Number *n) {
   TValue v;
   if (ttisinteger(obj)) {
     *n = cast_num(ivalue(obj));
     return 1;
+  }
   else if (cvt2num(obj) &&  /* string convertible to number? */
             luaO_str2num(svalue(obj), &v) == tsvalue(obj)->len + 1) {
     *n = nvalue(&v);  /* convert result of 'luaO_str2num' to a float */
     return 1;
+  }
   else
     return 0;  /* conversion failed */
+}
 #endif
 /*
 ** try to convert a value to an integer, rounding according to 'mode':
 ** mode == 0: accepts only integral values
 ** mode == 1: takes the floor of the number
 ** mode == 2: takes the ceil of the number
 */
 static int tointeger_aux (const TValue *obj, lua_Integer *p, int mode) {
   TValue v;
  again:
 #ifndef _KERNEL
   if (ttisfloat(obj)) {

 @@ -1,29 +1,29 @@
-/*	$NetBSD: ldebug.c,v 1.2.2.1 2015/02/04 21:32:46 martin Exp $	*/
+/*	$NetBSD: ldebug.c,v 1.2.2.2 2015/02/21 18:16:21 martin Exp $	*/
 /*
 ** Id: ldebug.c,v 2.110 2015/01/02 12:52:22 roberto Exp
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
 #define ldebug_c
 #define LUA_CORE
 #include "lprefix.h"
 #ifndef _KERNEL
 #include <stdarg.h>
 #ifndef _KERNEL
 #include <stddef.h>
 #include <string.h>
 #endif
 #include "lua.h"
 #include "lapi.h"
 #include "lcode.h"
 #include "ldebug.h"
 #include "ldo.h"
 #include "lfunc.h"
 #include "lobject.h"
 #include "lopcodes.h"