diff options
author | Philipp Janda <siffiejoe@gmx.net> | 2018-12-15 12:50:05 +0100 |
---|---|---|
committer | Philipp Janda <siffiejoe@gmx.net> | 2018-12-15 12:50:05 +0100 |
commit | a1735f6e6bd17588fcaf98720f0548c4caa23b34 (patch) | |
tree | 2fdd2322abad51534b90b32954e1763dfff16b33 | |
parent | 01a43c04a5afa8e48364607de57ef7c80e22d1ea (diff) | |
download | lua-compat-5.3-a1735f6e6bd17588fcaf98720f0548c4caa23b34.tar.gz lua-compat-5.3-a1735f6e6bd17588fcaf98720f0548c4caa23b34.tar.bz2 lua-compat-5.3-a1735f6e6bd17588fcaf98720f0548c4caa23b34.zip |
Update backports to Lua 5.3.5 versions
-rw-r--r-- | lstrlib.c | 8 | ||||
-rw-r--r-- | ltablib.c | 2 | ||||
-rw-r--r-- | lutf8lib.c | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lstrlib.c,v 1.254 2016/12/22 13:08:50 roberto Exp $ | 2 | ** $Id: lstrlib.c,v 1.254.1.1 2017/04/19 17:29:57 roberto Exp $ |
3 | ** Standard library for string operations and pattern-matching | 3 | ** Standard library for string operations and pattern-matching |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -879,7 +879,7 @@ static int lua_number2strx (lua_State *L, char *buff, int sz, | |||
879 | buff[i] = toupper(uchar(buff[i])); | 879 | buff[i] = toupper(uchar(buff[i])); |
880 | } | 880 | } |
881 | else if (fmt[SIZELENMOD] != 'a') | 881 | else if (fmt[SIZELENMOD] != 'a') |
882 | luaL_error(L, "modifiers for format '%%a'/'%%A' not implemented"); | 882 | return luaL_error(L, "modifiers for format '%%a'/'%%A' not implemented"); |
883 | return n; | 883 | return n; |
884 | } | 884 | } |
885 | 885 | ||
@@ -1199,8 +1199,8 @@ static int getnum (const char **fmt, int df) { | |||
1199 | static int getnumlimit (Header *h, const char **fmt, int df) { | 1199 | static int getnumlimit (Header *h, const char **fmt, int df) { |
1200 | int sz = getnum(fmt, df); | 1200 | int sz = getnum(fmt, df); |
1201 | if (sz > MAXINTSIZE || sz <= 0) | 1201 | if (sz > MAXINTSIZE || sz <= 0) |
1202 | luaL_error(h->L, "integral size (%d) out of limits [1,%d]", | 1202 | return luaL_error(h->L, "integral size (%d) out of limits [1,%d]", |
1203 | sz, MAXINTSIZE); | 1203 | sz, MAXINTSIZE); |
1204 | return sz; | 1204 | return sz; |
1205 | } | 1205 | } |
1206 | 1206 | ||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ltablib.c,v 1.93 2016/02/25 19:41:54 roberto Exp $ | 2 | ** $Id: ltablib.c,v 1.93.1.1 2017/04/19 17:20:42 roberto Exp $ |
3 | ** Library for Table Manipulation | 3 | ** Library for Table Manipulation |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lutf8lib.c,v 1.16 2016/12/22 13:08:50 roberto Exp $ | 2 | ** $Id: lutf8lib.c,v 1.16.1.1 2017/04/19 17:29:57 roberto Exp $ |
3 | ** Standard library for UTF-8 manipulation | 3 | ** Standard library for UTF-8 manipulation |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -171,7 +171,7 @@ static int byteoffset (lua_State *L) { | |||
171 | } | 171 | } |
172 | else { | 172 | else { |
173 | if (iscont(s + posi)) | 173 | if (iscont(s + posi)) |
174 | luaL_error(L, "initial position is a continuation byte"); | 174 | return luaL_error(L, "initial position is a continuation byte"); |
175 | if (n < 0) { | 175 | if (n < 0) { |
176 | while (n < 0 && posi > 0) { /* move back */ | 176 | while (n < 0 && posi > 0) { /* move back */ |
177 | do { /* find beginning of previous character */ | 177 | do { /* find beginning of previous character */ |