mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2025-04-14 00:42:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

new operation *t (for size of t) (may yet be removed...)

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2005-03-16 13:59:21 -03:00
parent 9ffae705ee
commit 04bbd01171
6 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcode.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lcode.c,v 2.10 2005/03/08 20:10:05 roberto Exp roberto $ ** $Id: lcode.c,v 2.11 2005/03/09 16:28:07 roberto Exp roberto $
** Code generator for Lua ** Code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -603,7 +603,8 @@ void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) { void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
if (op == OPR_MINUS) { switch (op) {
case OPR_MINUS: {
luaK_exp2val(fs, e); luaK_exp2val(fs, e);
if (e->k == VK && ttisnumber(&fs->f->k[e->info])) if (e->k == VK && ttisnumber(&fs->f->k[e->info]))
e->info = luaK_numberK(fs, luai_numunm(nvalue(&fs->f->k[e->info]))); e->info = luaK_numberK(fs, luai_numunm(nvalue(&fs->f->k[e->info])));
@ -613,9 +614,21 @@ void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
e->info = luaK_codeABC(fs, OP_UNM, 0, e->info, 0); e->info = luaK_codeABC(fs, OP_UNM, 0, e->info, 0);
e->k = VRELOCABLE; e->k = VRELOCABLE;
} }
break;
} }
else /* op == NOT */ case OPR_NOT: {
codenot(fs, e); codenot(fs, e);
break;
}
case OPR_SIZE: {
luaK_exp2anyreg(fs, e);
freeexp(fs, e);
e->info = luaK_codeABC(fs, OP_SIZ, 0, e->info, 0);
e->k = VRELOCABLE;
break;
}
default: lua_assert(0);
}
} }

4
lcode.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lcode.h,v 1.40 2004/10/04 19:01:53 roberto Exp roberto $ ** $Id: lcode.h,v 1.41 2005/03/08 18:00:16 roberto Exp roberto $
** Code generator for Lua ** Code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -34,7 +34,7 @@ typedef enum BinOpr {
#define binopistest(op) ((op) >= OPR_NE) #define binopistest(op) ((op) >= OPR_NE)
typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_NOUNOPR } UnOpr; typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_SIZE, OPR_NOUNOPR } UnOpr;
#define getcode(fs,e) ((fs)->f->code[(e)->info]) #define getcode(fs,e) ((fs)->f->code[(e)->info])

4
lopcodes.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lopcodes.c,v 1.30 2004/12/02 12:59:10 roberto Exp roberto $ ** $Id: lopcodes.c,v 1.31 2005/03/08 18:00:16 roberto Exp roberto $
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -36,6 +36,7 @@ const char *const luaP_opnames[NUM_OPCODES+1] = {
"POW", "POW",
"UNM", "UNM",
"NOT", "NOT",
"SIZ",
"CONCAT", "CONCAT",
"JMP", "JMP",
"EQ", "EQ",
@ -81,6 +82,7 @@ const lu_byte luaP_opmodes[NUM_OPCODES] = {
,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_POW */ ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_POW */
,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_UNM */ ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_UNM */
,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_NOT */ ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_NOT */
,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_SIZ */
,opmode(0, 1, OpArgR, OpArgR, iABC) /* OP_CONCAT */ ,opmode(0, 1, OpArgR, OpArgR, iABC) /* OP_CONCAT */
,opmode(0, 0, OpArgR, OpArgN, iAsBx) /* OP_JMP */ ,opmode(0, 0, OpArgR, OpArgN, iAsBx) /* OP_JMP */
,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */ ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */

3
lopcodes.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lopcodes.h,v 1.116 2005/03/08 20:10:05 roberto Exp roberto $ ** $Id: lopcodes.h,v 1.117 2005/03/09 16:28:07 roberto Exp roberto $
** Opcodes for Lua virtual machine ** Opcodes for Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -176,6 +176,7 @@ OP_MOD,/* A B C R(A) := RK(B) % RK(C) */
OP_POW,/* A B C R(A) := RK(B) ^ RK(C) */ OP_POW,/* A B C R(A) := RK(B) ^ RK(C) */
OP_UNM,/* A B R(A) := -R(B) */ OP_UNM,/* A B R(A) := -R(B) */
OP_NOT,/* A B R(A) := not R(B) */ OP_NOT,/* A B R(A) := not R(B) */
OP_SIZ,/* A B R(A) := size of R(B) */
OP_CONCAT,/* A B C R(A) := R(B).. ... ..R(C) */ OP_CONCAT,/* A B C R(A) := R(B).. ... ..R(C) */

3
lparser.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lparser.c,v 2.17 2005/03/08 20:10:05 roberto Exp roberto $ ** $Id: lparser.c,v 2.18 2005/03/09 16:28:07 roberto Exp roberto $
** Lua Parser ** Lua Parser
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -788,6 +788,7 @@ static UnOpr getunopr (int op) {
switch (op) { switch (op) {
case TK_NOT: return OPR_NOT; case TK_NOT: return OPR_NOT;
case '-': return OPR_MINUS; case '-': return OPR_MINUS;
case '*': return OPR_SIZE;
default: return OPR_NOUNOPR; default: return OPR_NOUNOPR;
} }
} }

17
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.31 2005/03/08 20:10:05 roberto Exp roberto $ ** $Id: lvm.c,v 2.32 2005/03/09 16:28:07 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -562,6 +562,21 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setbvalue(ra, res); setbvalue(ra, res);
continue; continue;
} }
case OP_SIZ: {
const TValue *rb = RB(i);
switch (ttype(rb)) {
case LUA_TTABLE:
setnvalue(ra, cast(lua_Number, luaH_getn(hvalue(rb))));
break;
case LUA_TSTRING:
setnvalue(ra, cast(lua_Number, tsvalue(rb)->len));
break;
default: /* no metamethod?? */
L->ci->savedpc = pc;
luaG_typeerror(L, rb, "get the size of");
}
continue;
}
case OP_CONCAT: { case OP_CONCAT: {
int b = GETARG_B(i); int b = GETARG_B(i);
int c = GETARG_C(i); int c = GETARG_C(i);