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
384384 <A HREF="manual.html#lua_pushfstring">lua_pushfstring</A><BR>
385385 <A HREF="manual.html#lua_pushinteger">lua_pushinteger</A><BR>
386386 <A HREF="manual.html#lua_pushlightuserdata">lua_pushlightuserdata</A><BR>
387+<A HREF="manual.html#lua_pushliteral">lua_pushliteral</A><BR>
387388 <A HREF="manual.html#lua_pushlstring">lua_pushlstring</A><BR>
388389 <A HREF="manual.html#lua_pushnil">lua_pushnil</A><BR>
389390 <A HREF="manual.html#lua_pushnumber">lua_pushnumber</A><BR>
@@ -488,7 +489,7 @@ Freely available under the terms of the · 98 unmodified lines
488489 <HR>
489490 <SMALL>
490491 Last update:
491−Fri Jan 18 10:36:25 BRST 2008
492+Sat Jan 19 13:24:29 BRST 2008
492493 </SMALL>
493494 <!--
494495 Last change: revised for Lua 5.1.3
etc/luavs.bat+24−11
@@ -1,15 +1,28 @@
1−rem script to build Lua under "Visual Studio .NET Command Prompt".
2−rem do not run it from this directory, run it from the toplevel: etc\luavs.bat
3−rem it creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src.
1+@rem Script to build Lua under "Visual Studio .NET Command Prompt".
2+@rem Do not run from this directory; run it from the toplevel: etc\luavs.bat .
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
410
511 cd src
6−cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL l*.c
12+%MYCOMPILE% /DLUA_BUILD_AS_DLL l*.c
713 del lua.obj luac.obj
8−link /DLL /out:lua51.dll l*.obj
9−cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL lua.c
10−link /out:lua.exe lua.obj lua51.lib
11−cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE l*.c print.c
12−del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj loslib.obj ltablib.obj lstrlib.obj loadlib.obj
13−link /out:luac.exe *.obj
14−del *.obj
14+%MYLINK% /DLL /out:lua51.dll l*.obj
15+if exist lua51.dll.manifest^
16+ %MYMT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2
17+%MYCOMPILE% /DLUA_BUILD_AS_DLL lua.c
18+%MYLINK% /out:lua.exe lua.obj lua51.lib
19+if exist lua.exe.manifest^
20+ %MYMT% -manifest lua.exe.manifest -outputresource:lua.exe
21+%MYCOMPILE% l*.c print.c
22+del 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
25+if exist luac.exe.manifest^
26+ %MYMT% -manifest luac.exe.manifest -outputresource:luac.exe
27+del *.obj *.manifest
1528 cd ..
src/Makefile+3−3
@@ -99,9 +99,9 @@ linux: · 98 unmodified lines
9999 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
100100
101101 macosx:
102− $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
103−# use this on Mac OS X 10.4
104−# $(MAKE) all MYCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline"
102+ $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
103+# use this on Mac OS X 10.3-
104+# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
105105
106106 mingw:
107107 $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
src/lbaselib.c+3−4
@@ -1,5 +1,5 @@
11 /*
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 $
33 ** Basic library
44 ** See Copyright Notice in lua.h
55 */
@@ -595,9 +595,8 @@ static int luaB_yield (lua_State *L) { · 589 unmodified lines
595595
596596 static int luaB_corunning (lua_State *L) {
597597 if (lua_pushthread(L))
598− return 0; /* main thread is not a coroutine */
599− else
600− return 1;
598+ lua_pushnil(L); /* main thread is not a coroutine */
599+ return 1;
601600 }
602601
603602