From: Mike Pall <mike>
Date: Sun, 20 Feb 2011 20:17:49 +0000 (+0100)
Subject: From Lua 5.2: Support load(string).
X-Git-Tag: v2.0.0-beta7~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d0b073ff0506b94fd0586f96ae6967cf8167290;p=thirdparty%2FLuaJIT.git

From Lua 5.2: Support load(string).
---

diff --git a/src/lib_base.c b/src/lib_base.c
index bac49a0b..2672a076 100644
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -373,8 +373,11 @@ static const char *reader_func(lua_State *L, void *ud, size_t *size)
 
 LJLIB_CF(load)
 {
-  GCstr *name = lj_lib_optstr(L, 2);
+  GCstr *name;
+  if (L->base < L->top && (tvisstr(L->base) || tvisnumber(L->base)))
+    return lj_cf_loadstring(L);
   lj_lib_checkfunc(L, 1);
+  name = lj_lib_optstr(L, 2);
   lua_settop(L, 3);  /* Reserve a slot for the string from the reader. */
   return load_aux(L,
 	   lua_load(L, reader_func, NULL, name ? strdata(name) : "=(load)"));