Skip to content

Commit 0dd4525

Browse files
siffiejoesiffiejoe
committed
Minor cleanup (variable renaming and such)
1 parent a70a4d7 commit 0dd4525

File tree

8 files changed

+81
-88
lines changed

8 files changed

+81
-88
lines changed

‎compat_50103.c

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
#if LUA_VERSION_NUM == 501
5-
#include "compat.h"
65
#define LUA_CORE
76
#include "lua5.1/lstate.h"
87
#include "lua5.1/lobject.h"
@@ -15,14 +14,14 @@ void* getArg_50103(lua_State* L, int n) {
1514
}
1615

1716

18-
size_t sizeNumber_50103(void const* n) {
19-
(void)n;
17+
size_t sizeNumber_50103(void const* o) {
18+
(void)o;
2019
return sizeof(lua_Number);
2120
}
2221

2322

24-
size_t sizeString_50103(void const* s) {
25-
TValue const* v = s;
23+
size_t sizeString_50103(void const* o) {
24+
TValue const* v = o;
2625
return sizestring(tsvalue(v));
2726
}
2827

@@ -37,9 +36,9 @@ static size_t sizeProto(Proto const* p)
3736
sizeof(*(p->upvalues)) * p->sizeupvalues;
3837
}
3938

40-
size_t sizeFunction_50103(void const* v, int count_protos, int count_upvalues) {
41-
TValue const* o = v;
42-
Closure *cl = clvalue(o);
39+
size_t sizeFunction_50103(void const* o, int count_protos, int count_upvalues) {
40+
TValue const* v = o;
41+
Closure *cl = clvalue(v);
4342
if (cl->c.isC)
4443
return sizeCclosure(cl->c.nupvalues);
4544
else
@@ -49,15 +48,15 @@ size_t sizeFunction_50103(void const* v, int count_protos, int count_upvalues) {
4948
}
5049

5150

52-
void* tableNode_50103(void const* t) {
53-
TValue const* h = t;
51+
void* tableNode_50103(void const* o) {
52+
TValue const* h = o;
5453
return hvalue(h)->node;
5554
}
5655

5756

58-
size_t sizeTable_50103(void const* t, void const* n,
57+
size_t sizeTable_50103(void const* o, void const* n,
5958
unsigned* narr, unsigned* nrec) {
60-
Table const* h = hvalue((TValue const*)t);
59+
Table const* h = hvalue((TValue const*)o);
6160
Node const* dummynode = n;
6261
*narr = h->sizearray;
6362
*nrec = (h->node == dummynode ? 0 : sizenode(h));
@@ -66,14 +65,14 @@ size_t sizeTable_50103(void const* t, void const* n,
6665
}
6766

6867

69-
size_t sizeUserdata_50103(void const* u) {
70-
TValue const* v = u;
68+
size_t sizeUserdata_50103(void const* o) {
69+
TValue const* v = o;
7170
return sizeudata(uvalue(v));
7271
}
7372

7473

75-
size_t sizeThread_50103(void const* v) {
76-
lua_State const* th = thvalue((TValue const*)v);
74+
size_t sizeThread_50103(void const* o) {
75+
lua_State const* th = thvalue((TValue const*)o);
7776
return sizeof(lua_State) + sizeof(TValue) * th->stacksize +
7877
sizeof(CallInfo) * th->size_ci;
7978
}

‎compat_50200.c

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
#if LUA_VERSION_NUM == 502
5-
#include "compat.h"
65
#define LUA_CORE
76
#include "lua5.2/lstate.h"
87
#include "lua5.2/lobject.h"
@@ -15,14 +14,14 @@ void* getArg_50200(lua_State* L, int n) {
1514
}
1615

1716

18-
size_t sizeNumber_50200(void const* n) {
19-
(void)n;
17+
size_t sizeNumber_50200(void const* o) {
18+
(void)o;
2019
return sizeof(lua_Number);
2120
}
2221

2322

24-
size_t sizeString_50200(void const* s) {
25-
TValue const* v = s;
23+
size_t sizeString_50200(void const* o) {
24+
TValue const* v = o;
2625
return sizestring(tsvalue(v));
2726
}
2827

@@ -36,34 +35,34 @@ static size_t sizeProto(Proto const* p) {
3635
sizeof(*(p->upvalues)) * p->sizeupvalues;
3736
}
3837

39-
size_t sizeFunction_50200(void const* v, int count_protos, int count_upvalues) {
40-
TValue const* o = v;
41-
switch (ttype(o)) {
38+
size_t sizeFunction_50200(void const* o, int count_protos, int count_upvalues) {
39+
TValue const* v = o;
40+
switch (ttype(v)) {
4241
case LUA_TLCL: /* Lua closure */
4342
{
44-
Closure *cl = clvalue(o);
43+
Closure *cl = clvalue(v);
4544
return sizeLclosure(cl->l.nupvalues) +
4645
(count_upvalues ? cl->l.nupvalues * sizeof(UpVal) : 0) +
4746
(count_protos ? sizeProto(cl->l.p) : 0);
4847
}
4948
case LUA_TLCF: /* light C function */
5049
return sizeof(lua_CFunction);
5150
case LUA_TCCL: /* C closure */
52-
return sizeCclosure(clvalue(o)->c.nupvalues);
51+
return sizeCclosure(clvalue(v)->c.nupvalues);
5352
}
5453
return 0;
5554
}
5655

5756

58-
void* tableNode_50200(void const* t) {
59-
TValue const* h = t;
57+
void* tableNode_50200(void const* o) {
58+
TValue const* h = o;
6059
return hvalue(h)->node;
6160
}
6261

6362

64-
size_t sizeTable_50200(void const* t, void const* n,
63+
size_t sizeTable_50200(void const* o, void const* n,
6564
unsigned* narr, unsigned* nrec) {
66-
Table const* h = hvalue((TValue const*)t);
65+
Table const* h = hvalue((TValue const*)o);
6766
Node const* dummynode = n;
6867
*narr = h->sizearray;
6968
*nrec = (h->node == dummynode ? 0 : sizenode(h));
@@ -72,14 +71,14 @@ size_t sizeTable_50200(void const* t, void const* n,
7271
}
7372

7473

75-
size_t sizeUserdata_50200(void const* u) {
76-
TValue const* v = u;
74+
size_t sizeUserdata_50200(void const* o) {
75+
TValue const* v = o;
7776
return sizeudata(uvalue(v));
7877
}
7978

8079

81-
size_t sizeThread_50200(void const* v) {
82-
lua_State const* th = thvalue((TValue const*)v);
80+
size_t sizeThread_50200(void const* o) {
81+
lua_State const* th = thvalue((TValue const*)o);
8382
CallInfo* ci = th->base_ci.next;
8483
size_t cisize = 0;
8584
for(; ci != NULL; ci = ci->next)

‎compat_50204.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22

33

44
#if LUA_VERSION_NUM == 502
5-
#include "compat.h"
65
#define LUA_CORE
76
#include "lua5.2/4/lobject.h"
87
#include "lua5.2/lstate.h"
98

109

11-
void* tableNode_50204(void const* t) {
12-
TValue const* h = t;
10+
void* tableNode_50204(void const* o) {
11+
TValue const* h = o;
1312
return hvalue(h)->node;
1413
}
1514

1615

17-
size_t sizeTable_50204(void const* t, void const* n,
16+
size_t sizeTable_50204(void const* o, void const* n,
1817
unsigned* narr, unsigned* nrec) {
19-
Table const* h = hvalue((TValue const*)t);
18+
Table const* h = hvalue((TValue const*)o);
2019
Node const* dummynode = n;
2120
*narr = h->sizearray;
2221
*nrec = (h->node == dummynode ? 0 : sizenode(h));

‎compat_50300.c

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
#if LUA_VERSION_NUM == 503
5-
#include "compat.h"
65
#define LUA_CORE
76
#include "lua5.3/lstate.h"
87
#include "lua5.3/lobject.h"
@@ -15,17 +14,17 @@ void* getArg_50300(lua_State* L, int n) {
1514
}
1615

1716

18-
size_t sizeNumber_50300(void const* v) {
19-
TValue const* o = v;
20-
if (ttype(o) == LUA_TNUMINT)
17+
size_t sizeNumber_50300(void const* o) {
18+
TValue const* v = o;
19+
if (ttype(v) == LUA_TNUMINT)
2120
return sizeof(lua_Integer);
2221
else
2322
return sizeof(lua_Number);
2423
}
2524

2625

27-
size_t sizeString_50300(void const* s) {
28-
TValue const* v = s;
26+
size_t sizeString_50300(void const* o) {
27+
TValue const* v = o;
2928
return sizestring(tsvalue(v));
3029
}
3130

@@ -42,34 +41,34 @@ static size_t sizeProto(Proto const* p)
4241
}
4342

4443

45-
size_t sizeFunction_50300(void const* v, int count_protos, int count_upvalues) {
46-
TValue const* o = v;
47-
switch (ttype(o)) {
44+
size_t sizeFunction_50300(void const* o, int count_protos, int count_upvalues) {
45+
TValue const* v = o;
46+
switch (ttype(v)) {
4847
case LUA_TLCL: /* Lua closure */
4948
{
50-
Closure *cl = clvalue(o);
49+
Closure *cl = clvalue(v);
5150
return sizeLclosure(cl->l.nupvalues) +
5251
(count_upvalues ? cl->l.nupvalues * sizeof(UpVal) : 0) +
5352
(count_protos ? sizeProto(cl->l.p) : 0);
5453
}
5554
case LUA_TLCF: /* light C function */
5655
return sizeof(lua_CFunction);
5756
case LUA_TCCL: /* C closure */
58-
return sizeCclosure(clvalue(o)->c.nupvalues);
57+
return sizeCclosure(clvalue(v)->c.nupvalues);
5958
}
6059
return 0;
6160
}
6261

6362

64-
void* tableNode_50300(void const* t) {
65-
TValue const* h = t;
63+
void* tableNode_50300(void const* o) {
64+
TValue const* h = o;
6665
return hvalue(h)->node;
6766
}
6867

6968

70-
size_t sizeTable_50300(void const* t, void const* n,
69+
size_t sizeTable_50300(void const* o, void const* n,
7170
unsigned* narr, unsigned* nrec) {
72-
Table const* h = hvalue((TValue const*)t);
71+
Table const* h = hvalue((TValue const*)o);
7372
Node const* dummynode = n;
7473
*narr = h->sizearray;
7574
*nrec = (h->node == dummynode ? 0 : sizenode(h));
@@ -78,14 +77,14 @@ size_t sizeTable_50300(void const* t, void const* n,
7877
}
7978

8079

81-
size_t sizeUserdata_50300(void const* u) {
82-
TValue const* v = u;
80+
size_t sizeUserdata_50300(void const* o) {
81+
TValue const* v = o;
8382
return sizeudata(uvalue(v));
8483
}
8584

8685

87-
size_t sizeThread_50300(void const* v) {
88-
lua_State const* th = thvalue((TValue const*)v);
86+
size_t sizeThread_50300(void const* o) {
87+
lua_State const* th = thvalue((TValue const*)o);
8988
CallInfo *ci = th->base_ci.next;
9089
size_t cisize = 0;
9190
for (; ci != NULL; ci = ci->next)

‎compat_50301.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33

44
#if LUA_VERSION_NUM == 503
5-
#include "compat.h"
65
#define LUA_CORE
76
#include "lua5.3/1/lobject.h"
87
#include "lua5.3/1/lstring.h"
98

109

11-
size_t sizeString_50301(void const* s) {
12-
TValue const* v = s;
10+
size_t sizeString_50301(void const* o) {
11+
TValue const* v = o;
1312
return sizelstring(tsslen(tsvalue(v)));
1413
}
1514

‎compat_50302.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33

44
#if LUA_VERSION_NUM == 503
5-
#include "compat.h"
65
#define LUA_CORE
76
#include "lua5.3/2/lstate.h"
87

98

10-
size_t sizeThread_50302(void const* v) {
11-
lua_State const* th = thvalue((TValue const*)v);
9+
size_t sizeThread_50302(void const* o) {
10+
lua_State const* th = thvalue((TValue const*)o);
1211
return sizeof(lua_State) + sizeof(TValue) * th->stacksize +
1312
sizeof(CallInfo) * th->nci;
1413
}

0 commit comments

Comments
 (0)