Changeset 268

Timestamp:

07/09/06 17:05:12 (2 years ago)

Author:

goodea

Message:

pseudo-official no float patch

Files:

• trunk/lib/lua51/linit.c (modified) (1 diff)
• trunk/lib/lua51/lmathlib.c (modified) (1 diff)
• trunk/lib/lua51/loslib.c (modified) (3 diffs)
• trunk/lib/lua51/lstrlib.c (modified) (2 diffs)
• trunk/lib/lua51/luaconf.h (modified) (5 diffs)
• trunk/lib/lua51/lvm.c (modified) (3 diffs)

trunk/lib/lua51/linit.c

@@ -22 +22 @@
-  {LUA_OSLIBNAME, luaopen_os},
-  {LUA_STRLIBNAME, luaopen_string},
+#if !defined LUA_NUMBER_INTEGRAL
-  {LUA_MATHLIBNAME, luaopen_math},
+#endif
-  {LUA_DBLIBNAME, luaopen_debug},
-  {NULL, NULL}

trunk/lib/lua51/lmathlib.c

@@ -253 +253 @@
-  lua_pushnumber(L, PI);
-  lua_setfield(L, -2, "pi");
+#if !defined LUA_NUMBER_INTEGRAL
-  lua_pushnumber(L, HUGE_VAL);
-  lua_setfield(L, -2, "huge");
+#endif
-#if defined(LUA_COMPAT_MOD)
-  lua_getfield(L, -1, "fmod");

trunk/lib/lua51/loslib.c

@@ -182 +182 @@
-
-
+#if !defined LUA_NUMBER_INTEGRAL
-static int os_difftime (lua_State *L) {
-  lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
@@ -187 +188 @@
-  return 1;
-}
+#endif
-
-/* }====================================================== */
@@ -211 +213 @@
-  {"clock",     os_clock},
-  {"date",      os_date},
+#if !defined LUA_NUMBER_INTEGRAL
-  {"difftime",  os_difftime},
+#endif
-  {"execute",   os_execute},
-  {"exit",      os_exit},

trunk/lib/lua51/lstrlib.c

@@ -785 +785 @@
-          break;
-        }
+#if !defined LUA_NUMBER_INTEGRAL
-        case 'e':  case 'E': case 'f':
-        case 'g': case 'G': {
@@ -790 +791 @@
-          break;
-        }
+#endif
-        case 'q': {
-          addquoted(L, &b, arg);

trunk/lib/lua51/luaconf.h

@@ -141 +141 @@
-** machines, ptrdiff_t gives a good choice between int or long.)
-*/
-
-
+
+
+
-
-/*
@@ -501 +502 @@
-*/
-
+/* Define LUA_NUMBER_INTEGRAL to produce a system that uses no
+   floating point operations by changing the type of Lua numbers from
+   double to long.  It implements division and modulus so that 
+
+   x == (x / y) * y + x % y.  
+   
+   The exponentiation function returns zero for negative exponents.
+   Defining LUA_NUMBER_INTEGRAL also removes the difftime function,
+   and the math module should not be used.  The string.format function
+   no longer handles the floating point directives %e, %E, %f, %g, and
+   %G. */
+
+#define LUA_NUMBER_INTEGRAL
+#if defined LUA_NUMBER_INTEGRAL
+#define LUA_NUMBER      long
+#else
-#define LUA_NUMBER_DOUBLE
-#define LUA_NUMBER      double
+#endif
-
-/*
@@ -508 +526 @@
-@* over a number.
-*/
-double
+LUA_NUMBER
-
-
@@ -518 +536 @@
-@@ lua_str2number converts a string to a number.
-*/
+#if defined LUA_NUMBER_INTEGRAL
+#define LUA_NUMBER_SCAN         "%ld"
+#define LUA_NUMBER_FMT          "%ld"
+#else
-#define LUA_NUMBER_SCAN         "%lf"
-#define LUA_NUMBER_FMT          "%.14g"
+#endif
-#define lua_number2str(s,n)     sprintf((s), LUA_NUMBER_FMT, (n))
-#define LUAI_MAXNUMBER2STR      32 /* 16 digits, sign, point, and \0 */
+#if defined LUA_NUMBER_INTEGRAL
+#define lua_str2number(s,p)     strtol((s), (p), 10)
+#else
-#define lua_str2number(s,p)     strtod((s), (p))
+#endif
-
-
@@ -533 +560 @@
-#define luai_numsub(a,b)        ((a)-(b))
-#define luai_nummul(a,b)        ((a)*(b))
+#if defined LUA_NUMBER_INTEGRAL
+#define luai_numdiv(a,b)        \
+  (-1/2?                        \
+   (a)/(b):                     \
+   ((a)<0==(b)<0||(a)%(b)==0?   \
+    (a)/(b):                    \
+    (a)/(b)-1))
+#define luai_nummod(a,b)        \
+  (-1/2?                        \
+   (a)%(b):                     \
+   ((a)<0==(b)<0||(a)%(b)==0?   \
+    (a)%(b):                    \
+    (a)%(b)+(b)))
+#define luai_lnumdiv(a,b)       \
+  ((b)==0?                      \
+   (luaG_runerror(L,"divide by zero"),0): \
+   luai_numdiv(a,b))
+#define luai_lnummod(a,b)       \
+  ((b)==0?                      \
+   (luaG_runerror(L,"modulo by zero"),0): \
+   luai_nummod(a,b))
+LUA_NUMBER luai_ipow(LUA_NUMBER, LUA_NUMBER);
+#define luai_numpow(a,b)        (luai_ipow(a,b))
+#else
-#define luai_numdiv(a,b)        ((a)/(b))
-#define luai_nummod(a,b)        ((a) - floor((a)/(b))*(b))
+#define luai_lnumdiv(a,b)       (luai_numdiv(a,b))
+#define luai_lnummod(a,b)       (luai_nummod(a,b))
-#define luai_numpow(a,b)        (pow(a,b))
+#endif
-#define luai_numunm(a)          (-(a))
-#define luai_numeq(a,b)         ((a)==(b))

trunk/lib/lua51/lvm.c

@@ -28 +28 @@
-
-
+#if defined LUA_NUMBER_INTEGRAL
+LUA_NUMBER luai_ipow(LUA_NUMBER a, LUA_NUMBER b) {
+  if (b < 0)
+    return 0;
+  else if (b == 0)
+    return 1;
+  else {
+    LUA_NUMBER c = 1;
+    for (;;) {
+      if (b & 1)
+        c *= a;
+      b = b >> 1;
+      if (b == 0)
+        return c;
+      a *= a;
+    }
+  }
+}
+#endif
-
-/* limit for table tag-method chains (to avoid loops) */
@@ -322 +341 @@
-      case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); break;
-      case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); break;
-
-
+l
+l
-      case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break;
-      case TM_UNM: setnvalue(ra, luai_numunm(nb)); break;
@@ -481 +500 @@
-      }
-      case OP_DIV: {
-
+l
-        continue;
-      }
-      case OP_MOD: {
-
+l
-        continue;
-      }