summaryrefslogtreecommitdiff
path: root/src/lua.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lua.h')
-rw-r--r--src/lua.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/lua.h b/src/lua.h
index 1028e5ea..339e076f 100644
--- a/src/lua.h
+++ b/src/lua.h
@@ -1,8 +1,7 @@
/*
-** $Id: lua.h,v 1.208 2005/05/17 19:49:15 roberto Exp $
+** $Id: lua.h,v 1.212 2005/08/25 20:02:08 roberto Exp $
** Lua - An Extensible Extension Language
-** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
-** http://www.lua.org
+** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
** See Copyright Notice at the end of this file
*/
@@ -17,9 +16,9 @@
#include "luaconf.h"
-#define LUA_VERSION "Lua 5.1 (work6)"
+#define LUA_VERSION "Lua 5.1 (alpha)"
#define LUA_VERSION_NUM 501
-#define LUA_COPYRIGHT "Copyright (C) 1994-2005 Tecgraf, PUC-Rio"
+#define LUA_COPYRIGHT "Copyright (C) 1994-2005 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
@@ -39,7 +38,7 @@
#define lua_upvalueindex(i) (LUA_GLOBALSINDEX-(i))
-/* return codes for `lua_pcall', `lua_resume', and `lua_status' */
+/* thread status; 0 is OK */
#define LUA_YIELD 1
#define LUA_ERRRUN 2
#define LUA_ERRSYNTAX 3
@@ -147,7 +146,7 @@ LUA_API lua_Number (lua_tonumber) (lua_State *L, int idx);
LUA_API lua_Integer (lua_tointeger) (lua_State *L, int idx);
LUA_API int (lua_toboolean) (lua_State *L, int idx);
LUA_API const char *(lua_tolstring) (lua_State *L, int idx, size_t *len);
-LUA_API size_t (lua_objsize) (lua_State *L, int idx);
+LUA_API size_t (lua_objlen) (lua_State *L, int idx);
LUA_API lua_CFunction (lua_tocfunction) (lua_State *L, int idx);
LUA_API void *(lua_touserdata) (lua_State *L, int idx);
LUA_API lua_State *(lua_tothread) (lua_State *L, int idx);
@@ -257,7 +256,7 @@ LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
#define lua_pushcfunction(L,f) lua_pushcclosure(L, (f), 0)
-#define lua_strlen(L,i) lua_objsize(L, (i))
+#define lua_strlen(L,i) lua_objlen(L, (i))
#define lua_isfunction(L,n) (lua_type(L, (n)) == LUA_TFUNCTION)
#define lua_istable(L,n) (lua_type(L, (n)) == LUA_TTABLE)
@@ -357,7 +356,7 @@ struct lua_Debug {
/******************************************************************************
-* Copyright (C) 1994-2005 Tecgraf, PUC-Rio. All rights reserved.
+* Copyright (C) 1994-2005 Lua.org, PUC-Rio. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the