aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2015-04-13 13:13:25 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2015-04-13 13:13:25 -0300
commit513c639bf91cbf7bcd11b37582a7adb897970b8d (patch)
tree00a5943f44f9fc36351cc9837445622a59065ebc
parent69b5f7a410fab2a8a661e609a7286aea511479bb (diff)
downloadlua-513c639bf91cbf7bcd11b37582a7adb897970b8d.tar.gz
lua-513c639bf91cbf7bcd11b37582a7adb897970b8d.tar.bz2
lua-513c639bf91cbf7bcd11b37582a7adb897970b8d.zip
patch for last bug corrected to be against last released version
(and not against last version in RCS...)
-rw-r--r--bugs30
1 files changed, 15 insertions, 15 deletions
diff --git a/bugs b/bugs
index 8c163475..51cca66c 100644
--- a/bugs
+++ b/bugs
@@ -3392,20 +3392,19 @@ print(co()) --> true (should be false)
3392]], 3392]],
3393 3393
3394patch = [[ 3394patch = [[
3395--- lstate.h 2015/03/04 13:31:21 2.120 3395--- lstate.h 2014/10/30 18:53:28 2.119
3396+++ lstate.h 2015/04/08 16:30:40 3396+++ lstate.h 2015/04/13 15:58:40
3397@@ -94,6 +94,7 @@ 3397@@ -94,6 +94,7 @@
3398 #define CIST_YPCALL (1<<4) /* call is a yieldable protected call */ 3398 #define CIST_YPCALL (1<<4) /* call is a yieldable protected call */
3399 #define CIST_TAIL (1<<5) /* call was tail called */ 3399 #define CIST_TAIL (1<<5) /* call was tail called */
3400 #define CIST_HOOKYIELD (1<<6) /* last hook called yielded */ 3400 #define CIST_HOOKYIELD (1<<6) /* last hook called yielded */
3401+#define CIST_LEQ (1<<7) /* using __lt for __le */ 3401+#define CIST_LEQ (1<<7) /* using __lt for __le */
3402 3402
3403 #define isLua(ci) ((ci)->callstatus & CIST_LUA) 3403 #define isLua(ci) ((ci)->callstatus & CIST_LUA)
3404 3404
3405 3405--- lvm.c 2014/12/27 20:30:38 2.232
3406--- lvm.c 2015/03/30 15:45:01 2.238 3406+++ lvm.c 2015/04/13 15:51:30
3407+++ lvm.c 2015/04/09 15:30:13 3407@@ -292,9 +292,14 @@
3408@@ -275,9 +275,14 @@
3409 return l_strcmp(tsvalue(l), tsvalue(r)) <= 0; 3408 return l_strcmp(tsvalue(l), tsvalue(r)) <= 0;
3410 else if ((res = luaT_callorderTM(L, l, r, TM_LE)) >= 0) /* first try 'le' */ 3409 else if ((res = luaT_callorderTM(L, l, r, TM_LE)) >= 0) /* first try 'le' */
3411 return res; 3410 return res;
@@ -3421,8 +3420,9 @@ patch = [[
3421+ return !res; /* result is negated */ 3420+ return !res; /* result is negated */
3422+ } 3421+ }
3423 } 3422 }
3424 3423
3425@@ -542,11 +547,11 @@ 3424
3425@@ -553,11 +558,11 @@
3426 case OP_LE: case OP_LT: case OP_EQ: { 3426 case OP_LE: case OP_LT: case OP_EQ: {
3427 int res = !l_isfalse(L->top - 1); 3427 int res = !l_isfalse(L->top - 1);
3428 L->top--; 3428 L->top--;