Lua 5.1.2-rc3

Lua Team committed 19 years ago

Commit f4079ca1 parent de7f97f7 files · +30 −27Browse files

Showing the changes to src (3 of 7 files). Show all

Unified · Split

3 files

src/loadlib.c +14 −13
src/lvm.c +2 −2
src/print.c +1 −2

 /*
-** $Id: loadlib.c,v 1.52 2006/04/10 18:27:23 roberto Exp $
+** $Id: loadlib.c,v 1.54a 2006/07/03 20:16:49 roberto Exp $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
 #define loadlib_c
 #define LUA_LIB
-#include "lauxlib.h"
-#include "lobject.h"
 #include "lua.h"
+#include "lauxlib.h"
 #include "lualib.h"
   path = lua_tostring(L, -1);
   if (path == NULL)
     luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
-  lua_pushstring(L, "");  /* error accumulator */
+  lua_pushliteral(L, "");  /* error accumulator */
   while ((path = pushnexttemplate(L, path)) != NULL) {
     const char *filename;
     filename = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name);
+    lua_remove(L, -2);  /* remove path template */
     if (readable(filename))  /* does file exist and is readable? */
       return filename;  /* return that file name */
-    lua_pop(L, 2);  /* remove path template and file name */
+    lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
-    luaO_pushfstring(L, "\n\tno file " LUA_QS, filename);
+    lua_remove(L, -2);  /* remove file name */
-    lua_concat(L, 2);
+    lua_concat(L, 2);  /* add entry to possible error message */
   }
   return NULL;  /* not found */
 }
   funcname = mkfuncname(L, name);
   if ((stat = ll_loadfunc(L, filename, funcname)) != 0) {
     if (stat != ERRFUNC) loaderror(L, filename);  /* real error */
-    luaO_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
+    lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
-                        name, filename);
+                       name, filename);
     return 1;  /* function not found */
   }
   return 1;
     luaL_error(L, LUA_QL("package.preload") " must be a table");
   lua_getfield(L, -1, name);
   if (lua_isnil(L, -1))  /* not found? */
-    luaO_pushfstring(L, "\n\tno field package.preload['%s']", name);
+    lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
   return 1;
 }
   lua_getfield(L, LUA_ENVIRONINDEX, "loaders");
   if (!lua_istable(L, -1))
     luaL_error(L, LUA_QL("package.loaders") " must be a table");
-  lua_pushstring(L, "");  /* error message accumulator */
+  lua_pushliteral(L, "");  /* error message accumulator */
   for (i=1; ; i++) {
     lua_rawgeti(L, -2, i);  /* get a loader */
     if (lua_isnil(L, -1))
   setpath(L, "path", LUA_PATH, LUA_PATH_DEFAULT);  /* set field `path' */
   setpath(L, "cpath", LUA_CPATH, LUA_CPATH_DEFAULT); /* set field `cpath' */
   /* store config information */
-  lua_pushstring(L, LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n"
+  lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n"
-                    LUA_EXECDIR "\n" LUA_IGMARK);
+                     LUA_EXECDIR "\n" LUA_IGMARK);
   lua_setfield(L, -2, "config");
   /* set field `loaded' */
   luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 2);

src/lvm.c+2−2

src/print.c+1−2

 static void PrintString(const TString* ts)
 {
  const char* s=getstr(ts);
- int n=ts->tsv.len;
+ size_t i,n=ts->tsv.len;
- int i;
  putchar('"');
  for (i=0; i<n; i++)
  {

Lua 5.1.2-rc3

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -165,7 +165,7 @@ static int call_binTM (lua_State L, const TValue p1, const TValue *p2, · 164 unmodified lines
165	const TValue tm = luaT_gettmbyobj(L, p1, event); / try first operand */	165	const TValue tm = luaT_gettmbyobj(L, p1, event); / try first operand */
166	if (ttisnil(tm))	166	if (ttisnil(tm))
167	tm = luaT_gettmbyobj(L, p2, event); /* try second operand */	167	tm = luaT_gettmbyobj(L, p2, event); /* try second operand */
168	if (!ttisfunction(tm)) return 0;	168	if (ttisnil(tm)) return 0;
169	callTMres(L, res, tm, p1, p2);	169	callTMres(L, res, tm, p1, p2);
170	return 1;	170	return 1;
171	}	171	}
@@ -285,7 +285,7 @@ void luaV_concat (lua_State *L, int total, int last) { · 113 unmodified lines
285	if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))	285	if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))
286	luaG_concaterror(L, top-2, top-1);	286	luaG_concaterror(L, top-2, top-1);
287	} else if (tsvalue(top-1)->len == 0) /* second op is empty? */	287	} else if (tsvalue(top-1)->len == 0) /* second op is empty? */
288	tostring(L, top - 2); /* result is first op (as string) */	288	(void)tostring(L, top - 2); /* result is first op (as string) */
289	else {	289	else {
290	/* at least two string values; get as many as possible */	290	/* at least two string values; get as many as possible */
291	size_t tl = tsvalue(top-1)->len;	291	size_t tl = tsvalue(top-1)->len;