History

Lua 5.1.3-rc4

Lua Team committed 18 years ago

Commit ebb42b71 parent 17b8e884 files · +32 −19Browse files

Unified · Split

4 files
  1. doc/contents.html +2 −1
  2. etc/luavs.bat +24 −11
  3. src/Makefile +3 −3
  4. src/lbaselib.c +3 −4
doc/contents.html+2−1
@@ -384,6 +384,7 @@ Freely available under the terms of the · 383 unmodified lines
384<A HREF="manual.html#lua_pushfstring">lua_pushfstring</A><BR>384<A HREF="manual.html#lua_pushfstring">lua_pushfstring</A><BR>
385<A HREF="manual.html#lua_pushinteger">lua_pushinteger</A><BR>385<A HREF="manual.html#lua_pushinteger">lua_pushinteger</A><BR>
386<A HREF="manual.html#lua_pushlightuserdata">lua_pushlightuserdata</A><BR>386<A HREF="manual.html#lua_pushlightuserdata">lua_pushlightuserdata</A><BR>
387<A HREF="manual.html#lua_pushliteral">lua_pushliteral</A><BR>
387<A HREF="manual.html#lua_pushlstring">lua_pushlstring</A><BR>388<A HREF="manual.html#lua_pushlstring">lua_pushlstring</A><BR>
388<A HREF="manual.html#lua_pushnil">lua_pushnil</A><BR>389<A HREF="manual.html#lua_pushnil">lua_pushnil</A><BR>
389<A HREF="manual.html#lua_pushnumber">lua_pushnumber</A><BR>390<A HREF="manual.html#lua_pushnumber">lua_pushnumber</A><BR>
@@ -488,7 +489,7 @@ Freely available under the terms of the · 98 unmodified lines
488<HR>489<HR>
489<SMALL>490<SMALL>
490Last update:491Last update:
491Fri Jan 18 10:36:25 BRST 2008492Sat Jan 19 13:24:29 BRST 2008
492</SMALL>493</SMALL>
493<!--494<!--
494Last change: revised for Lua 5.1.3495Last change: revised for Lua 5.1.3
etc/luavs.bat+24−11
@@ -1,15 +1,28 @@
1rem script to build Lua under "Visual Studio .NET Command Prompt".1@rem Script to build Lua under "Visual Studio .NET Command Prompt".
2rem do not run it from this directory, run it from the toplevel: etc\luavs.bat2@rem Do not run from this directory; run it from the toplevel: etc\luavs.bat .
3rem it creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src.3@rem It creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src.
4@rem David Manura <dm.lua@math2.org> and Mike Pall <mikelu-0801@mike.de>
5
6@setlocal
7@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE
8@set MYLINK=link /nologo
9@set MYMT=mt /nologo
4 10
5cd src11cd src
6cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL l*.c12%MYCOMPILE% /DLUA_BUILD_AS_DLL l*.c
7del lua.obj luac.obj13del lua.obj luac.obj
8link /DLL /out:lua51.dll l*.obj14%MYLINK% /DLL /out:lua51.dll l*.obj
9cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL lua.c15if exist lua51.dll.manifest^
10link /out:lua.exe lua.obj lua51.lib16 %MYMT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2
11cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE l*.c print.c17%MYCOMPILE% /DLUA_BUILD_AS_DLL lua.c
12del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj loslib.obj ltablib.obj lstrlib.obj loadlib.obj18%MYLINK% /out:lua.exe lua.obj lua51.lib
13link /out:luac.exe *.obj19if exist lua.exe.manifest^
14del *.obj20 %MYMT% -manifest lua.exe.manifest -outputresource:lua.exe
21%MYCOMPILE% l*.c print.c
22del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj^
23 loslib.obj ltablib.obj lstrlib.obj loadlib.obj
24%MYLINK% /out:luac.exe *.obj
25if exist luac.exe.manifest^
26 %MYMT% -manifest luac.exe.manifest -outputresource:luac.exe
27del *.obj *.manifest
15cd ..28cd ..
src/Makefile+3−3
@@ -99,9 +99,9 @@ linux: · 98 unmodified lines
99 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"99 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
100 100
101macosx:101macosx:
102 $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX102 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
103# use this on Mac OS X 10.4103# use this on Mac OS X 10.3-
104# $(MAKE) all MYCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline"104# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
105 105
106mingw:106mingw:
107 $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \107 $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
src/lbaselib.c+3−4
@@ -1,5 +1,5 @@
1/*1/*
2** $Id: lbaselib.c,v 1.191.1.3 2008/01/03 15:20:39 roberto Exp $2** $Id: lbaselib.c,v 1.191.1.4 2008/01/20 13:53:22 roberto Exp $
3** Basic library3** Basic library
4** See Copyright Notice in lua.h4** See Copyright Notice in lua.h
5*/5*/
@@ -595,9 +595,8 @@ static int luaB_yield (lua_State *L) { · 589 unmodified lines
595 595
596static int luaB_corunning (lua_State *L) {596static int luaB_corunning (lua_State *L) {
597 if (lua_pushthread(L))597 if (lua_pushthread(L))
598 return 0; /* main thread is not a coroutine */598 lua_pushnil(L); /* main thread is not a coroutine */
599 else599 return 1;
600 return 1;
601}600}
602 601
603 602