summaryrefslogtreecommitdiff
path: root/package/lua/lua-bug3-boolean_expression.patch
diff options
context:
space:
mode:
authorFrancois Perrad <francois.perrad@gadz.org>2010-08-05 22:58:10 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-08-24 15:04:57 +0200
commit66ab67661607bda03f5f2e31da9239048becbfba (patch)
tree4a05d86df41f2e44bcdd7b9e8ea789bfaed1d759 /package/lua/lua-bug3-boolean_expression.patch
parent0b876d39776fdec69762b988216e5ed64dbe6ba8 (diff)
Add new upstream Lua patches and rename all patches for consistency
Several new upstream patches against the latest version of Lua have appeared on http://www.lua.org/bugs.html. This commit adds them to Buildroot, and also renames the other patches to have a coherent patch naming: lua-bugX, where X is the identifier of the bug as visible on http://www.lua.org/bugs.html. Note that bug 1 and 2 are not associated with patches, which explains why the first patch is labeled lua-bug3. Fixes bug #2365. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/lua/lua-bug3-boolean_expression.patch')
-rw-r--r--package/lua/lua-bug3-boolean_expression.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/package/lua/lua-bug3-boolean_expression.patch b/package/lua/lua-bug3-boolean_expression.patch
new file mode 100644
index 000000000..f04eb8507
--- /dev/null
+++ b/package/lua/lua-bug3-boolean_expression.patch
@@ -0,0 +1,48 @@
+--- lua-5.1.4.orig/src/lcode.c 2007/12/28 15:32:23 2.25.1.3
++++ lua-5.1.4/src/lcode.c 2009/06/15 14:07:34
+@@ -544,15 +544,18 @@
+ pc = NO_JUMP; /* always true; do nothing */
+ break;
+ }
+- case VFALSE: {
+- pc = luaK_jump(fs); /* always jump */
+- break;
+- }
+ case VJMP: {
+ invertjump(fs, e);
+ pc = e->u.s.info;
+ break;
+ }
++ case VFALSE: {
++ if (!hasjumps(e)) {
++ pc = luaK_jump(fs); /* always jump */
++ break;
++ }
++ /* else go through */
++ }
+ default: {
+ pc = jumponcond(fs, e, 0);
+ break;
+@@ -572,14 +575,17 @@
+ pc = NO_JUMP; /* always false; do nothing */
+ break;
+ }
+- case VTRUE: {
+- pc = luaK_jump(fs); /* always jump */
+- break;
+- }
+ case VJMP: {
+ pc = e->u.s.info;
+ break;
+ }
++ case VTRUE: {
++ if (!hasjumps(e)) {
++ pc = luaK_jump(fs); /* always jump */
++ break;
++ }
++ /* else go through */
++ }
+ default: {
+ pc = jumponcond(fs, e, 1);
+ break;
+