diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 15 | ||||
| -rw-r--r-- | src/lutf8libext.patch | 173 | ||||
| -rw-r--r-- | src/textadept.c | 4 |
3 files changed, 187 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index bb174d57..fba1bb10 100644 --- a/src/Makefile +++ b/src/Makefile @@ -126,9 +126,9 @@ lua_objs = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o \ lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o \ lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \ lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o -lua_lib_objs = lpcap.o lpcode.o lpprint.o lptree.o lpvm.o lfs.o +lua_lib_objs = lpcap.o lpcode.o lpprint.o lptree.o lpvm.o lfs.o lutf8libext.o luajit_lib_objs = lpcapjit.o lpcodejit.o lpprintjit.o lptreejit.o lpvmjit.o \ - lfsjit.o lutf8libjit.o + lfsjit.o lutf8libjit.o lutf8libextjit.o lua_spawn_objs = lspawn.o lspawnjit.o lspawn-curses.o lspawnjit-curses.o gtdialog_objs = gtdialog.o gtdialog-curses.o termkey_unix_objs = driver-ti.o driver-csi.o @@ -387,6 +387,7 @@ scintillua_zip = scintillua_3.6.4-1.zip lua_tgz = lua-5.3.2.tar.gz lpeg_tgz = lpeg-1.0.0.tar.gz lfs_zip = v_1_6_3.zip +luautf8_zip = 0.1.1.zip lspawn_zip = lspawn_1.4.zip luajit_tgz = LuaJIT-2.0.3.tar.gz libluajit_tgz = libluajit_2.0.3.x86_64.tgz @@ -416,16 +417,24 @@ LexLPeg.cxx: | ../lexers ; ln -s $|/$@ $@ $(lua_tgz): ; wget http://www.lua.org/ftp/$@ $(lpeg_tgz): ; wget http://www.inf.puc-rio.br/~roberto/lpeg/$@ $(lfs_zip): ; wget http://github.com/keplerproject/luafilesystem/archive/$@ +$(luautf8_zip): ; wget https://github.com/starwing/luautf8/archive/$@ $(lspawn_zip): ; wget $(lspawn_url) -O $@ lua: lua.patch | $(lua_tgz) mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@ patch -d $@ -N -p1 < $< -lualibs: lua/src/lib/lpeg lua/src/lib/lfs lua/src/lib/lspawn +lualibs: lua/src/lib/lpeg lua/src/lib/lfs lua/src/lib/lutf8libext \ + lua/src/lib/lspawn lua/src/lib/lpeg: | $(lpeg_tgz) mkdir -p $@ && tar xzf $| -C $@ && mv $@/*/*.c $@/*/*.h $(dir $@) lua/src/lib/lfs: lfs.patch | $(lfs_zip) mkdir -p $@ && unzip -d $@ $| && mv $@/*/src/*.c $@/*/src/*.h $(dir $@) patch -d $(dir $@) -N -p1 < $< +lua/src/lib/lutf8libext: lutf8libext.patch | $(luautf8_zip) + mkdir -p $@ && unzip -d $@ $| && mv $@/*/*.h $(dir $@) + # Rename lutf8lib.c in order to prevent conflicts with Lua's lutf8lib.c, + # needed by LuaJIT. + mv $@/*/lutf8lib.c $(dir $@)lutf8libext.c + patch -d $(dir $@) -N -p1 < $< lua/src/lib/lspawn: | $(lspawn_zip) mkdir -p $@ && unzip -d $@ $| && mv $@/*/*.c $(dir $@) lua/src/lib/lutf8lib.c: lutf8libjit.patch diff --git a/src/lutf8libext.patch b/src/lutf8libext.patch new file mode 100644 index 00000000..ab881928 --- /dev/null +++ b/src/lutf8libext.patch @@ -0,0 +1,173 @@ +--- lutf8libext.c 2016-03-26 09:39:32.469103890 -0400 ++++ lib/lutf8libext.c 2016-03-26 13:29:06.770738807 -0400 +@@ -199,8 +199,10 @@ + define_category(space) + define_converter(tolower) + define_converter(toupper) ++#if 0 + define_converter(totitle) + define_converter(tofold) ++#endif + + #undef define_category + #undef define_converter +@@ -223,6 +225,7 @@ + return 0; + } + ++#if 0 + static int utf8_width(unsigned ch, int ambi_is_single) { + if (find_in_range(doublewidth_table, table_size(doublewidth_table), ch)) + return 2; +@@ -234,6 +237,7 @@ + return 0; + return 1; + } ++#endif + + + /* string module compatible interface */ +@@ -258,11 +262,13 @@ + luaL_addlstring(b, buff, n); + } + ++#if 0 + static lua_Integer byterelat(lua_Integer pos, size_t len) { + if (pos >= 0) return pos; + else if (0u - (size_t)pos > len) return 0; + else return (lua_Integer)len + pos + 1; + } ++#endif + + static int u_posrange(const char **ps, const char **pe, + lua_Integer posi, lua_Integer posj) { +@@ -281,6 +287,7 @@ + return *ps < *pe; + } + ++#if 0 + static int Lutf8_len(lua_State *L) { + size_t len; + const char *s = luaL_checklstring(L, 1, &len); +@@ -292,6 +299,7 @@ + lua_pushinteger(L, (lua_Integer)utf8_length(s+posi, s+posj+1)); + return 1; + } ++#endif + + static int Lutf8_sub(lua_State *L) { + const char *e, *s = check_utf8(L, 1, &e); +@@ -344,11 +352,13 @@ + static int Lutf8_upper(lua_State *L) + { return convert(L, utf8_toupper); } + ++#if 0 + static int Lutf8_title(lua_State *L) + { return convert(L, utf8_totitle); } + + static int Lutf8_fold(lua_State *L) + { return convert(L, utf8_tofold); } ++#endif + + static int Lutf8_byte(lua_State *L) { + size_t n = 0; +@@ -367,6 +377,7 @@ + return n; + } + ++#if 0 + static int Lutf8_codepoint(lua_State *L) { + const char *e, *s = check_utf8(L, 1, &e); + size_t len = e-s; +@@ -643,6 +654,7 @@ + lua_pushinteger(L, 0); + return 1; + } ++#endif + + + /* utf8 pattern matching implement */ +@@ -1265,21 +1277,26 @@ + + #define UTF8PATT "[\0-\x7F\xC2-\xF4][\x80-\xBF]*" + +-LUALIB_API int luaopen_utf8(lua_State *L) { ++LUALIB_API int luaopen_utf8_ext(lua_State *L) { + luaL_Reg libs[] = { + #define ENTRY(name) { #name, Lutf8_##name } ++#if 0 + ENTRY(offset), + ENTRY(codes), + ENTRY(codepoint), + + ENTRY(len), ++#endif + ENTRY(sub), + ENTRY(reverse), + ENTRY(lower), + ENTRY(upper), ++#if 0 + ENTRY(title), + ENTRY(fold), ++#endif + ENTRY(byte), ++#if 0 + ENTRY(char), + ENTRY(escape), + ENTRY(insert), +@@ -1289,6 +1306,7 @@ + ENTRY(width), + ENTRY(widthindex), + ENTRY(ncasecmp), ++#endif + ENTRY(find), + ENTRY(gmatch), + ENTRY(gsub), +@@ -1301,11 +1319,13 @@ + luaL_newlib(L, libs); + #else + lua_createtable(L, 0, sizeof(libs)/sizeof(libs[0])); +- luaL_register(L, NULL, libs); ++ luaL_register(L, "utf8_ext", libs); + #endif + ++#if 0 + lua_pushliteral(L, UTF8PATT); + lua_setfield(L, -2, "charpattern"); ++#endif + + return 1; + } +--- unidata.h 2015-05-31 04:48:35.000000000 -0400 ++++ lib/unidata.h 2016-03-26 13:01:16.951664669 -0400 +@@ -904,6 +904,7 @@ + { 0x3000, 0x3000, 1 }, + }; + ++#if 0 + static struct range_table unprintable_table[] = { + { 0xAD, 0x34F, 674 }, + { 0x61C, 0x115F, 2883 }, +@@ -921,6 +922,7 @@ + { 0x1D173, 0x1D17A, 1 }, + { 0xE0000, 0xE0FFF, 1 }, + }; ++#endif + + static struct range_table graph_table[] = { + { 0x20, 0x7E, 1 }, +@@ -2547,6 +2549,7 @@ + { 0x118C0, 0x118DF, 1, -32 }, + }; + ++#if 0 + static struct conv_table totitle_table[] = { + { 0x61, 0x7A, 1, -32 }, + { 0xB5, 0xB5, 1, 743 }, +@@ -3060,5 +3063,6 @@ + { 0xF0000, 0xFFFFD, 1 }, + { 0x100000, 0x10FFFD, 1 }, + }; ++#endif + + #endif /* unidata_h */ diff --git a/src/textadept.c b/src/textadept.c index 3725254a..a5daadda 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -239,7 +239,7 @@ static void new_buffer(sptr_t); static Scintilla *new_view(sptr_t); static int lL_init(lua_State *, int, char **, int); LUALIB_API int luaopen_lpeg(lua_State *), luaopen_lfs(lua_State *); -LUALIB_API int luaopen_spawn(lua_State *); +LUALIB_API int luaopen_utf8_ext(lua_State *), luaopen_spawn(lua_State *); LUALIB_API int lspawn_pushfds(lua_State *), lspawn_readfds(lua_State *); /** @@ -1513,7 +1513,7 @@ static int lL_init(lua_State *L, int argc, char **argv, int reinit) { #endif } lua_pushinteger(L, (sptr_t)L), lua_setglobal(L, "_LUA"); - luaL_openlibs(L); + luaL_openlibs(L), lL_openlib(L, utf8_ext); lL_openlib(L, lpeg), lL_openlib(L, lfs), lL_openlib(L, spawn); lua_newtable(L); |