Skip to content

Commit 6bc0398

Browse files
jarjin2000jarjin2000
committed
更新tolua#到1.0.7版
1 parent 31781a9 commit 6bc0398

File tree

429 files changed

+13925
-116226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

429 files changed

+13925
-116226
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@
3232
/window
3333
/Plugins
3434
/android/libs
35+
/macnojit/build
36+
/iOS/build

‎LICENSE

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 topameng
3+
Copyright (c) 2016 topameng
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
this software and associated documentation files (the "Software"), to deal in
7+
the Software without restriction, including without limitation the rights to
8+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9+
the Software, and to permit persons to whom the Software is furnished to do so,
10+
subject to the following conditions:
1111

1212
The above copyright notice and this permission notice shall be included in all
1313
copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
22-
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ android: build_arm.sh build_x86.sh (mingw + luajit2.0.4) <br>
55
mac: build_osx.sh (xcode + luac5.1.5 luajit can't run in unity5) <br>
66
ios: build_ios.sh (xcode + luajit2.1 beta) <br>
77

8-
NDK 版本:android-ndk-r10e 默认安装到 D:/android-ndk-r10e
8+
NDK 版本:android-ndk-r10e 默认安装到 D:/android-ndk-r10e<br>
9+
https://dl.google.com/android/repository/android-ndk-r10e-windows-x86_64.zip<br>
10+
Msys2配置说明<br>
11+
https://github.com/topameng/tolua_runtime/wiki<br>
12+
配置好的Msys2下载<br>
13+
https://pan.baidu.com/s/1c2JzvDQ<br>
14+
915
#Libs
1016
**cjson**<br>
1117
https://github.com/mpx/lua-cjson<br>
1218
**protoc-gen-lua**<br>
1319
https://github.com/topameng/protoc-gen-lua<br>
1420
**LuaSocket** <br>
15-
https://github.com/diegonehab/luasocket
21+
https://github.com/diegonehab/luasocket<br>
1622
**struct**<br>
17-
http://www.inf.puc-rio.br/~roberto/struct/
23+
http://www.inf.puc-rio.br/~roberto/struct/<br>
1824
**lpeg**<br>
19-
http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html
25+
http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html

‎android/jni/Android.mk

+17-18
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include $(PREBUILT_STATIC_LIBRARY)
88
include $(CLEAR_VARS)
99
LOCAL_FORCE_STATIC_EXECUTABLE := true
1010
LOCAL_MODULE := tolua
11-
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../luajit/src
11+
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../luajit-2.1/src
1212
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../pbc
1313
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../cjson
1414
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../
@@ -21,22 +21,6 @@ LOCAL_SRC_FILES := ../../tolua.c \
2121
../../pb.c \
2222
../../lpeg.c \
2323
../../struct.c \
24-
../../sproto/sproto.c \
25-
../../sproto/lsproto.c \
26-
../../pbc/src/alloc.c \
27-
../../pbc/src/array.c \
28-
../../pbc/src/bootstrap.c \
29-
../../pbc/src/context.c \
30-
../../pbc/src/decode.c \
31-
../../pbc/src/map.c \
32-
../../pbc/src/pattern.c \
33-
../../pbc/src/proto.c \
34-
../../pbc/src/register.c \
35-
../../pbc/src/rmessage.c \
36-
../../pbc/src/stringpool.c \
37-
../../pbc/src/varint.c \
38-
../../pbc/src/wmessage.c \
39-
../../pbc/binding/lua/pbc-lua.c \
4024
../../cjson/strbuf.c \
4125
../../cjson/lua_cjson.c \
4226
../../cjson/fpconv.c \
@@ -53,7 +37,22 @@ LOCAL_SRC_FILES := ../../tolua.c \
5337
../../luasocket/timeout.c \
5438
../../luasocket/udp.c \
5539
../../luasocket/usocket.c \
56-
../../luasocket/compat.c \
40+
../../sproto/sproto.c \
41+
../../sproto/lsproto.c \
42+
../../pbc/src/alloc.c \
43+
../../pbc/src/array.c \
44+
../../pbc/src/bootstrap.c \
45+
../../pbc/src/context.c \
46+
../../pbc/src/decode.c \
47+
../../pbc/src/map.c \
48+
../../pbc/src/pattern.c \
49+
../../pbc/src/proto.c \
50+
../../pbc/src/register.c \
51+
../../pbc/src/rmessage.c \
52+
../../pbc/src/stringpool.c \
53+
../../pbc/src/varint.c \
54+
../../pbc/src/wmessage.c \
55+
../../pbc/binding/lua/pbc-lua.c \
5756

5857
LOCAL_WHOLE_STATIC_LIBRARIES += libluajit
5958
include $(BUILD_SHARED_LIBRARY)

‎android/jni/libluajit.a

69.9 KB
Binary file not shown.

‎android/obj/local/armeabi-v7a/libluajit.a

-688 KB
Binary file not shown.

‎android/obj/local/x86/libluajit.a

-884 KB
Binary file not shown.

‎build_arm.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
mkdir -p Plugins/Android/libs/armeabi-v7a
2-
3-
cd luajit/src
1+
cd luajit-2.1/src
42

53
# Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.0+ (ICS)
64
NDK=D:/android-ndk-r10e
7-
NDKABI=21
5+
NDKABI=19
86
NDKVER=$NDK/toolchains/arm-linux-androideabi-4.9
97
NDKP=$NDKVER/prebuilt/windows-x86_64/bin/arm-linux-androideabi-
108
NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm"
119
NDKARCH="-march=armv7-a -mfloat-abi=softfp -Wl,--fix-cortex-a8"
1210

1311
make clean
14-
make HOST_CC="gcc -O2 -m32" CROSS=$NDKP TARGET_SYS=Linux TARGET_FLAGS="$NDKF $NDKARCH"
12+
make HOST_CC="gcc -m32" CROSS=$NDKP TARGET_SYS=Linux TARGET_FLAGS="$NDKF $NDKARCH"
1513
cp ./libluajit.a ../../android/jni/libluajit.a
1614
make clean
1715

‎build_win32.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
mkdir -p window/x86
44
mkdir -p Plugins/x86
55

6-
cd luajit
6+
cd luajit-2.1
77
mingw32-make clean
88

99
mingw32-make BUILDMODE=static CC="gcc -m32 -O3"
@@ -40,13 +40,12 @@ gcc -m32 -O3 -std=gnu99 -shared \
4040
luasocket/timeout.c \
4141
luasocket/udp.c \
4242
luasocket/wsocket.c \
43-
luasocket/compat.c \
4443
sproto/sproto.c \
4544
sproto/lsproto.c \
4645
pbc/binding/lua/pbc-lua.c \
4746
-o Plugins/x86/tolua.dll \
4847
-I./ \
49-
-Iluajit/src \
48+
-Iluajit-2.1/src \
5049
-Iluasocket \
5150
-Isproto \
5251
-Ipbc \

‎build_win64.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
2-
# 62 Bit Version
2+
# 64 Bit Version
33
mkdir -p window/x86_64
44
mkdir -p Plugins/x86_64
55

6-
cd luajit
6+
cd luajit-2.1
77
mingw32-make clean
88

9-
mingw32-make BUILDMODE=static CC="gcc -m64 -O3"
9+
mingw32-make BUILDMODE=static CC="gcc -m64 -O2" XCFLAGS=-DLUAJIT_ENABLE_GC64
1010
cp src/libluajit.a ../window/x86_64/libluajit.a
1111
mingw32-make clean
1212

@@ -17,7 +17,7 @@ cp build/libpbc.a ../window/x86_64/libpbc.a
1717

1818
cd ..
1919

20-
gcc -m64 -O3 -std=gnu99 -shared \
20+
gcc -m64 -O2 -std=gnu99 -shared \
2121
tolua.c \
2222
int64.c \
2323
uint64.c \
@@ -40,13 +40,12 @@ gcc -m64 -O3 -std=gnu99 -shared \
4040
luasocket/timeout.c \
4141
luasocket/udp.c \
4242
luasocket/wsocket.c \
43-
luasocket/compat.c \
4443
sproto/sproto.c \
4544
sproto/lsproto.c \
4645
pbc/binding/lua/pbc-lua.c \
4746
-o Plugins/x86_64/tolua.dll \
4847
-I./ \
49-
-Iluajit/src \
48+
-Iluajit-2.1/src \
5049
-Iluasocket \
5150
-Isproto \
5251
-Ipbc \

‎build_x86.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
mkdir -p Plugins/Android/libs/x86
2-
3-
cd luajit/src
1+
cd luajit-2.1/src
42

53
# Android/x86, x86 (i686 SSE3), Android 4.0+ (ICS)
64
NDK=D:/android-ndk-r10e
7-
NDKABI=21
5+
NDKABI=19
86
NDKVER=$NDK/toolchains/x86-4.9
97
NDKP=$NDKVER/prebuilt/windows-x86_64/bin/i686-linux-android-
108
NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-x86"

‎cjson/lua_cjson.c

+9-7
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
#include <string.h>
4141
#include <math.h>
4242
#include <limits.h>
43-
#include <lua.h>
44-
#include <lauxlib.h>
43+
#include "lua.h"
44+
#include "lualib.h"
45+
#include "lauxlib.h"
4546

4647
#include "strbuf.h"
4748
#include "fpconv.h"
@@ -1290,7 +1291,8 @@ static int json_decode(lua_State *l)
12901291

12911292
/* ===== INITIALISATION ===== */
12921293

1293-
#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
1294+
//#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502
1295+
#if 0
12941296
/* Compatibility for Lua 5.1.
12951297
*
12961298
* luaL_setfuncs() is used to create a module table where the functions have
@@ -1300,13 +1302,13 @@ static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
13001302
int i;
13011303

13021304
luaL_checkstack(l, nup, "too many upvalues");
1303-
for (; reg->name != NULL; reg++) { /* fill the table with given functions */
1304-
for (i = 0; i < nup; i++) /* copy upvalues to the top */
1305+
for (; reg->name != NULL; reg++) {
1306+
for (i = 0; i < nup; i++)
13051307
lua_pushvalue(l, -nup);
1306-
lua_pushcclosure(l, reg->func, nup); /* closure with those upvalues */
1308+
lua_pushcclosure(l, reg->func, nup);
13071309
lua_setfield(l, -(nup + 2), reg->name);
13081310
}
1309-
lua_pop(l, nup); /* remove upvalues */
1311+
lua_pop(l, nup);
13101312
}
13111313
#endif
13121314

‎iOS/.DS_Store

-2 KB
Binary file not shown.

‎iOS/libluajit-arm64.a

-833 KB
Binary file not shown.

‎iOS/libluajit-armv7.a

-815 KB
Binary file not shown.

‎iOS/libluajit-armv7s.a

-823 KB
Binary file not shown.

‎iOS/libluajit.a

-2.41 MB
Binary file not shown.

‎iOS/tolua.xcodeproj/project.pbxproj

+55-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
53208EEB1CDE1178002B6AFA /* libpbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53208EEA1CDE1178002B6AFA /* libpbc.a */; };
1110
53208EF11CDE11B5002B6AFA /* lsproto.c in Sources */ = {isa = PBXBuildFile; fileRef = 53208EED1CDE11B5002B6AFA /* lsproto.c */; };
1211
53208EF21CDE11B5002B6AFA /* sproto.c in Sources */ = {isa = PBXBuildFile; fileRef = 53208EEF1CDE11B5002B6AFA /* sproto.c */; };
1312
5371FF1E1CDE216700AD16D3 /* pbc-lua.c in Sources */ = {isa = PBXBuildFile; fileRef = 5371FF1D1CDE216700AD16D3 /* pbc-lua.c */; };
@@ -63,6 +62,29 @@
6362
5371FF1C1CDE215800AD16D3 /* pbc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pbc.h; path = ../../pbc/pbc.h; sourceTree = "<group>"; };
6463
5371FF1D1CDE216700AD16D3 /* pbc-lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "pbc-lua.c"; path = "../../pbc/binding/lua/pbc-lua.c"; sourceTree = "<group>"; };
6564
53BD213A1D5EBC0500A20481 /* uint64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = uint64.c; path = ../../uint64.c; sourceTree = "<group>"; };
65+
53C9D60D1EF9652A00B0828D /* alloc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = alloc.c; sourceTree = "<group>"; };
66+
53C9D60E1EF9652A00B0828D /* alloc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = alloc.h; sourceTree = "<group>"; };
67+
53C9D60F1EF9652A00B0828D /* array.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = array.c; sourceTree = "<group>"; };
68+
53C9D6101EF9652A00B0828D /* array.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = array.h; sourceTree = "<group>"; };
69+
53C9D6111EF9652A00B0828D /* bootstrap.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = bootstrap.c; sourceTree = "<group>"; };
70+
53C9D6121EF9652A00B0828D /* bootstrap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bootstrap.h; sourceTree = "<group>"; };
71+
53C9D6131EF9652A00B0828D /* context.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = context.c; sourceTree = "<group>"; };
72+
53C9D6141EF9652A00B0828D /* context.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = context.h; sourceTree = "<group>"; };
73+
53C9D6151EF9652A00B0828D /* decode.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = decode.c; sourceTree = "<group>"; };
74+
53C9D6161EF9652A00B0828D /* descriptor.pbc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = descriptor.pbc.h; sourceTree = "<group>"; };
75+
53C9D6171EF9652A00B0828D /* map.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = map.c; sourceTree = "<group>"; };
76+
53C9D6181EF9652A00B0828D /* map.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = map.h; sourceTree = "<group>"; };
77+
53C9D6191EF9652A00B0828D /* pattern.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pattern.c; sourceTree = "<group>"; };
78+
53C9D61A1EF9652A00B0828D /* pattern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pattern.h; sourceTree = "<group>"; };
79+
53C9D61B1EF9652A00B0828D /* proto.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = proto.c; sourceTree = "<group>"; };
80+
53C9D61C1EF9652A00B0828D /* proto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = proto.h; sourceTree = "<group>"; };
81+
53C9D61D1EF9652A00B0828D /* register.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = register.c; sourceTree = "<group>"; };
82+
53C9D61E1EF9652A00B0828D /* rmessage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = rmessage.c; sourceTree = "<group>"; };
83+
53C9D61F1EF9652A00B0828D /* stringpool.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = stringpool.c; sourceTree = "<group>"; };
84+
53C9D6201EF9652A00B0828D /* stringpool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stringpool.h; sourceTree = "<group>"; };
85+
53C9D6211EF9652A00B0828D /* varint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = varint.c; sourceTree = "<group>"; };
86+
53C9D6221EF9652A00B0828D /* varint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = varint.h; sourceTree = "<group>"; };
87+
53C9D6231EF9652A00B0828D /* wmessage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = wmessage.c; sourceTree = "<group>"; };
6688
8400929B1CCF43D600F89A56 /* libtolua.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtolua.a; sourceTree = BUILT_PRODUCTS_DIR; };
6789
8400929E1CCF43D600F89A56 /* tolua.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = tolua.h; sourceTree = "<group>"; };
6890
840092A01CCF43D600F89A56 /* tolua.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = tolua.m; sourceTree = "<group>"; };
@@ -118,7 +140,6 @@
118140
buildActionMask = 2147483647;
119141
files = (
120142
840092A81CCF44F800F89A56 /* libluajit.a in Frameworks */,
121-
53208EEB1CDE1178002B6AFA /* libpbc.a in Frameworks */,
122143
);
123144
runOnlyForDeploymentPostprocessing = 0;
124145
};
@@ -139,12 +160,44 @@
139160
5371FF1B1CDE213F00AD16D3 /* pbc */ = {
140161
isa = PBXGroup;
141162
children = (
163+
53C9D60C1EF9652A00B0828D /* src */,
142164
5371FF1D1CDE216700AD16D3 /* pbc-lua.c */,
143165
5371FF1C1CDE215800AD16D3 /* pbc.h */,
144166
);
145167
name = pbc;
146168
sourceTree = "<group>";
147169
};
170+
53C9D60C1EF9652A00B0828D /* src */ = {
171+
isa = PBXGroup;
172+
children = (
173+
53C9D60D1EF9652A00B0828D /* alloc.c */,
174+
53C9D60E1EF9652A00B0828D /* alloc.h */,
175+
53C9D60F1EF9652A00B0828D /* array.c */,
176+
53C9D6101EF9652A00B0828D /* array.h */,
177+
53C9D6111EF9652A00B0828D /* bootstrap.c */,
178+
53C9D6121EF9652A00B0828D /* bootstrap.h */,
179+
53C9D6131EF9652A00B0828D /* context.c */,
180+
53C9D6141EF9652A00B0828D /* context.h */,
181+
53C9D6151EF9652A00B0828D /* decode.c */,
182+
53C9D6161EF9652A00B0828D /* descriptor.pbc.h */,
183+
53C9D6171EF9652A00B0828D /* map.c */,
184+
53C9D6181EF9652A00B0828D /* map.h */,
185+
53C9D6191EF9652A00B0828D /* pattern.c */,
186+
53C9D61A1EF9652A00B0828D /* pattern.h */,
187+
53C9D61B1EF9652A00B0828D /* proto.c */,
188+
53C9D61C1EF9652A00B0828D /* proto.h */,
189+
53C9D61D1EF9652A00B0828D /* register.c */,
190+
53C9D61E1EF9652A00B0828D /* rmessage.c */,
191+
53C9D61F1EF9652A00B0828D /* stringpool.c */,
192+
53C9D6201EF9652A00B0828D /* stringpool.h */,
193+
53C9D6211EF9652A00B0828D /* varint.c */,
194+
53C9D6221EF9652A00B0828D /* varint.h */,
195+
53C9D6231EF9652A00B0828D /* wmessage.c */,
196+
);
197+
name = src;
198+
path = ../../pbc/src;
199+
sourceTree = "<group>";
200+
};
148201
840092921CCF43D600F89A56 = {
149202
isa = PBXGroup;
150203
children = (

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

786 Bytes
Binary file not shown.

‎lpeg.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2345,7 +2345,7 @@ static int matchl (lua_State *L) {
23452345
}
23462346

23472347

2348-
static struct luaL_reg pattreg[] = {
2348+
static struct luaL_Reg pattreg[] = {
23492349
{"match", matchl},
23502350
{"print", printpat_l},
23512351
{"locale", locale_l},
@@ -2371,7 +2371,7 @@ static struct luaL_reg pattreg[] = {
23712371
};
23722372

23732373

2374-
static struct luaL_reg metapattreg[] = {
2374+
static struct luaL_Reg metapattreg[] = {
23752375
{"__add", union_l},
23762376
{"__pow", star_l},
23772377
{"__sub", diff_l},

‎luajit-2.1/COPYRIGHT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
===============================================================================
22
LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
33

4-
Copyright (C) 2005-2016 Mike Pall. All rights reserved.
4+
Copyright (C) 2005-2017 Mike Pall. All rights reserved.
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)