aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2011-07-15 09:50:29 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2011-07-15 09:50:29 -0300
commit32a12e2f3f18aeade5e2cd77eda67a261815246e (patch)
treefc01c8eb3566c967952bb2a85f1a4f7fcceb58d2
parent559bb554c944ed166e363e522e48a71e60e1922d (diff)
downloadlua-32a12e2f3f18aeade5e2cd77eda67a261815246e.tar.gz
lua-32a12e2f3f18aeade5e2cd77eda67a261815246e.tar.bz2
lua-32a12e2f3f18aeade5e2cd77eda67a261815246e.zip
detail (cleaned whitespaces at end of lines)
-rw-r--r--lcode.c6
-rw-r--r--lctype.h4
-rw-r--r--lopcodes.h4
-rw-r--r--lparser.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/lcode.c b/lcode.c
index 1067acbd..9240ebdb 100644
--- a/lcode.c
+++ b/lcode.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lcode.c,v 2.55 2011/05/31 18:24:36 roberto Exp roberto $ 2** $Id: lcode.c,v 2.56 2011/05/31 18:27:56 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*/
@@ -44,8 +44,8 @@ void luaK_nil (FuncState *fs, int from, int n) {
44 int pl = pfrom + GETARG_B(*previous); 44 int pl = pfrom + GETARG_B(*previous);
45 if ((pfrom <= from && from <= pl + 1) || 45 if ((pfrom <= from && from <= pl + 1) ||
46 (from <= pfrom && pfrom <= l + 1)) { /* can connect both? */ 46 (from <= pfrom && pfrom <= l + 1)) { /* can connect both? */
47 if (pfrom < from) from = pfrom; /* from = min(from, pfrom) */ 47 if (pfrom < from) from = pfrom; /* from = min(from, pfrom) */
48 if (pl > l) l = pl; /* l = max(l, pl) */ 48 if (pl > l) l = pl; /* l = max(l, pl) */
49 SETARG_A(*previous, from); 49 SETARG_A(*previous, from);
50 SETARG_B(*previous, l - from); 50 SETARG_B(*previous, l - from);
51 return; 51 return;
diff --git a/lctype.h b/lctype.h
index 34bc222c..5dc17013 100644
--- a/lctype.h
+++ b/lctype.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lctype.h,v 1.10 2011/06/24 12:25:33 roberto Exp roberto $ 2** $Id: lctype.h,v 1.11 2011/06/27 18:22:46 roberto Exp roberto $
3** 'ctype' functions for Lua 3** 'ctype' functions for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -11,7 +11,7 @@
11 11
12 12
13/* 13/*
14** WARNING: the functions defined here do not necessarily correspond 14** WARNING: the functions defined here do not necessarily correspond
15** to the similar functions in the standard C ctype.h. They are 15** to the similar functions in the standard C ctype.h. They are
16** optimized for the specific needs of Lua 16** optimized for the specific needs of Lua
17*/ 17*/
diff --git a/lopcodes.h b/lopcodes.h
index 5ab88228..886cdbcc 100644
--- a/lopcodes.h
+++ b/lopcodes.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lopcodes.h,v 1.140 2011/04/07 18:14:12 roberto Exp roberto $ 2** $Id: lopcodes.h,v 1.141 2011/04/19 16:22:13 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*/
@@ -196,7 +196,7 @@ OP_LEN,/* A B R(A) := length of R(B) */
196 196
197OP_CONCAT,/* A B C R(A) := R(B).. ... ..R(C) */ 197OP_CONCAT,/* A B C R(A) := R(B).. ... ..R(C) */
198 198
199OP_JMP,/* A sBx pc+=sBx; if (A) close all upvalues >= R(A) + 1 */ 199OP_JMP,/* A sBx pc+=sBx; if (A) close all upvalues >= R(A) + 1 */
200OP_EQ,/* A B C if ((RK(B) == RK(C)) ~= A) then pc++ */ 200OP_EQ,/* A B C if ((RK(B) == RK(C)) ~= A) then pc++ */
201OP_LT,/* A B C if ((RK(B) < RK(C)) ~= A) then pc++ */ 201OP_LT,/* A B C if ((RK(B) < RK(C)) ~= A) then pc++ */
202OP_LE,/* A B C if ((RK(B) <= RK(C)) ~= A) then pc++ */ 202OP_LE,/* A B C if ((RK(B) <= RK(C)) ~= A) then pc++ */
diff --git a/lparser.c b/lparser.c
index 03f87176..a5b60033 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lparser.c,v 2.112 2011/06/27 18:18:59 roberto Exp roberto $ 2** $Id: lparser.c,v 2.113 2011/07/02 15:58:14 roberto Exp roberto $
3** Lua Parser 3** Lua Parser
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -418,7 +418,7 @@ static void movegotosout (FuncState *fs, BlockCnt *bl) {
418 int i = bl->firstgoto; 418 int i = bl->firstgoto;
419 Labellist *gl = &fs->ls->dyd->gt; 419 Labellist *gl = &fs->ls->dyd->gt;
420 /* correct pending gotos to current block and try to close it 420 /* correct pending gotos to current block and try to close it
421 with visible labels */ 421 with visible labels */
422 while (i < gl->n) { 422 while (i < gl->n) {
423 Labeldesc *gt = &gl->arr[i]; 423 Labeldesc *gt = &gl->arr[i];
424 if (gt->nactvar > bl->nactvar) { 424 if (gt->nactvar > bl->nactvar) {
@@ -1190,7 +1190,7 @@ static void checkrepeated (FuncState *fs, Labellist *ll, TString *label) {
1190 int i; 1190 int i;
1191 for (i = fs->bl->firstlabel; i < ll->n; i++) { 1191 for (i = fs->bl->firstlabel; i < ll->n; i++) {
1192 if (eqstr(label, ll->arr[i].name)) { 1192 if (eqstr(label, ll->arr[i].name)) {
1193 const char *msg = luaO_pushfstring(fs->ls->L, 1193 const char *msg = luaO_pushfstring(fs->ls->L,
1194 "label " LUA_QS " already defined on line %d", 1194 "label " LUA_QS " already defined on line %d",
1195 getstr(label), ll->arr[i].line); 1195 getstr(label), ll->arr[i].line);
1196 semerror(fs->ls, msg); 1196 semerror(fs->ls, msg);