commit b4be5075784bcc8fed974bda4005425a9ccec1ba
parent 360587f31959b9a112b13000b3c7ee8ae51cf146
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Mon, 29 Apr 2013 13:56:25 -0300
new function 'luaT_trybinTM'
Diffstat:
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ltm.c b/ltm.c
@@ -1,5 +1,5 @@
/*
-** $Id: ltm.c,v 2.17 2013/04/25 16:07:52 roberto Exp roberto $
+** $Id: ltm.c,v 2.18 2013/04/26 13:07:53 roberto Exp roberto $
** Tag methods
** See Copyright Notice in lua.h
*/
@@ -12,6 +12,7 @@
#include "lua.h"
+#include "ldebug.h"
#include "ldo.h"
#include "lobject.h"
#include "lstate.h"
@@ -106,6 +107,17 @@ int luaT_callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
}
+void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+ StkId res, TMS event) {
+ if (!luaT_callbinTM(L, p1, p2, res, event)) {
+ if (event == TM_CONCAT)
+ luaG_concaterror(L, p1, p2);
+ else
+ luaG_aritherror(L, p1, p2);
+ }
+}
+
+
const TValue *luaT_getequalTM (lua_State *L, Table *mt1, Table *mt2) {
const TValue *tm1 = fasttm(L, mt1, TM_EQ);
const TValue *tm2;
diff --git a/ltm.h b/ltm.h
@@ -1,5 +1,5 @@
/*
-** $Id: ltm.h,v 2.14 2013/04/25 16:07:52 roberto Exp roberto $
+** $Id: ltm.h,v 2.15 2013/04/26 13:07:53 roberto Exp roberto $
** Tag methods
** See Copyright Notice in lua.h
*/
@@ -59,6 +59,8 @@ LUAI_FUNC void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
const TValue *p2, TValue *p3, int hasres);
LUAI_FUNC int luaT_callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
StkId res, TMS event);
+LUAI_FUNC void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+ StkId res, TMS event);
LUAI_FUNC const TValue *luaT_getequalTM (lua_State *L, Table *mt1, Table *mt2);
LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
const TValue *p2, TMS event);