Permalink
Browse files

Updated to Lua 5.2.1

  • Loading branch information...
drahosp committed Jun 15, 2012
1 parent 0c08582 commit 47bda2e9009c8d290dba0943d437768bddd533d9
Showing with 1,121 additions and 773 deletions.
  1. +24 −54 CMakeLists.txt
  2. +1 −1 Makefile
  3. +1 −3 README.md
  4. +1 −1 dist.info
  5. +4 −4 doc/contents.html
  6. +5 −5 doc/lua.css
  7. +2 −2 doc/manual.css
  8. +147 −119 doc/manual.html
  9. +4 −13 doc/readme.html
  10. +1 −1 src/Makefile
  11. +10 −10 src/lapi.c
  12. +10 −9 src/lauxlib.c
  13. +2 −1 src/lbaselib.c
  14. +3 −2 src/lcorolib.c
  15. +14 −7 src/ldblib.c
  16. +8 −5 src/ldebug.c
  17. +15 −17 src/ldo.c
  18. +4 −3 src/ldump.c
  19. +5 −15 src/lfunc.c
  20. +2 −3 src/lfunc.h
  21. +279 −177 src/lgc.c
  22. +9 −1 src/lgc.h
  23. +19 −8 src/llex.c
  24. +12 −5 src/llimits.h
  25. +6 −6 src/lmathlib.c
  26. +1 −17 src/lmem.c
  27. +54 −43 src/loadlib.c
  28. +44 −31 src/lobject.h
  29. +2 −1 src/lopcodes.c
  30. +9 −8 src/loslib.c
  31. +84 −69 src/lparser.c
  32. +3 −3 src/lparser.h
  33. +39 −3 src/lstate.c
  34. +14 −6 src/lstate.h
  35. +93 −22 src/lstring.c
  36. +13 −4 src/lstring.h
  37. +19 −16 src/lstrlib.c
  38. +18 −9 src/ltable.c
  39. +13 −18 src/lua.c
  40. +4 −4 src/lua.h
  41. +66 −8 src/luaconf.h.in
  42. +26 −12 src/lundump.c
  43. +2 −2 src/lundump.h
  44. +27 −23 src/lvm.c
  45. +2 −2 src/lzio.c
View
@@ -1,11 +1,11 @@
-# Copyright (C) 2007-2011 LuaDist.
+# Copyright (C) 2007-2012 LuaDist.
# Created by Peter Drahoš, Peter Kapec
# Redistribution and use of this file is allowed according to the terms of the MIT license.
# For details see the COPYRIGHT file distributed with LuaDist.
# Please note that the package source code is licensed under its own license.
project ( lua C )
-cmake_minimum_required ( VERSION 2.6 )
+cmake_minimum_required ( VERSION 2.8 )
include ( cmake/dist.cmake )
## CONFIGURATION
@@ -20,7 +20,6 @@ option ( LUA_COMPAT_ALL "Enable backwards compatibility options." ON )
set ( LUA_IDSIZE 60 CACHE NUMBER "gives the maximum size for the description of the source." )
#2DO: LUAI_* and LUAL_* settings, for now defaults are used.
-
set ( LUA_DIRSEP "/" )
set ( LUA_MODULE_SUFFIX ${CMAKE_SHARED_MODULE_SUFFIX} )
set ( LUA_LDIR ${INSTALL_LMOD} )
@@ -29,10 +28,10 @@ set ( LUA_CDIR ${INSTALL_CMOD} )
if ( LUA_USE_RELATIVE_LOADLIB )
# This will set up relative paths to lib
string ( REGEX REPLACE "[^!/]+" ".." LUA_DIR "!/${INSTALL_BIN}/" )
-else ()
+else ( )
# Direct path to installation
- set ( LUA_DIR ${CMAKE_INSTALL_PREFIX} CACHE STRING "Destination from which modules will be resolved. See INSTALL_LMOD and INSTALL_CMOD.")
-endif ()
+ set ( LUA_DIR ${CMAKE_INSTALL_PREFIX} CACHE STRING "Destination from which modules will be resolved. See INSTALL_LMOD and INSTALL_CMOD." )
+endif ( )
set ( LUA_PATH_DEFAULT "./?.lua;${LUA_DIR}${LUA_LDIR}/?.lua;${LUA_DIR}${LUA_LDIR}/?/init.lua" )
set ( LUA_CPATH_DEFAULT "./?${LUA_MODULE_SUFFIX};${LUA_DIR}${LUA_CDIR}/?${LUA_MODULE_SUFFIX};${LUA_DIR}${LUA_CDIR}/loadall${LUA_MODULE_SUFFIX}" )
@@ -42,108 +41,79 @@ if ( WIN32 AND NOT CYGWIN )
option ( LUA_WIN "Windows specific build." ON )
option ( LUA_BUILD_AS_DLL "Build Lua library as Dll." ON )
# Paths (Double escapes needed)
- set ( LUA_DIRSEP "\\\\" )
- string ( REPLACE "/" ${LUA_DIRSEP} LUA_DIR "${LUA_DIR}" )
+ set ( LUA_DIRSEP "\\\\" ) string ( REPLACE " /" ${LUA_DIRSEP} LUA_DIR "${LUA_DIR}" )
string ( REPLACE "/" ${LUA_DIRSEP} LUA_LDIR "${LUA_LDIR}" )
string ( REPLACE "/" ${LUA_DIRSEP} LUA_CDIR "${LUA_CDIR}" )
string ( REPLACE "/" ${LUA_DIRSEP} LUA_PATH_DEFAULT "${LUA_PATH_DEFAULT}" )
string ( REPLACE "/" ${LUA_DIRSEP} LUA_CPATH_DEFAULT "${LUA_CPATH_DEFAULT}" )
-else ()
+else ( )
# Posix systems (incl. Cygwin)
option ( LUA_USE_POSIX "Use POSIX functionality." ON )
option ( LUA_USE_DLOPEN "Use dynamic linker to load modules." ON )
option ( LUA_USE_MKSTEMP "Use mkstep." ON )
option ( LUA_USE_ISATTY "Use tty." ON )
option ( LUA_USE_POPEN "Use popen." ON )
- option ( LUA_USE_ULONGJMP "Use ulongjmp" ON)
+ option ( LUA_USE_ULONGJMP "Use ulongjmp" ON )
option ( LUA_USE_STRTODHEX "assume 'strtod' handles hexa formats" ON )
option ( LUA_USE_AFORMAT "assume 'printf' handles 'aA' specifiers" ON )
- option ( LUA_USE_LONGLONG "assume support for long long" ON)
-endif ()
+ option ( LUA_USE_LONGLONG "assume support for long long" ON )
+endif ( )
## SETUP
# Optional libraries
find_package ( Readline )
if ( READLINE_FOUND )
option ( LUA_USE_READLINE "Use readline in the Lua CLI." ON )
-endif ()
+endif ( )
find_package ( Curses )
if ( CURSES_FOUND )
option ( LUA_USE_CURSES "Use curses in the Lua CLI." ON )
-endif ()
+endif ( )
# Setup needed variables and libraries
if ( LUA_USE_POSIX )
# On POSIX Lua links to standard math library "m"
list ( APPEND LIBS m )
-endif ()
+endif ( )
if ( LUA_USE_DLOPEN )
# Link to dynamic linker library "dl"
list ( APPEND LIBS dl )
-endif ()
+endif ( )
if ( LUA_USE_READLINE )
# Add readline
include_directories ( ${READLINE_INCLUDE_DIR} )
list ( APPEND LIBS ${READLINE_LIBRARY} )
-endif ()
+endif ( )
if ( LUA_USE_CURSES )
# Add curses
include_directories ( ${CURSES_INCLUDE_DIR} )
list ( APPEND LIBS ${CURSES_LIBRARY} )
-endif ()
+endif ( )
## SOURCES
# Generate luaconf.h
configure_file ( src/luaconf.h.in ${CMAKE_CURRENT_BINARY_DIR}/luaconf.h )
# Sources and headers
include_directories ( src ${CMAKE_CURRENT_BINARY_DIR} )
-set ( SRC_CORE
- src/lapi.c
- src/lcode.c
- src/lctype.c
- src/ldebug.c
- src/ldo.c
- src/ldump.c
- src/lfunc.c
- src/lgc.c
- src/llex.c
- src/lmem.c
- src/lobject.c
- src/lopcodes.c
- src/lparser.c
- src/lstate.c
- src/lstring.c
- src/ltable.c
- src/ltm.c
- src/lundump.c
- src/lvm.c
- src/lzio.c)
-set ( SRC_LIB
- src/lauxlib.c
- src/lbaselib.c
- src/lbitlib.c
- src/lcorolib.c
- src/ldblib.c
- src/liolib.c
- src/lmathlib.c
- src/loslib.c
- src/lstrlib.c
- src/ltablib.c
- src/linit.c)
+set ( SRC_CORE src/lapi.c src/lcode.c src/lctype.c src/ldebug.c src/ldo.c src/ldump.c
+ src/lfunc.c src/lgc.c src/llex.c src/lmem.c src/lobject.c src/lopcodes.c src/lparser.c
+ src/lstate.c src/lstring.c src/ltable.c src/ltm.c src/lundump.c src/lvm.c src/lzio.c )
+set ( SRC_LIB src/lauxlib.c src/lbaselib.c src/lbitlib.c src/lcorolib.c src/ldblib.c
+ src/liolib.c src/lmathlib.c src/loslib.c src/lstrlib.c src/ltablib.c src/linit.c )
set ( SRC_LUA src/lua.c )
set ( SRC_LUAC src/luac.c )
if ( LUA_USE_RELATIVE_LOADLIB )
# Use modified loadlib
list ( APPEND SRC_LIB src/loadlib_rel.c )
-else ()
+else ( )
list ( APPEND SRC_LIB src/loadlib.c )
-endif ()
+endif ( )
## BUILD
# Create lua library
@@ -161,7 +131,7 @@ install_executable ( lua luac )
install_library ( liblua )
install_data ( README.md )
#install_lua_module ( strict etc/strict.lua )
-install_header (src/lua.h src/lualib.h src/lauxlib.h ${CMAKE_CURRENT_BINARY_DIR}/luaconf.h )
+install_header ( src/lua.h src/lualib.h src/lauxlib.h ${CMAKE_CURRENT_BINARY_DIR}/luaconf.h )
install_doc ( doc/ )
install_foo ( etc/ )
#install_test ( test/ )
View
@@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1
# Lua version and release.
V= 5.2
-R= $V.0
+R= $V.1
# Targets start here.
all: $(PLAT)
View
@@ -1,9 +1,7 @@
-This is Lua 5.2, released on 12 Dec 2011.
+This is Lua 5.2.1, released on 08 Jun 2012.
================
-[![Build Status](https://secure.travis-ci.org/LuaDist/lua.png?branch=master)](http://travis-ci.org/LuaDist/lua)
-
For installation instructions, license details, and
further information about Lua, see doc/readme.html.
View
@@ -1,7 +1,7 @@
--- This file is part of LuaDist project
name = "lua"
-version = "5.2"
+version = "5.2.1"
desc = "Lua is a powerful, fast, light-weight, embeddable scripting language."
author = "Roberto Ierusalimschy, Waldemar Celes, Luiz Henrique de Figueiredo"
View
@@ -33,9 +33,9 @@ <H1>
<A HREF="#index">index</A>
<HR>
<SMALL>
-Copyright &copy; 2011 Lua.org, PUC-Rio.
+Copyright &copy; 2011&ndash;2012 Lua.org, PUC-Rio.
Freely available under the terms of the
-<A HREF="http://www.lua.org/license.html#5">Lua license</A>.
+<A HREF="http://www.lua.org/license.html">Lua license</A>.
</SMALL>
<H2><A NAME="contents">Contents</A></H2>
@@ -521,10 +521,10 @@ <H3>auxiliary library</H3>
<HR>
<SMALL CLASS="footer">
Last update:
-Tue Nov 29 22:30:23 BRST 2011
+Sat May 26 08:52:25 BRT 2012
</SMALL>
<!--
-Last change: revised for Lua 5.2.0
+Last change: revised for Lua 5.2.1
-->
</BODY>
View
@@ -3,8 +3,8 @@ body {
background-color: #FFFFFF ;
font-family: Helvetica, Arial, sans-serif ;
text-align: justify ;
- margin-right: 20px ;
- margin-left: 20px ;
+ margin-right: 30px ;
+ margin-left: 30px ;
}
h1, h2, h3, h4 {
@@ -16,9 +16,9 @@ h1, h2, h3, h4 {
h2 {
padding-top: 0.4em ;
padding-bottom: 0.4em ;
- padding-left: 20px ;
- padding-right: 20px ;
- margin-left: -20px ;
+ padding-left: 30px ;
+ padding-right: 30px ;
+ margin-left: -30px ;
background-color: #E0E0FF ;
}
View
@@ -18,7 +18,7 @@ span.apii {
p+h1, ul+h1 {
padding-top: 0.4em ;
padding-bottom: 0.4em ;
- padding-left: 20px ;
- margin-left: -20px ;
+ padding-left: 30px ;
+ margin-left: -30px ;
background-color: #E0E0FF ;
}
Oops, something went wrong.

0 comments on commit 47bda2e

Please sign in to comment.