aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>1999-12-14 16:42:57 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>1999-12-14 16:42:57 -0200
commit12b45c2df21beac17d49a92a4e098cb212238c1a (patch)
tree01cc8c3b861bbf952ddabce68bc556f45d764399
parent1b15206cf9aa7005fc3d48f78f60f66838f10eb5 (diff)
downloadlua-12b45c2df21beac17d49a92a4e098cb212238c1a.tar.gz
lua-12b45c2df21beac17d49a92a4e098cb212238c1a.tar.bz2
lua-12b45c2df21beac17d49a92a4e098cb212238c1a.zip
luaS_newfixedstring renamed to luaS_newfixed
-rw-r--r--lbuiltin.c6
-rw-r--r--lparser.c6
-rw-r--r--lstring.c4
-rw-r--r--lstring.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/lbuiltin.c b/lbuiltin.c
index a28db531..374d197c 100644
--- a/lbuiltin.c
+++ b/lbuiltin.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lbuiltin.c,v 1.83 1999/12/07 12:05:34 roberto Exp roberto $ 2** $Id: lbuiltin.c,v 1.84 1999/12/14 18:31:20 roberto Exp roberto $
3** Built-in functions 3** Built-in functions
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -653,8 +653,8 @@ static const struct luaL_reg builtin_funcs[] = {
653 653
654void luaB_predefine (lua_State *L) { 654void luaB_predefine (lua_State *L) {
655 /* pre-register mem error messages, to avoid loop when error arises */ 655 /* pre-register mem error messages, to avoid loop when error arises */
656 luaS_newfixedstring(L, tableEM); 656 luaS_newfixed(L, tableEM);
657 luaS_newfixedstring(L, memEM); 657 luaS_newfixed(L, memEM);
658 luaL_openl(L, builtin_funcs); 658 luaL_openl(L, builtin_funcs);
659 luaB_opentests(L); /* internal test functions (when DEBUG is on) */ 659 luaB_opentests(L); /* internal test functions (when DEBUG is on) */
660 lua_pushstring(L, LUA_VERSION); 660 lua_pushstring(L, LUA_VERSION);
diff --git a/lparser.c b/lparser.c
index 4e95bb43..aa50a87b 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lparser.c,v 1.45 1999/12/01 19:50:08 roberto Exp roberto $ 2** $Id: lparser.c,v 1.46 1999/12/07 11:36:16 roberto Exp roberto $
3** LL(1) Parser and code generator for Lua 3** LL(1) Parser and code generator for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -464,7 +464,7 @@ static void code_args (LexState *ls, int nparams, int dots) {
464 else { 464 else {
465 fs->f->code[1] = (Byte)(nparams+ZEROVARARG); 465 fs->f->code[1] = (Byte)(nparams+ZEROVARARG);
466 deltastack(ls, nparams+1); 466 deltastack(ls, nparams+1);
467 add_localvar(ls, luaS_newfixedstring(ls->L, "arg")); 467 add_localvar(ls, luaS_newfixed(ls->L, "arg"));
468 } 468 }
469} 469}
470 470
@@ -890,7 +890,7 @@ static void body (LexState *ls, int needself, int line) {
890 newfs.f->lineDefined = line; 890 newfs.f->lineDefined = line;
891 check(ls, '('); 891 check(ls, '(');
892 if (needself) 892 if (needself)
893 add_localvar(ls, luaS_newfixedstring(ls->L, "self")); 893 add_localvar(ls, luaS_newfixed(ls->L, "self"));
894 parlist(ls); 894 parlist(ls);
895 check(ls, ')'); 895 check(ls, ')');
896 chunk(ls); 896 chunk(ls);
diff --git a/lstring.c b/lstring.c
index d8e83953..85ede619 100644
--- a/lstring.c
+++ b/lstring.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lstring.c,v 1.29 1999/11/22 18:24:50 roberto Exp roberto $ 2** $Id: lstring.c,v 1.30 1999/11/26 18:59:20 roberto Exp roberto $
3** String table (keeps all strings handled by Lua) 3** String table (keeps all strings handled by Lua)
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -154,7 +154,7 @@ TaggedString *luaS_new (lua_State *L, const char *str) {
154 return luaS_newlstr(L, str, strlen(str)); 154 return luaS_newlstr(L, str, strlen(str));
155} 155}
156 156
157TaggedString *luaS_newfixedstring (lua_State *L, const char *str) { 157TaggedString *luaS_newfixed (lua_State *L, const char *str) {
158 TaggedString *ts = luaS_new(L, str); 158 TaggedString *ts = luaS_new(L, str);
159 if (ts->marked == 0) ts->marked = FIXMARK; /* avoid GC */ 159 if (ts->marked == 0) ts->marked = FIXMARK; /* avoid GC */
160 return ts; 160 return ts;
diff --git a/lstring.h b/lstring.h
index 31feabdb..040a590c 100644
--- a/lstring.h
+++ b/lstring.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lstring.h,v 1.13 1999/11/22 13:12:07 roberto Exp roberto $ 2** $Id: lstring.h,v 1.14 1999/11/26 18:59:20 roberto Exp roberto $
3** String table (keep all strings handled by Lua) 3** String table (keep all strings handled by Lua)
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -32,7 +32,7 @@ void luaS_freeall (lua_State *L);
32void luaS_free (lua_State *L, TaggedString *ts); 32void luaS_free (lua_State *L, TaggedString *ts);
33TaggedString *luaS_newlstr (lua_State *L, const char *str, long l); 33TaggedString *luaS_newlstr (lua_State *L, const char *str, long l);
34TaggedString *luaS_new (lua_State *L, const char *str); 34TaggedString *luaS_new (lua_State *L, const char *str);
35TaggedString *luaS_newfixedstring (lua_State *L, const char *str); 35TaggedString *luaS_newfixed (lua_State *L, const char *str);
36GlobalVar *luaS_assertglobal (lua_State *L, TaggedString *ts); 36GlobalVar *luaS_assertglobal (lua_State *L, TaggedString *ts);
37GlobalVar *luaS_assertglobalbyname (lua_State *L, const char *name); 37GlobalVar *luaS_assertglobalbyname (lua_State *L, const char *name);
38int luaS_globaldefined (lua_State *L, const char *name); 38int luaS_globaldefined (lua_State *L, const char *name);