Lua 5.3.0-work3

Lua Team committed 12 years ago

Commit f8a66271 parent ad386d945 files · +2323 −1590Browse files

Showing the changes to src/lcode.c (1 of 45 files). Show all

Unified · Split

 /*
-** $Id: lcode.c,v 2.85 2014/03/21 13:52:33 roberto Exp $
+** $Id: lcode.c,v 2.90 2014/05/08 18:58:46 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
       if (v) setivalue(v, e->u.ival);
       return 1;
     case VKFLT:
-      if (v) setnvalue(v, e->u.nval);
+      if (v) setfltvalue(v, e->u.nval);
       return 1;
     default: return 0;
   }
 }
-LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level) {
+void luaK_patchclose (FuncState *fs, int list, int level) {
   level++;  /* argument is +1 to reserve 0 as non-op */
   while (list != NO_JUMP) {
     int next = getjump(fs, list);
   TValue *idx = luaH_set(L, fs->ls->h, key);  /* index scanner table */
   int k, oldsize;
   if (ttisinteger(idx)) {  /* is there an index there? */
-    k = ivalue(idx);
+    k = cast_int(ivalue(idx));
     /* correct value? (warning: must distinguish floats from integers!) */
     if (k < fs->nk && ttype(&f->k[k]) == ttype(v) &&
                       luaV_rawequalobj(&f->k[k], v))
 /*
-** use userdata as key to avoid collision with float with same value;
+** Integers use userdata as keys to avoid collision with floats with same
-** conversion to 'void*' used only for hash, no "precision" problems
+** value; conversion to 'void*' used only for hashing, no "precision"
+** problems
 */
 int luaK_intK (FuncState *fs, lua_Integer n) {
   TValue k, o;
 /*
 ** Both NaN and -0.0 should not go to the constant table, as they have
-** problems with the hashing. (NaN is not ** a valid key,
+** problems with the hashing. (NaN is not a valid key, -0.0 collides
-** -0.0 collides with +0.0.)
+** with +0.0.)
 */
 static int luaK_numberK (FuncState *fs, lua_Number r) {
   TValue o;
   lua_assert(!luai_numisnan(r) && !isminuszero(r));
-  setnvalue(&o, r);
+  setfltvalue(&o, r);
   return addk(fs, &o, &o);
 }
       return (tointeger(v1, &i) && tointeger(v2, &i));
     case LUA_OPMOD:  /* integer module by 0 */
       return !(ttisinteger(v1) && ttisinteger(v2) && ivalue(v2) == 0);
-    case LUA_OPPOW:  /* negative integer exponentiation */
-      return !(ttisinteger(v1) && ttisinteger(v2) && ivalue(v2) < 0);
     default: return 1;  /* everything else is valid */
   }
 }