aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2000-08-15 15:28:48 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2000-08-15 15:28:48 -0300
commit44eb7d91ac24db572a50ccca388a401cbdfd6fe0 (patch)
tree2f304e0359fa5588279406ea056aa47f0d5f563e
parentddc8d94a087f9c0ef758dc26540a5f5ac486e19d (diff)
downloadlua-44eb7d91ac24db572a50ccca388a401cbdfd6fe0.tar.gz
lua-44eb7d91ac24db572a50ccca388a401cbdfd6fe0.tar.bz2
lua-44eb7d91ac24db572a50ccca388a401cbdfd6fe0.zip
comments
-rw-r--r--lbuiltin.c18
-rw-r--r--lcode.c4
-rw-r--r--ldebug.c6
-rw-r--r--llimits.h4
-rw-r--r--lopcodes.h4
-rw-r--r--lparser.c4
6 files changed, 20 insertions, 20 deletions
diff --git a/lbuiltin.c b/lbuiltin.c
index 501b0051..6bcfad4b 100644
--- a/lbuiltin.c
+++ b/lbuiltin.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lbuiltin.c,v 1.119 2000/08/09 19:16:57 roberto Exp roberto $ 2** $Id: lbuiltin.c,v 1.120 2000/08/14 19:10:14 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*/
@@ -401,7 +401,7 @@ void luaB_getn (lua_State *L) {
401} 401}
402 402
403 403
404/* auxiliar function */ 404/* auxiliary function */
405static void t_move (lua_State *L, Hash *t, int from, int to) { 405static void t_move (lua_State *L, Hash *t, int from, int to) {
406 TObject *p = luaH_setint(L, t, to); /* may change following `get' */ 406 TObject *p = luaH_setint(L, t, to); /* may change following `get' */
407 *p = *luaH_getnum(t, from); 407 *p = *luaH_getnum(t, from);
@@ -613,16 +613,16 @@ static void deprecated_funcs (lua_State *L) {
613#else 613#else
614 614
615/* 615/*
616** gives an explicit error in any attempt to call an obsolet function 616** gives an explicit error in any attempt to call a deprecated function
617*/ 617*/
618static void obsolete_func (lua_State *L) { 618static void deprecated_func (lua_State *L) {
619 luaL_verror(L, "function `%.20s' is obsolete", luaL_check_string(L, 1)); 619 luaL_verror(L, "function `%.20s' is deprecated", luaL_check_string(L, 1));
620} 620}
621 621
622 622
623#define num_deprecated 6 623#define num_deprecated 6
624 624
625static const char *const obsolete_names [num_deprecated] = { 625static const char *const deprecated_names [num_deprecated] = {
626 "foreachvar", "nextvar", "rawgetglobal", 626 "foreachvar", "nextvar", "rawgetglobal",
627 "rawgettable", "rawsetglobal", "rawsettable" 627 "rawgettable", "rawsetglobal", "rawsettable"
628}; 628};
@@ -631,9 +631,9 @@ static const char *const obsolete_names [num_deprecated] = {
631static void deprecated_funcs (lua_State *L) { 631static void deprecated_funcs (lua_State *L) {
632 int i; 632 int i;
633 for (i=0; i<num_deprecated; i++) { 633 for (i=0; i<num_deprecated; i++) {
634 lua_pushstring(L, obsolete_names[i]); 634 lua_pushstring(L, deprecated_names[i]);
635 lua_pushcclosure(L, obsolete_func, 1); 635 lua_pushcclosure(L, deprecated_func, 1);
636 lua_setglobal(L, obsolete_names[i]); 636 lua_setglobal(L, deprecated_names[i]);
637 } 637 }
638} 638}
639 639
diff --git a/lcode.c b/lcode.c
index bd0d2612..adaff37a 100644
--- a/lcode.c
+++ b/lcode.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lcode.c,v 1.47 2000/08/10 19:50:47 roberto Exp roberto $ 2** $Id: lcode.c,v 1.48 2000/08/14 17:46:27 roberto Exp roberto $
3** Code generator for Lua 3** Code generator for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -330,7 +330,7 @@ void luaK_tostack (LexState *ls, expdesc *v, int onlyone) {
330 luaK_concat(fs, &v->u.l.t, fs->pc-1); /* put `previous' in t. list */ 330 luaK_concat(fs, &v->u.l.t, fs->pc-1); /* put `previous' in t. list */
331 else { 331 else {
332 j = code_label(fs, OP_JMP, NO_JUMP); /* to jump over both pushes */ 332 j = code_label(fs, OP_JMP, NO_JUMP); /* to jump over both pushes */
333 /* correct stack for compiler and simbolic execution */ 333 /* correct stack for compiler and symbolic execution */
334 luaK_adjuststack(fs, 1); 334 luaK_adjuststack(fs, 1);
335 } 335 }
336 p_nil = code_label(fs, OP_PUSHNILJMP, 0); 336 p_nil = code_label(fs, OP_PUSHNILJMP, 0);
diff --git a/ldebug.c b/ldebug.c
index b2675892..2e851c1b 100644
--- a/ldebug.c
+++ b/ldebug.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: ldebug.c,v 1.34 2000/08/14 17:46:27 roberto Exp roberto $ 2** $Id: ldebug.c,v 1.35 2000/08/14 17:59:20 roberto Exp roberto $
3** Debug Interface 3** Debug Interface
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -391,7 +391,7 @@ static const char *getobjname (lua_State *L, StkId obj, const char **name) {
391 return "field"; 391 return "field";
392 } 392 }
393 default: 393 default:
394 return NULL; /* no usefull name found */ 394 return NULL; /* no useful name found */
395 } 395 }
396 } 396 }
397} 397}
@@ -408,7 +408,7 @@ static const char *getfuncname (lua_State *L, StkId f, const char **name) {
408 case OP_CALL: case OP_TAILCALL: 408 case OP_CALL: case OP_TAILCALL:
409 return getobjname(L, (func+1)+GETARG_A(i), name); 409 return getobjname(L, (func+1)+GETARG_A(i), name);
410 default: 410 default:
411 return NULL; /* no usefull name found */ 411 return NULL; /* no useful name found */
412 } 412 }
413 } 413 }
414} 414}
diff --git a/llimits.h b/llimits.h
index f1ac6acf..f7412acf 100644
--- a/llimits.h
+++ b/llimits.h
@@ -1,6 +1,6 @@
1/* 1/*
2** $Id: llimits.h,v 1.10 2000/06/16 17:16:34 roberto Exp roberto $ 2** $Id: llimits.h,v 1.11 2000/06/28 17:03:32 roberto Exp roberto $
3** Limits, basic types, and some other "instalation-dependent" definitions 3** Limits, basic types, and some other "installation-dependent" definitions
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
6 6
diff --git a/lopcodes.h b/lopcodes.h
index e5067493..f97a2138 100644
--- a/lopcodes.h
+++ b/lopcodes.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lopcodes.h,v 1.64 2000/06/21 17:05:49 roberto Exp roberto $ 2** $Id: lopcodes.h,v 1.65 2000/06/26 19:28:31 roberto Exp roberto $
3** Opcodes for Lua virtual machine 3** Opcodes for Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -30,7 +30,7 @@
30 The size of each argument is defined in `llimits.h'. The usual is an 30 The size of each argument is defined in `llimits.h'. The usual is an
31 instruction with 32 bits, U arguments with 26 bits (32-6), B arguments 31 instruction with 32 bits, U arguments with 26 bits (32-6), B arguments
32 with 9 bits, and A arguments with 17 bits (32-6-9). For small 32 with 9 bits, and A arguments with 17 bits (32-6-9). For small
33 instalations, the instruction size can be 16, so U has 10 bits, 33 installations, the instruction size can be 16, so U has 10 bits,
34 and A and B have 5 bits each. 34 and A and B have 5 bits each.
35===========================================================================*/ 35===========================================================================*/
36 36
diff --git a/lparser.c b/lparser.c
index cc9a6c9a..1ae80cfb 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lparser.c,v 1.107 2000/08/09 19:16:57 roberto Exp roberto $ 2** $Id: lparser.c,v 1.108 2000/08/14 17:46:27 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*/
@@ -1024,7 +1024,7 @@ static void breakstat (LexState *ls) {
1024 next(ls); /* skip BREAK */ 1024 next(ls); /* skip BREAK */
1025 luaK_adjuststack(fs, currentlevel - bl->stacklevel); 1025 luaK_adjuststack(fs, currentlevel - bl->stacklevel);
1026 luaK_concat(fs, &bl->breaklist, luaK_jump(fs)); 1026 luaK_concat(fs, &bl->breaklist, luaK_jump(fs));
1027 /* correct stack for compiler and simbolic execution */ 1027 /* correct stack for compiler and symbolic execution */
1028 luaK_adjuststack(fs, bl->stacklevel - currentlevel); 1028 luaK_adjuststack(fs, bl->stacklevel - currentlevel);
1029} 1029}
1030 1030