aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>1996-02-12 15:32:09 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>1996-02-12 15:32:09 -0300
commitafaa98a666acd5f596b50f56bb288815838c096e (patch)
tree598f2139de92947f1b29088bb40544e9c94bbb62
parent73be918285f7e2eb0acc02d73effa6a95a8ab08c (diff)
downloadlua-afaa98a666acd5f596b50f56bb288815838c096e.tar.gz
lua-afaa98a666acd5f596b50f56bb288815838c096e.tar.bz2
lua-afaa98a666acd5f596b50f56bb288815838c096e.zip
no more "lua_pushliteral".
-rw-r--r--lua.h7
-rw-r--r--manual.tex13
2 files changed, 7 insertions, 13 deletions
diff --git a/lua.h b/lua.h
index cd34c1b4..da1867b0 100644
--- a/lua.h
+++ b/lua.h
@@ -2,7 +2,7 @@
2** LUA - Linguagem para Usuarios de Aplicacao 2** LUA - Linguagem para Usuarios de Aplicacao
3** Grupo de Tecnologia em Computacao Grafica 3** Grupo de Tecnologia em Computacao Grafica
4** TeCGraf - PUC-Rio 4** TeCGraf - PUC-Rio
5** $Id: lua.h,v 3.20 1995/10/31 16:41:53 roberto Exp roberto $ 5** $Id: lua.h,v 3.21 1995/11/13 15:36:52 roberto Exp roberto $
6*/ 6*/
7 7
8 8
@@ -60,7 +60,6 @@ void *lua_getuserdata (lua_Object object);
60void lua_pushnil (void); 60void lua_pushnil (void);
61void lua_pushnumber (float n); 61void lua_pushnumber (float n);
62void lua_pushstring (char *s); 62void lua_pushstring (char *s);
63void lua_pushliteral (char *s);
64void lua_pushcfunction (lua_CFunction fn); 63void lua_pushcfunction (lua_CFunction fn);
65void lua_pushusertag (void *u, int tag); 64void lua_pushusertag (void *u, int tag);
66void lua_pushobject (lua_Object object); 65void lua_pushobject (lua_Object object);
@@ -98,7 +97,9 @@ lua_Object lua_createtable (void);
98#define lua_isuserdata(_) (lua_type(_)>=LUA_T_USERDATA) 97#define lua_isuserdata(_) (lua_type(_)>=LUA_T_USERDATA)
99 98
100 99
101/* for lua 1.1 compatibility. Avoid using these macros */ 100/* for compatibility with old versions. Avoid using these macros */
101
102#define lua_pushliteral(o) lua_pushstring(o)
102 103
103#define lua_getindexed(o,n) (lua_pushobject(o), lua_pushnumber(n), lua_getsubscript()) 104#define lua_getindexed(o,n) (lua_pushobject(o), lua_pushnumber(n), lua_getsubscript())
104#define lua_getfield(o,f) (lua_pushobject(o), lua_pushliteral(f), lua_getsubscript()) 105#define lua_getfield(o,f) (lua_pushobject(o), lua_pushliteral(f), lua_getsubscript())
diff --git a/manual.tex b/manual.tex
index c83104f0..18065d0a 100644
--- a/manual.tex
+++ b/manual.tex
@@ -1,4 +1,4 @@
1% $Id: manual.tex,v 1.8 1996/02/09 17:21:27 roberto Exp roberto $ 1% $Id: manual.tex,v 1.9 1996/02/09 19:02:30 roberto Exp roberto $
2 2
3\documentstyle[A4,11pt,bnf]{article} 3\documentstyle[A4,11pt,bnf]{article}
4 4
@@ -32,7 +32,7 @@ Waldemar Celes Filho
32Departamento de Inform\'atica --- PUC-Rio 32Departamento de Inform\'atica --- PUC-Rio
33} 33}
34 34
35\date{\small \verb$Date: 1996/02/09 17:21:27 $} 35\date{\small \verb$Date: 1996/02/09 19:02:30 $}
36 36
37\maketitle 37\maketitle
38 38
@@ -836,13 +836,12 @@ otherwise, the function returns 0 (the null pointer).
836 836
837The reverse process, that is, passing a specific C value to Lua, 837The reverse process, that is, passing a specific C value to Lua,
838is done by using the following functions: 838is done by using the following functions:
839\Deffunc{lua_pushnumber}\Deffunc{lua_pushstring}\Deffunc{lua_pushliteral} 839\Deffunc{lua_pushnumber}\Deffunc{lua_pushstring}
840\Deffunc{lua_pushcfunction}\Deffunc{lua_pushusertag} 840\Deffunc{lua_pushcfunction}\Deffunc{lua_pushusertag}
841\Deffunc{lua_pushuserdata} 841\Deffunc{lua_pushuserdata}
842\begin{verbatim} 842\begin{verbatim}
843void lua_pushnumber (double n); 843void lua_pushnumber (double n);
844void lua_pushstring (char *s); 844void lua_pushstring (char *s);
845void lua_pushliteral (char *s);
846void lua_pushcfunction (lua_CFunction f); 845void lua_pushcfunction (lua_CFunction f);
847void lua_pushusertag (void *u, int tag); 846void lua_pushusertag (void *u, int tag);
848\end{verbatim} 847\end{verbatim}
@@ -855,12 +854,6 @@ convert it to a correspondent \verb'lua_Object',
855and leave the result on the top of the Lua stack, 854and leave the result on the top of the Lua stack,
856where it can be assigned to a Lua variable, 855where it can be assigned to a Lua variable,
857passed as paramenter to a Lua function, etc (see below). \label{pushing} 856passed as paramenter to a Lua function, etc (see below). \label{pushing}
858\verb'lua_pushliteral' is like \verb'lua_pushstring',
859but also puts the string in the Lua literal table and merges duplications.
860This avoids the string to be garbage collected,
861and therefore has a better overall performance.
862As a rule, when the string to be pushed is a literal,
863\verb'lua_pushliteral' should be used.
864 857
865User data can have different tags, 858User data can have different tags,
866whose semantics are defined by the host program. 859whose semantics are defined by the host program.