GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-01-14 05:43:00 +08:00
Code Issues Projects Releases Wiki Activity

"order" and "concat" operations choose tag methods the same way that

Browse Source 
"arith" operations do (first the first parameter, etc).
This commit is contained in:
Roberto Ierusalimschy 1997-06-16 15:42:32 -03:00
parent c9a2dfeb2c
commit e4b69d6c9c
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
opcode.c
View File

@ -3,7 +3,7 @@
** TecCGraf - PUC-Rio ** TecCGraf - PUC-Rio
*/ */
char *rcs_opcode="$Id: opcode.c,v 4.8 1997/06/12 18:27:29 roberto Exp roberto $"; char *rcs_opcode="$Id: opcode.c,v 4.9 1997/06/16 16:50:22 roberto Exp roberto $";
#include <setjmp.h> #include <setjmp.h>
#include <stdio.h> #include <stdio.h>
@ -466,9 +466,7 @@ void lua_travstack (int (*fn)(TObject *))
static void lua_message (char *s) static void lua_message (char *s)
{ {
TObject *im = luaI_geterrorim(); TObject *im = luaI_geterrorim();
if (ttype(im) == LUA_T_NIL) if (ttype(im) != LUA_T_NIL) {
fprintf(stderr, "lua: %s\n", s);
else {
lua_pushstring(s); lua_pushstring(s);
callIM(im, 1, 0); callIM(im, 1, 0);
} }
@ -1008,7 +1006,7 @@ void luaI_gcIM (TObject *o)
} }
static void call_arith (IMS event) static void call_binTM (IMS event, char *msg)
{ {
TObject *im = luaI_getimbyObj(top-2, event); /* try first operand */ TObject *im = luaI_getimbyObj(top-2, event); /* try first operand */
if (ttype(im) == LUA_T_NIL) { if (ttype(im) == LUA_T_NIL) {
@ -1016,29 +1014,19 @@ static void call_arith (IMS event)
if (ttype(im) == LUA_T_NIL) { if (ttype(im) == LUA_T_NIL) {
im = luaI_getim(0, event); /* try a 'global' i.m. */ im = luaI_getim(0, event); /* try a 'global' i.m. */
if (ttype(im) == LUA_T_NIL) if (ttype(im) == LUA_T_NIL)
lua_error("unexpected type at arithmetic operation"); lua_error(msg);
} }
} }
lua_pushstring(luaI_eventname[event]); lua_pushstring(luaI_eventname[event]);
callIM(im, 3, 1); callIM(im, 3, 1);
} }
static void concim (TObject *o)
static void call_arith (IMS event)
{ {
TObject *im = luaI_getimbyObj(o, IM_CONCAT); call_binTM(event, "unexpected type at arithmetic operation");
if (ttype(im) == LUA_T_NIL)
lua_error("unexpected type at conversion to string");
callIM(im, 2, 1);
} }
static void ordim (TObject *o, IMS event)
{
TObject *im = luaI_getimbyObj(o, event);
if (ttype(im) == LUA_T_NIL)
lua_error("unexpected type at comparison");
lua_pushstring(luaI_eventname[event]);
callIM(im, 3, 1);
}
static void comparison (lua_Type ttype_less, lua_Type ttype_equal, static void comparison (lua_Type ttype_less, lua_Type ttype_equal,
lua_Type ttype_great, IMS op) lua_Type ttype_great, IMS op)
@ -1048,16 +1036,12 @@ static void comparison (lua_Type ttype_less, lua_Type ttype_equal,
int result; int result;
if (ttype(l) == LUA_T_NUMBER && ttype(r) == LUA_T_NUMBER) if (ttype(l) == LUA_T_NUMBER && ttype(r) == LUA_T_NUMBER)
result = (nvalue(l) < nvalue(r)) ? -1 : (nvalue(l) == nvalue(r)) ? 0 : 1; result = (nvalue(l) < nvalue(r)) ? -1 : (nvalue(l) == nvalue(r)) ? 0 : 1;
else if (tostring(l)) { else if (ttype(l) == LUA_T_STRING && ttype(r) == LUA_T_STRING)
ordim(l, op);
return;
}
else if (tostring(r)) {
ordim(r, op);
return;
}
else
result = strcmp(svalue(l), svalue(r)); result = strcmp(svalue(l), svalue(r));
else {
call_binTM(op, "unexpected type at comparison");
return;
}
top--; top--;
nvalue(top-1) = 1; nvalue(top-1) = 1;
ttype(top-1) = (result < 0) ? ttype_less : ttype(top-1) = (result < 0) ? ttype_less :
@ -1372,10 +1356,8 @@ static StkId lua_execute (Byte *pc, StkId base)
case CONCOP: { case CONCOP: {
TObject *l = top-2; TObject *l = top-2;
TObject *r = top-1; TObject *r = top-1;
if (tostring(l)) /* first argument is not a string */ if (tostring(l) || tostring(r))
concim(l); call_binTM(IM_CONCAT, "unexpected type for concatenation");
else if (tostring(r)) /* second argument is not a string */
concim(r);
else { else {
tsvalue(l) = lua_createstring(lua_strconc(svalue(l),svalue(r))); tsvalue(l) = lua_createstring(lua_strconc(svalue(l),svalue(r)));
--top; --top;