Skip to content

Commit a341d94

Browse files
jarjin2000jarjin2000
committed
更新最新tolua_runtime库到1.0.7版。
1 parent da721cb commit a341d94

File tree

16 files changed

+41
-12
lines changed

16 files changed

+41
-12
lines changed

‎.DS_Store

-12 KB
Binary file not shown.

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@
3535
/macnojit/build
3636
/iOS/build
3737
/android/obj
38+
/android/jni/libluajit.a

‎android/jni/libluajit.a

-596 KB
Binary file not shown.

‎iOS/.DS_Store

-8 KB
Binary file not shown.

‎iOS/libluajit-arm64.a

-414 KB
Binary file not shown.

‎iOS/libluajit-armv7.a

-331 KB
Binary file not shown.

‎iOS/libluajit-armv7s.a

-333 KB
Binary file not shown.

‎iOS/libluajit.a

-1.05 MB
Binary file not shown.

‎iOS/tolua.xcodeproj/project.pbxproj

+26
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@
1111
53208EF21CDE11B5002B6AFA /* sproto.c in Sources */ = {isa = PBXBuildFile; fileRef = 53208EEF1CDE11B5002B6AFA /* sproto.c */; };
1212
5371FF1E1CDE216700AD16D3 /* pbc-lua.c in Sources */ = {isa = PBXBuildFile; fileRef = 5371FF1D1CDE216700AD16D3 /* pbc-lua.c */; };
1313
53BD213B1D5EBC0500A20481 /* uint64.c in Sources */ = {isa = PBXBuildFile; fileRef = 53BD213A1D5EBC0500A20481 /* uint64.c */; };
14+
53CF17C21F1668AE00C7781F /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D60D1EF9652A00B0828D /* alloc.c */; };
15+
53CF17C31F1668AE00C7781F /* array.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D60F1EF9652A00B0828D /* array.c */; };
16+
53CF17C41F1668AE00C7781F /* bootstrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D6111EF9652A00B0828D /* bootstrap.c */; };
17+
53CF17C51F1668AE00C7781F /* context.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D6131EF9652A00B0828D /* context.c */; };
18+
53CF17C61F1668AE00C7781F /* decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D6151EF9652A00B0828D /* decode.c */; };
19+
53CF17C71F1668AE00C7781F /* map.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D6171EF9652A00B0828D /* map.c */; };
20+
53CF17C81F1668AE00C7781F /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D6191EF9652A00B0828D /* pattern.c */; };
21+
53CF17C91F1668AE00C7781F /* proto.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D61B1EF9652A00B0828D /* proto.c */; };
22+
53CF17CA1F1668AE00C7781F /* register.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D61D1EF9652A00B0828D /* register.c */; };
23+
53CF17CB1F1668AE00C7781F /* rmessage.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D61E1EF9652A00B0828D /* rmessage.c */; };
24+
53CF17CC1F1668AE00C7781F /* stringpool.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D61F1EF9652A00B0828D /* stringpool.c */; };
25+
53CF17CD1F1668AE00C7781F /* varint.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D6211EF9652A00B0828D /* varint.c */; };
26+
53CF17CE1F1668AE00C7781F /* wmessage.c in Sources */ = {isa = PBXBuildFile; fileRef = 53C9D6231EF9652A00B0828D /* wmessage.c */; };
1427
8400929F1CCF43D600F89A56 /* tolua.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8400929E1CCF43D600F89A56 /* tolua.h */; };
1528
840092A11CCF43D600F89A56 /* tolua.m in Sources */ = {isa = PBXBuildFile; fileRef = 840092A01CCF43D600F89A56 /* tolua.m */; };
1629
840092A81CCF44F800F89A56 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840092A71CCF44F800F89A56 /* libluajit.a */; };
@@ -346,6 +359,19 @@
346359
isa = PBXSourcesBuildPhase;
347360
buildActionMask = 2147483647;
348361
files = (
362+
53CF17C21F1668AE00C7781F /* alloc.c in Sources */,
363+
53CF17C31F1668AE00C7781F /* array.c in Sources */,
364+
53CF17C41F1668AE00C7781F /* bootstrap.c in Sources */,
365+
53CF17C51F1668AE00C7781F /* context.c in Sources */,
366+
53CF17C61F1668AE00C7781F /* decode.c in Sources */,
367+
53CF17C71F1668AE00C7781F /* map.c in Sources */,
368+
53CF17C81F1668AE00C7781F /* pattern.c in Sources */,
369+
53CF17C91F1668AE00C7781F /* proto.c in Sources */,
370+
53CF17CA1F1668AE00C7781F /* register.c in Sources */,
371+
53CF17CB1F1668AE00C7781F /* rmessage.c in Sources */,
372+
53CF17CC1F1668AE00C7781F /* stringpool.c in Sources */,
373+
53CF17CD1F1668AE00C7781F /* varint.c in Sources */,
374+
53CF17CE1F1668AE00C7781F /* wmessage.c in Sources */,
349375
840092A11CCF43D600F89A56 /* tolua.m in Sources */,
350376
840092EB1CCF45A800F89A56 /* serial.c in Sources */,
351377
840092E31CCF45A800F89A56 /* compat.c in Sources */,

‎iOS/tolua.xcodeproj/project.xcworkspace/xcuserdata/jarjin.xcuserdatad/UserInterfaceState.xcuserstate

-6.66 KB
Binary file not shown.

‎int64.c

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ static int64_t _long(lua_State* L, int pos)
123123
return luaL_error(L, "integral is too large: %s", str);
124124
}
125125

126+
errno = old;
126127
return n;
127128
}
128129

‎luajit-2.1/src/luajit

136 KB
Binary file not shown.

‎macnojit/.DS_Store

0 Bytes
Binary file not shown.

‎macnojit/tolua.xcodeproj/project.xcworkspace/xcuserdata/jarjin.xcuserdatad/UserInterfaceState.xcuserstate

-939 Bytes
Binary file not shown.

‎pbc/binding/lua/pbc-lua.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern "C" {
88
}
99
#endif
1010

11-
#include <malloc.h>
11+
#include <malloc/malloc.h>
1212

1313
#ifndef _MSC_VER
1414
#include <stdbool.h>

‎tolua.c

+12-11
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,7 @@ LUA_API int tolua_getvaluetype(lua_State *L, int stackPos)
15151515
lua_getref(L, LUA_RIDX_CHECKVALUE);
15161516
lua_pushvalue(L, stackPos);
15171517
lua_call(L, 1, 1);
1518-
int ret = (int)luaL_checknumber(L, -1);
1518+
int ret = (int)lua_tonumber(L, -1);
15191519
lua_pop(L, 1);
15201520
return ret;
15211521
}
@@ -2183,6 +2183,7 @@ static const struct luaL_Reg tolua_funcs[] =
21832183
{ "initget", tolua_initgettable},
21842184
{ "int64", tolua_newint64},
21852185
{ "uint64", tolua_newuint64},
2186+
{ "traceback", traceback},
21862187
{ NULL, NULL }
21872188
};
21882189

@@ -2259,7 +2260,7 @@ void tolua_openvaluetype(lua_State *L)
22592260
}
22602261

22612262
void tolua_openluavec3(lua_State *L)
2262-
{
2263+
{
22632264
lua_getglobal(L, "Vector3");
22642265

22652266
if (!lua_istable(L, 1))
@@ -2278,7 +2279,7 @@ void tolua_openluavec3(lua_State *L)
22782279
}
22792280

22802281
void tolua_openluavec2(lua_State *L)
2281-
{
2282+
{
22822283
lua_getglobal(L, "Vector2");
22832284

22842285
if (!lua_istable(L, 1))
@@ -2297,7 +2298,7 @@ void tolua_openluavec2(lua_State *L)
22972298
}
22982299

22992300
void tolua_openluavec4(lua_State *L)
2300-
{
2301+
{
23012302
lua_getglobal(L, "Vector4");
23022303

23032304
if (!lua_istable(L, 1))
@@ -2316,7 +2317,7 @@ void tolua_openluavec4(lua_State *L)
23162317
}
23172318

23182319
void tolua_openluaclr(lua_State *L)
2319-
{
2320+
{
23202321
lua_getglobal(L, "Color");
23212322

23222323
if (!lua_istable(L, 1))
@@ -2335,7 +2336,7 @@ void tolua_openluaclr(lua_State *L)
23352336
}
23362337

23372338
void tolua_openluaquat(lua_State *L)
2338-
{
2339+
{
23392340
lua_getglobal(L, "Quaternion");
23402341

23412342
if (!lua_istable(L, 1))
@@ -2349,12 +2350,12 @@ void tolua_openluaquat(lua_State *L)
23492350
lua_rawseti(L, LUA_REGISTRYINDEX, LUA_RIDX_PACKQUAT);
23502351
lua_pushstring(L, "Get");
23512352
lua_rawget(L, -2);
2352-
lua_rawseti(L, LUA_REGISTRYINDEX, LUA_RIDX_UNPACKQUAT);
2353+
lua_rawseti(L, LUA_REGISTRYINDEX, LUA_RIDX_UNPACKQUAT);
23532354
lua_pop(L, 1);
23542355
}
23552356

23562357
void tolua_openlualayermask(lua_State *L)
2357-
{
2358+
{
23582359
lua_getglobal(L, "LayerMask");
23592360

23602361
if (!lua_istable(L, 1))
@@ -2493,11 +2494,11 @@ static int mathf_lineartogammaspace (lua_State *L)
24932494
{
24942495
lua_Number value = luaL_checknumber(L, 1);
24952496

2496-
if (value <= 0.0F)
2497+
if (value <= 0.0f)
24972498
{
24982499
value = 0;
24992500
}
2500-
else if (value <= 0.0031308F)
2501+
else if (value <= 0.0031308f)
25012502
{
25022503
value *= 12.92f;
25032504
}
@@ -2585,7 +2586,7 @@ LUALIB_API void tolua_openlibs(lua_State *L)
25852586
lua_rawset(L, -3);
25862587

25872588
lua_pushstring(L, "version");
2588-
lua_pushstring(L, "1.0.5");
2589+
lua_pushstring(L, "1.0.7");
25892590
lua_rawset(L, -3);
25902591

25912592
lua_settop(L,top);

0 commit comments

Comments
 (0)