aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-04-29 13:57:48 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-04-29 13:57:48 -0300
commit00744a272908d9212fb1c82157260195d62fe81c (patch)
treeb1841b86b61ab3d6d026e02a9490aa5ac62bd2da
parentb4be5075784bcc8fed974bda4005425a9ccec1ba (diff)
downloadlua-00744a272908d9212fb1c82157260195d62fe81c.tar.gz
lua-00744a272908d9212fb1c82157260195d62fe81c.tar.bz2
lua-00744a272908d9212fb1c82157260195d62fe81c.zip
'luaO_arith' -> 'luaO_numarith'
-rw-r--r--lcode.c4
-rw-r--r--lobject.c4
-rw-r--r--lobject.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/lcode.c b/lcode.c
index 8aa18b49..f53722ff 100644
--- a/lcode.c
+++ b/lcode.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lcode.c,v 2.65 2013/04/25 19:35:19 roberto Exp $ 2** $Id: lcode.c,v 2.66 2013/04/26 13:07:53 roberto Exp roberto $
3** Code generator for Lua 3** Code generator for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -734,7 +734,7 @@ static int constfolding (OpCode op, expdesc *e1, expdesc *e2) {
734 if (!isnumeral(e1) || !isnumeral(e2)) return 0; 734 if (!isnumeral(e1) || !isnumeral(e2)) return 0;
735 if ((op == OP_DIV || op == OP_IDIV || op == OP_MOD) && e2->u.nval == 0) 735 if ((op == OP_DIV || op == OP_IDIV || op == OP_MOD) && e2->u.nval == 0)
736 return 0; /* do not attempt to divide by 0 */ 736 return 0; /* do not attempt to divide by 0 */
737 r = luaO_arith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval); 737 r = luaO_numarith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval);
738 e1->u.nval = r; 738 e1->u.nval = r;
739 return 1; 739 return 1;
740} 740}
diff --git a/lobject.c b/lobject.c
index aab98c66..1f028057 100644
--- a/lobject.c
+++ b/lobject.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lobject.c,v 2.59 2013/04/16 18:46:28 roberto Exp roberto $ 2** $Id: lobject.c,v 2.60 2013/04/25 13:53:13 roberto Exp roberto $
3** Some generic functions over Lua objects 3** Some generic functions over Lua objects
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -70,7 +70,7 @@ int luaO_ceillog2 (unsigned int x) {
70} 70}
71 71
72 72
73lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2) { 73lua_Number luaO_numarith (int op, lua_Number v1, lua_Number v2) {
74 switch (op) { 74 switch (op) {
75 case LUA_OPADD: return luai_numadd(NULL, v1, v2); 75 case LUA_OPADD: return luai_numadd(NULL, v1, v2);
76 case LUA_OPSUB: return luai_numsub(NULL, v1, v2); 76 case LUA_OPSUB: return luai_numsub(NULL, v1, v2);
diff --git a/lobject.h b/lobject.h
index 8e7916a1..90931a64 100644
--- a/lobject.h
+++ b/lobject.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lobject.h,v 2.73 2013/04/15 15:44:46 roberto Exp roberto $ 2** $Id: lobject.h,v 2.74 2013/04/16 18:46:28 roberto Exp roberto $
3** Type definitions for Lua objects 3** Type definitions for Lua objects
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -496,7 +496,7 @@ LUAI_DDEC const TValue luaO_nilobject_;
496LUAI_FUNC int luaO_int2fb (unsigned int x); 496LUAI_FUNC int luaO_int2fb (unsigned int x);
497LUAI_FUNC int luaO_fb2int (int x); 497LUAI_FUNC int luaO_fb2int (int x);
498LUAI_FUNC int luaO_ceillog2 (unsigned int x); 498LUAI_FUNC int luaO_ceillog2 (unsigned int x);
499LUAI_FUNC lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2); 499LUAI_FUNC lua_Number luaO_numarith (int op, lua_Number v1, lua_Number v2);
500LUAI_FUNC int luaO_str2d (const char *s, size_t len, lua_Number *result); 500LUAI_FUNC int luaO_str2d (const char *s, size_t len, lua_Number *result);
501LUAI_FUNC int luaO_str2int (const char *s, lua_Integer *result); 501LUAI_FUNC int luaO_str2int (const char *s, lua_Integer *result);
502LUAI_FUNC int luaO_hexavalue (int c); 502LUAI_FUNC int luaO_hexavalue (int c);