aboutsummaryrefslogtreecommitdiff
path: root/lvm.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2004-12-03 18:50:25 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2004-12-03 18:50:25 -0200
commitc78940f21a956064ac79f715af072e283538f35c (patch)
tree5a879991ef8d68bbfd437f35ab1da8b761bf9f14 /lvm.c
parent8b239eeba13877955b976ccd119ada038b67fa59 (diff)
downloadlua-c78940f21a956064ac79f715af072e283538f35c.tar.gz
lua-c78940f21a956064ac79f715af072e283538f35c.tar.bz2
lua-c78940f21a956064ac79f715af072e283538f35c.zip
static names do not need `luaX_' prefix
Diffstat (limited to 'lvm.c')
-rw-r--r--lvm.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lvm.c b/lvm.c
index b2845455..d98fcc7c 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.c,v 2.16 2004/10/28 17:45:51 roberto Exp $ 2** $Id: lvm.c,v 2.17 2004/11/01 15:06:50 roberto Exp roberto $
3** Lua virtual machine 3** Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -214,7 +214,7 @@ static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2,
214} 214}
215 215
216 216
217static int luaV_strcmp (const TString *ls, const TString *rs) { 217static int l_strcmp (const TString *ls, const TString *rs) {
218 const char *l = getstr(ls); 218 const char *l = getstr(ls);
219 size_t ll = ls->tsv.len; 219 size_t ll = ls->tsv.len;
220 const char *r = getstr(rs); 220 const char *r = getstr(rs);
@@ -243,21 +243,21 @@ int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
243 else if (ttisnumber(l)) 243 else if (ttisnumber(l))
244 return nvalue(l) < nvalue(r); 244 return nvalue(l) < nvalue(r);
245 else if (ttisstring(l)) 245 else if (ttisstring(l))
246 return luaV_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0; 246 return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
247 else if ((res = call_orderTM(L, l, r, TM_LT)) != -1) 247 else if ((res = call_orderTM(L, l, r, TM_LT)) != -1)
248 return res; 248 return res;
249 return luaG_ordererror(L, l, r); 249 return luaG_ordererror(L, l, r);
250} 250}
251 251
252 252
253static int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) { 253static int lessequal (lua_State *L, const TValue *l, const TValue *r) {
254 int res; 254 int res;
255 if (ttype(l) != ttype(r)) 255 if (ttype(l) != ttype(r))
256 return luaG_ordererror(L, l, r); 256 return luaG_ordererror(L, l, r);
257 else if (ttisnumber(l)) 257 else if (ttisnumber(l))
258 return nvalue(l) <= nvalue(r); 258 return nvalue(l) <= nvalue(r);
259 else if (ttisstring(l)) 259 else if (ttisstring(l))
260 return luaV_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0; 260 return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
261 else if ((res = call_orderTM(L, l, r, TM_LE)) != -1) /* first try `le' */ 261 else if ((res = call_orderTM(L, l, r, TM_LE)) != -1) /* first try `le' */
262 return res; 262 return res;
263 else if ((res = call_orderTM(L, r, l, TM_LT)) != -1) /* else try `lt' */ 263 else if ((res = call_orderTM(L, r, l, TM_LT)) != -1) /* else try `lt' */
@@ -568,7 +568,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
568 } 568 }
569 case OP_LE: { 569 case OP_LE: {
570 L->ci->savedpc = pc; 570 L->ci->savedpc = pc;
571 if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; /***/ 571 if (lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; /***/
572 else dojump(L, pc, GETARG_sBx(*pc) + 1); 572 else dojump(L, pc, GETARG_sBx(*pc) + 1);
573 base = L->base; 573 base = L->base;
574 continue; 574 continue;