diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-06 11:04:14 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-06 11:04:14 +0000 |
commit | ad714058c45d0dd9e1f1417d3af804229b93b6f9 (patch) | |
tree | 6bb4f268b2b3537df995f58374551da92463fe68 /Build/source/texk/web2c/luatexdir | |
parent | 4169934ceb43a6b413b4280552bcd309333b469a (diff) |
LuaJITTeX
git-svn-id: svn://tug.org/texlive/trunk@32878 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/libluatex.am | 48 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luafontforge.am | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luamisc.am | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luasocket.am | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 63 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/lauxlib_bridge.h | 48 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/liolibext.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/lstrlibextjit.c | 395 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/luajitstuff.w | 643 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/luatex-api.h | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua/texluajitc.w | 575 | ||||
-rwxr-xr-x | Build/source/texk/web2c/luatexdir/luaimage.test | 3 | ||||
-rwxr-xr-x | Build/source/texk/web2c/luatexdir/luajitimage.test | 19 | ||||
-rwxr-xr-x | Build/source/texk/web2c/luatexdir/luajittex.test | 9 |
15 files changed, 1819 insertions, 35 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 185686e9878..862475fbc19 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,16 @@ +2014-02-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libluatex.am, am/luafontforge.am, am/luamisc.am, + am/luasocket.am, am/luatex.am: Add rules for LuaJITTeX. + + * luajittex.test, luajitimage.test: New tests for LuaJITTeX. + + Avoid compiler warnings. + * lua/liolibext.c, lua/luajitstuff.w: Drop compilation of + unused static functions. Avoid to compute unused value. + * lua/texluajitc.w: Include header for luac_main() prototype. + * lua/luatex-api.h: Drop duplicate luac_main() prototype. + 2014-02-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * lua/luainit.w: Change a little for LuaJITTeX. diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 70c2ec49a03..b1c7876524c 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -11,25 +11,45 @@ LUA_DEPEND = $(LUA52_DEPEND) ## libluatex ## -EXTRA_LIBRARIES += libluatex.a +EXTRA_LIBRARIES += libluatex.a libluajittex.a libluatex_a_DEPENDENCIES = libff.a +libluajittex_a_DEPENDENCIES = libjitff.a + +libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) +libluatex_a_preflags += $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 +libluatex_a_preflags += -DpdfTeX -I$(srcdir)/luatexdir +libluatex_a_preflags += -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' -I$(srcdir)/synctexdir + +libluatex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUA_INCLUDES) +libluajittex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) +libluajittex_a_CPPFLAGS += -DLuajitTeX -DLUAJIT_ENABLE_LUA52COMPAT -libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -libluatex_a_CPPFLAGS += $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 -libluatex_a_CPPFLAGS += -DpdfTeX -I$(srcdir)/luatexdir -libluatex_a_CPPFLAGS += $(LUA_INCLUDES) -libluatex_a_CPPFLAGS += -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' -I$(srcdir)/synctexdir libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) +libluajittex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) -## compatibility between poppler versions <=0.24.0 and >-0.25.0 +## compatibility between poppler versions <=0.24.4 and >=0.25.0 libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir/fake +libluajittex_a_CPPFLAGS += -I$(srcdir)/luatexdir/fake EXTRA_DIST += luatexdir/fake/StructTreeRoot.h +dist_libluatex_a_SOURCES = \ + luatexdir/lua/lstrlibext.c nodist_libluatex_a_SOURCES = \ + luastuff.c texluac.c \ + $(dist_libluatex_sources) \ + $(nodist_libluatex_sources) +dist_libluajittex_a_SOURCES = \ + luatexdir/lua/lauxlib_bridge.h \ + luatexdir/lua/lstrlibextjit.c +nodist_libluajittex_a_SOURCES = \ + luajitstuff.c texluajitc.c \ $(dist_libluatex_sources) \ $(nodist_libluatex_sources) +$(libluatex_a_OBJECTS): libff.a libmplib.a $(POPPLER_DEPEND) +$(libluajittex_a_OBJECTS): libjitff.a libmplib.a $(POPPLER_DEPEND) + ## from luatexdir ## libluatex_web = @@ -193,6 +213,8 @@ luagen.c: ctangle$(EXEEXT) luatexdir/lua/luagen.w $(luatex_lua_ctangle) luagen.w luainit.c: ctangle$(EXEEXT) luatexdir/lua/luainit.w $(luatex_lua_ctangle) luainit.w +luajitstuff.c: ctangle$(EXEEXT) luatexdir/lua/luajitstuff.w + $(luatex_lua_ctangle) luajitstuff.w luanode.c: ctangle$(EXEEXT) luatexdir/lua/luanode.w $(luatex_lua_ctangle) luanode.w luastuff.c: ctangle$(EXEEXT) luatexdir/lua/luastuff.w @@ -201,11 +223,14 @@ luatoken.c: ctangle$(EXEEXT) luatexdir/lua/luatoken.w $(luatex_lua_ctangle) luatoken.w texluac.c: ctangle$(EXEEXT) luatexdir/lua/texluac.w $(luatex_lua_ctangle) texluac.w +texluajitc.c: ctangle$(EXEEXT) luatexdir/lua/texluajitc.w + $(luatex_lua_ctangle) texluajitc.w -libluatex_web += luatexdir/lua/luagen.w luatexdir/lua/luainit.w luatexdir/lua/luanode.w -libluatex_web += luatexdir/lua/luastuff.w luatexdir/lua/luatoken.w luatexdir/lua/texluac.w +libluatex_web += luatexdir/lua/luagen.w luatexdir/lua/luainit.w luatexdir/lua/luajitstuff.w +libluatex_web += luatexdir/lua/luanode.w luatexdir/lua/luastuff.w luatexdir/lua/luatoken.w +libluatex_web += luatexdir/lua/texluac.w luatexdir/lua/texluajitc.w -nodist_libluatex_sources += luagen.c luainit.c luanode.c luastuff.c luatoken.c texluac.c +nodist_libluatex_sources += luagen.c luainit.c luanode.c luatoken.c dist_libluatex_sources += \ luatexdir/lua/lcallbacklib.c \ @@ -220,7 +245,6 @@ dist_libluatex_sources += \ luatexdir/lua/lnodelib.c \ luatexdir/lua/liolibext.c \ luatexdir/lua/loslibext.c \ - luatexdir/lua/lstrlibext.c \ luatexdir/lua/lpdflib.c \ luatexdir/lua/lstatslib.c \ luatexdir/lua/ltexiolib.c \ @@ -512,8 +536,6 @@ dist_libluatex_sources += \ dist_libluatex_sources += \ mplibdir/lmplib.c -$(libluatex_a_OBJECTS): libff.a libmplib.a $(POPPLER_DEPEND) - EXTRA_DIST += \ $(dist_libluatex_sources) \ $(libluatex_web) diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am index eaf2b591076..483745db253 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -5,22 +5,29 @@ ## luafontforge ## -EXTRA_LIBRARIES += libff.a +EXTRA_LIBRARIES += libff.a libjitff.a libff_a_DEPENDENCIES = libunilib.a libluamisc.a +libjitff_a_DEPENDENCIES = libunilib.a libluajitmisc.a $(libff_a_OBJECTS): $(libff_a_DEPENDENCIES) +$(libjitff_a_OBJECTS): $(libjitff_a_DEPENDENCIES) -libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) \ - -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \ +libff_a_postflags = -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \ -DUSE_OUR_MEMORY=1 \ -I$(top_srcdir)/w2c \ -I$(top_srcdir)/luatexdir/unilib \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge + +libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(libff_a_postflags) +libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) $(libff_a_postflags) + libff_a_CFLAGS = # $(WARNING_CFLAGS) +libjitff_a_CFLAGS = # $(WARNING_CFLAGS) nodist_libff_a_SOURCES = $(libff_sources) +nodist_libjitff_a_SOURCES = $(libff_sources) libff_sources = \ luatexdir/luafontloader/fontforge/fontforge/PfEd.h \ diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index 8d29b861aa0..42f01cc5b98 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -6,19 +6,22 @@ ## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, ## and slnunicode) -EXTRA_LIBRARIES += libluamisc.a +EXTRA_LIBRARIES += libluamisc.a libluajitmisc.a libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a +libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a $(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES) +$(libluajitmisc_a_OBJECTS): $(libluajitmisc_a_DEPENDENCIES) + +libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES) +libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUAJIT_INCLUDES) -libluamisc_a_CPPFLAGS = \ - $(ZLIB_INCLUDES) \ - $(ZZIPLIB_INCLUDES) \ - $(LUA_INCLUDES) libluamisc_a_CFLAGS = # $(WARNING_CFLAGS) +libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS) nodist_libluamisc_a_SOURCES = $(libluamisc_sources) +nodist_libluajitmisc_a_SOURCES = $(libluamisc_sources) libluamisc_sources = \ luatexdir/luafilesystem/src/lfs.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index bec2e748cd7..dd1c2fbd48d 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -5,17 +5,24 @@ ## luasocket ## -EXTRA_LIBRARIES += libluasocket.a +EXTRA_LIBRARIES += libluasocket.a libluajitsocket.a libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) +libluajitsocket_a_DEPENDENCIES = $(ZLIB_DEPEND) $(libluasocket_a_OBJECTS): $(LUA_DEPEND) +$(libluajitsocket_a_OBJECTS): $(LUAJIT_DEPEND) libluasocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_INCLUDES) +libluajitsocket_a_CPPFLAGS = \ + -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUAJIT_INCLUDES) + libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) +libluajitsocket_a_CFLAGS = # $(WARNING_CFLAGS) nodist_libluasocket_a_SOURCES = $(libluasocket_sources) +nodist_libluajitsocket_a_SOURCES = $(libluasocket_sources) libluasocket_sources = \ luatexdir/luasocket/src/auxiliar.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index a8ee3b2f1eb..123360311ee 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -3,7 +3,7 @@ ## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -## luaTeX +## LuaTeX and LuaJITTeX ## if LUATEX bin_PROGRAMS += luatex @@ -15,32 +15,59 @@ else !WIN32 bin_links += luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac endif !WIN32 endif LUATEX -EXTRA_PROGRAMS += luatex + +if LUAJITTEX +bin_PROGRAMS += luajittex +if WIN32 +noinst_PROGRAMS += call_luajittex +install_exe_links += install-luajittex-links +uninstall_exe_links += uninstall-luajittex-links +else !WIN32 +bin_links += luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc +endif !WIN32 +endif LUAJITTEX + +EXTRA_PROGRAMS += luatex luajittex # Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx +nodist_EXTRA_luajittex_SOURCES = dummy.cxx + +luatex_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) +luatex_postflags = -I$(srcdir)/libmd5 -I$(srcdir)/luatexdir -I$(srcdir)/mplibdir +luatex_postflags += -Dextra_version_info=`date +-%Y%m%d%H` +luatex_postflags += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' + +luatex_CPPFLAGS = $(luatex_preflags) $(LUA_INCLUDES) $(luatex_postflags) +luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(luatex_postflags) -luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -luatex_CPPFLAGS += $(POPPLER_INCLUDES) $(LUA_INCLUDES) -I$(srcdir)/libmd5 -luatex_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/mplibdir -luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H` -luatex_CPPFLAGS += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' luatex_CXXFLAGS = $(WARNING_CXXFLAGS) +luajittex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libunilib.a libluamisc.a libluasocket.a $(LUA_LIBS) luatex_ldadd += libmd5.a libmplib.a $(CAIRO_LIBS) $(PIXMAN_LIBS) luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) +luajittex_ldadd = libluajittex.a libjitff.a libunilib.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) +luajittex_ldadd += libmd5.a libmplib.a $(CAIRO_LIBS) $(PIXMAN_LIBS) +luajittex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) + luatex_LDFLAGS = -export-dynamic +luajittex_LDFLAGS = -export-dynamic $(luajittex_extra) luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) +luajittex_LDADD = $(luajittex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a +luajittex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluajittex.a +luajittex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a $(luatex_OBJECTS): libluatex.a +$(luajittex_OBJECTS): libluajittex.a nodist_luatex_SOURCES = $(luatex_sources) +nodist_luajittex_SOURCES = $(luatex_sources) luatex_sources = \ luatexdir/luatex_svnversion.h \ @@ -54,8 +81,12 @@ EXTRA_DIST += \ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" nodist_call_luatex_SOURCES = callexe.c call_luatex_LDADD = +call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" +nodist_call_luajittex_SOURCES = callexe.c +call_luajittex_LDADD = .PHONY: install-luatex-links uninstall-luatex-links +.PHONY: install-luajittex-links uninstall-luajittex-links if WIN32 install-luatex-links: call_luatex$(EXEEXT) $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) @@ -63,20 +94,30 @@ install-luatex-links: call_luatex$(EXEEXT) uninstall-luatex-links: rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) +install-luajittex-links: call_luajittex$(EXEEXT) + $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) + $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +uninstall-luajittex-links: + rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) endif WIN32 -# luaTeX Tests +# LuaTeX/LuaJITTeX Tests # luatex_tests = luatexdir/luatex.test luatexdir/luaimage.test +luajittex_tests = luatexdir/luajittex.test luatexdir/luajitimage.test -EXTRA_DIST += $(luatex_tests) +EXTRA_DIST += $(luatex_tests) $(luajittex_tests) if LUATEX TESTS += $(luatex_tests) endif LUATEX +if LUAJITTEX +TESTS += $(luajittex_tests) +endif LUAJITTEX -## luaimage.test +## luaimage.test/luajitimage.test EXTRA_DIST += luatexdir/tests/luaimage.tex \ tests/1-4.jpg tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png -DISTCLEANFILES += luaimage.fmt luaimage.log luaimage.pdf +DISTCLEANFILES += luaimage.* luajitimage.* diff --git a/Build/source/texk/web2c/luatexdir/lua/lauxlib_bridge.h b/Build/source/texk/web2c/luatexdir/lua/lauxlib_bridge.h new file mode 100644 index 00000000000..057b5ee9605 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/lua/lauxlib_bridge.h @@ -0,0 +1,48 @@ +/* +** lauxlib_bridge.h, +** Auxiliary functions bridge from luatex lua5.2 luajit 2.0 +** See Copyright Notice in lua.h +*/ + + +#ifndef lauxlib_bridge_h +#define lauxlib_bridge_h + +#include "lauxlib.h" + + + +/* compatibility with luatex lua5.2 */ +/* +#define LUA_OK 0 +#define LUA_OPEQ 0 +#define LUA_OPLT 1 +#define LUA_OPLE 2 +*/ + +/* http://lua.2524044.n2.nabble.com/converting-modules-in-written-in-C-for-Lua-5-1-to-Lua-5-2-td7642941.html */ +#define luaL_setmetatable(L, tname) luaL_getmetatable(L, tname);lua_setmetatable(L, -2); + +/* see http://comments.gmane.org/gmane.comp.programming.swig/18673 */ +/* +# define lua_rawlen lua_objlen +*/ + + +LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname); +LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup); +LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) ; +LUA_API int lua_compare (lua_State *L, int index1, int index2, int op); + +#if !defined(lua_lock) +#define lua_lock(L) ((void) 0) +#define lua_unlock(L) ((void) 0) +#endif + +#define luaL_newlibtable(L,l) \ + lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1) + +#define luaL_newlib(L,l) (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0)) + + +#endif diff --git a/Build/source/texk/web2c/luatexdir/lua/liolibext.c b/Build/source/texk/web2c/luatexdir/lua/liolibext.c index 80ca4955a60..6b9a602d541 100644 --- a/Build/source/texk/web2c/luatexdir/lua/liolibext.c +++ b/Build/source/texk/web2c/luatexdir/lua/liolibext.c @@ -666,6 +666,7 @@ static const luaL_Reg flib[] = { }; +#ifndef LuajitTeX static void createmeta (lua_State *L) { luaL_newmetatable(L, LUA_FILEHANDLE); /* create metatable for file handles */ lua_pushvalue(L, -1); /* push metatable */ @@ -698,6 +699,7 @@ static void createstdfile (lua_State *L, FILE *f, const char *k, } lua_setfield(L, -2, fname); /* add file to module */ } +#endif int open_iolibext (lua_State *L) { #ifdef LuajitTeX diff --git a/Build/source/texk/web2c/luatexdir/lua/lstrlibextjit.c b/Build/source/texk/web2c/luatexdir/lua/lstrlibextjit.c new file mode 100644 index 00000000000..511bd821df9 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/lua/lstrlibextjit.c @@ -0,0 +1,395 @@ +/* lstrlibext.c for luajitex + + Copyright 2013 Luigi Scarso + + Code from lstrlibext.c for LuaTeX + Original version copyright 2012 Taco Hoekwater <taco@luatex.org> + + This file is part of LuajitTeX. + + LuajitTeX is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + LuajitTeX is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU General Public License along + with LuaTeX; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "ptexlib.h" +#include <stdio.h> + +#define LUA_CORE + +#include "lua.h" +#include "lauxlib.h" +#include "lualib.h" + + + + +/*#include "lua51/lj_obj.h"*/ +/*#include "lua51/lj_gc.h"*/ +/*#include "lua51/lj_err.h"*/ +/*#include "lua51/lj_str.h"*/ +/*#include "lua51/lj_tab.h"*/ +/*#include "lua51/lj_meta.h"*/ +/*#include "lua51/lj_state.h"*/ +/*#include "lua51/lj_ff.h" */ +/*#include "lua51/lj_bcdump.h"*/ +/*#include "lua51/lj_char.h"*/ +/*#include "lua51/lj_lib.h"*/ + + + +static int bytepairs_aux (lua_State *L) { + size_t ls; + unsigned char i; + const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); + int ind = lua_tointeger(L, lua_upvalueindex(2)); + if (ind<(int)ls) { + if (ind+1<(int)ls) { + lua_pushinteger(L, (ind+2)); /* iterator */ + } else { + lua_pushinteger(L, (ind+1)); /* iterator */ + } + lua_replace(L, lua_upvalueindex(2)); + i = (unsigned char)*(s+ind); + lua_pushinteger(L, i); /* byte one */ + if (ind+1<(int)ls) { + i = (unsigned char)*(s+ind+1); + lua_pushinteger(L, i); /* byte two */ + } else { + lua_pushnil(L); /* odd string length */ + } + return 2; + } + return 0; /* string ended */ +} + + +static int str_bytepairs (lua_State *L) { + luaL_checkstring(L, 1); + lua_settop(L, 1); + lua_pushinteger(L, 0); + lua_pushcclosure(L, bytepairs_aux, 2); + return 1; +} + + +static int bytes_aux (lua_State *L) { + size_t ls; + unsigned char i; + const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); + int ind = lua_tointeger(L, lua_upvalueindex(2)); + if (ind<(int)ls) { + lua_pushinteger(L, (ind+1)); /* iterator */ + lua_replace(L, lua_upvalueindex(2)); + i = (unsigned char)*(s+ind); + lua_pushinteger(L, i); /* byte */ + return 1; + } + return 0; /* string ended */ +} + + +static int str_bytes (lua_State *L) { + luaL_checkstring(L, 1); + lua_settop(L, 1); + lua_pushinteger(L, 0); + lua_pushcclosure(L, bytes_aux, 2); + return 1; +} + + +static int utf_failed(lua_State *L, int new_ind) { + static char fffd [3] = {0xEF,0xBF,0xBD}; + lua_pushinteger(L, new_ind); /* iterator */ + lua_replace(L, lua_upvalueindex(2)); + lua_pushlstring(L, fffd, 3); + return 1; +} + + +static int utfcharacters_aux (lua_State *L) { + static const unsigned char mask[4] = {0x80,0xE0,0xF0,0xF8}; + static const unsigned char mequ[4] = {0x00,0xC0,0xE0,0xF0}; + size_t ls; + unsigned char c; + int j; + const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); + int ind = lua_tointeger(L, lua_upvalueindex(2)); + if (ind>=(int)ls) return 0; /* end of string */ + c = (unsigned) s[ind]; + for (j=0;j<4;j++) { + if ((c&mask[j])==mequ[j]) { + int k; + if (ind+1+j>(int)ls) return utf_failed(L,ls); /* will not fit */ + for (k=1; k<=j; k++) { + c = (unsigned) s[ind+k]; + if ((c&0xC0)!=0x80) return utf_failed(L,ind+k); /* bad follow */ + } + lua_pushinteger(L, ind+1+j); /* iterator */ + lua_replace(L, lua_upvalueindex(2)); + lua_pushlstring(L, s+ind, 1+j); + return 1; + } + } + return utf_failed(L,ind+1); /* we found a follow byte! */ +} + + +static int str_utfcharacters (lua_State *L) { + luaL_checkstring(L, 1); + lua_settop(L, 1); + lua_pushinteger(L, 0); + lua_pushcclosure(L, utfcharacters_aux, 2); + return 1; +} + + + +static int utfvalues_aux (lua_State *L) { + size_t ls; + unsigned char i = 0; + unsigned char j = 0; + unsigned char k = 0; + unsigned char l = 0; + unsigned int v = 0xFFFD; + int numbytes = 1; + const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); + int ind = lua_tointeger(L, lua_upvalueindex(2)); + + if (ind<(int)ls) { + i = *(s+ind); + if (i<0x80) { + v = i; + } else if (i>=0xF0) { + if ((ind+3)<(int)ls && ((unsigned)*(s+ind+1))>=0x80 + && ((unsigned)*(s+ind+2))>=0x80 && ((unsigned)*(s+ind+3))>=0x80) { + numbytes = 4; + j = ((unsigned)*(s+ind+1))-128; + k = ((unsigned)*(s+ind+2))-128; + l = ((unsigned)*(s+ind+3))-128; + v = (((((i-0xF0)*64) + j)*64) + k)*64 + l; + } + } else if (i>=0xE0) { + if ((ind+2)<(int)ls && ((unsigned)*(s+ind+1))>=0x80 && ((unsigned)*(s+ind+2))>=0x80) { + numbytes = 3; + j = ((unsigned)*(s+ind+1))-128; + k = ((unsigned)*(s+ind+2))-128; + v = (((i-0xE0)*64) + j)*64 + k; + } + + } else if (i>=0xC0) { + if ((ind+1)<(int)ls && ((unsigned)*(s+ind+1))>=0x80) { + numbytes = 2; + j = ((unsigned)*(s+ind+1))-128; + v = ((i-0xC0)*64) + j; + } + } + lua_pushinteger(L, (ind+numbytes)); /* iterator */ + lua_replace(L, lua_upvalueindex(2)); + lua_pushinteger(L, v); + return 1; + } + return 0; /* string ended */ +} + + +static int str_utfvalues (lua_State *L) { + luaL_checkstring(L, 1); + lua_settop(L, 1); + lua_pushinteger(L, 0); + lua_pushcclosure(L, utfvalues_aux, 2); + return 1; +} + + +static int characterpairs_aux (lua_State *L) { + size_t ls; + char b[2]; + const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); + int ind = lua_tointeger(L, lua_upvalueindex(2)); + if (ind<(int)ls) { + if (ind+1<(int)ls) { + lua_pushinteger(L, (ind+2)); /* iterator */ + } else { + lua_pushinteger(L, (ind+1)); /* iterator */ + } + lua_replace(L, lua_upvalueindex(2)); + b[0] = *(s+ind); b[1] = 0; + lua_pushlstring(L, b, 1); + if (ind+1<(int)ls) { + b[0] = *(s+ind+1); + lua_pushlstring(L, b, 1); + } else { + lua_pushlstring(L, b+1, 0); + } + return 2; + } + return 0; /* string ended */ +} + + +static int str_characterpairs (lua_State *L) { + luaL_checkstring(L, 1); + lua_settop(L, 1); + lua_pushinteger(L, 0); + lua_pushcclosure(L, characterpairs_aux, 2); + return 1; +} + + +static int characters_aux (lua_State *L) { + size_t ls; + char b[2]; + const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); + int ind = lua_tointeger(L, lua_upvalueindex(2)); + if (ind<(int)ls) { + lua_pushinteger(L, (ind+1)); /* iterator */ + lua_replace(L, lua_upvalueindex(2)); + b[0] = *(s+ind); b[1] = 0; + lua_pushlstring(L, b, 1); + return 1; + } + return 0; /* string ended */ +} + + +static int str_characters (lua_State *L) { + luaL_checkstring(L, 1); + lua_settop(L, 1); + lua_pushinteger(L, 0); + lua_pushcclosure(L, characters_aux, 2); + return 1; +} + +static int str_split (lua_State *L) { + size_t l; + size_t i; + int n; + char *q, *p, *orig; + int mult = 0; + const char *s = luaL_checklstring(L, 1, &l); + const char *joiner = luaL_optstring(L, 2, " +"); + lua_newtable(L); + if (l == 0) { + lua_pushvalue(L,1); + lua_rawseti(L,-2,1); + return 1; + } + orig = p = malloc(l+1); + if (p==NULL) { + fprintf(stderr, "fatal: memory exhausted (malloc of %u bytes).\n",(int)(l+1)); + exit(EXIT_FAILURE); + } + strcpy(p,s); + n = 1; + q = p; + + if (*joiner == 0) { + for (i=0;i<l;i++) { + lua_pushlstring(L,q,1); q++; + lua_rawseti(L,-2,n); n++; + } + free(orig); + return 1; + } + if (*(joiner+1) == '+') { + mult = 1; + while(*p==*joiner) { + p++; + l--; + } + q = p; + } + for (i=0;i<l;i++) { + if (*(p+i)==*joiner) { + *(p+i) = 0; + lua_pushlstring(L,q,((p+i)-q)); + lua_rawseti(L,-2,n); n++; + if (mult) { + while(*(p+i+1)==*joiner) { + i++; + } + } + q = p+i+1; + } + } + if (mult && q==(p+l)) { + free(orig); + return 1; + } + if(q<=(p+l)) { + lua_pushlstring(L,q,strlen(q)); + lua_rawseti(L,-2,n); + } + free(orig); + return 1; +} + + +static const luaL_Reg strlibext[] = { + {"utfvalues", str_utfvalues}, + {"utfcharacters", str_utfcharacters}, + {"characters", str_characters}, + {"characterpairs", str_characterpairs}, + {"bytes", str_bytes}, + {"bytepairs", str_bytepairs}, + {"explode", str_split}, + /* {"dump", str_dump} already in luajit */ + {NULL, NULL} +}; + + + + +/* ------------------------------------------------------------------------ */ + +/* lj_libdef.h is generated by buildvm, it's not available on source */ +/* #include "lua51/lj_libdef.h" */ + +/* LUALIB_API int luaopen_string(lua_State *L) */ +/* { */ +/* GCtab *mt; */ +/* global_State *g; */ +/* LJ_LIB_REG(L, LUA_STRLIBNAME, string); */ +/* luaL_register(L, LUA_STRLIBNAME, strlib); */ +/* //LJ_LIB_REG(L, LUA_STRLIBNAME, strlib); */ +/* #if defined(LUA_COMPAT_GFIND) && !LJ_52 */ +/* lua_getfield(L, -1, "gmatch"); */ +/* lua_setfield(L, -2, "gfind"); */ +/* #endif */ +/* mt = lj_tab_new(L, 0, 1); */ +/* /\* NOBARRIER: basemt is a GC root. *\/ */ +/* g = G(L); */ +/* setgcref(basemt_it(g, LJ_TSTR), obj2gco(mt)); */ +/* settabV(L, lj_tab_setstr(L, mt, mmname_str(g, MM_index)), tabV(L->top-1)); */ +/* mt->nomm = (uint8_t)(~(1u<<MM_index)); */ +/* return 1; */ +/* } */ + +/* void open_strlibext(lua_State *L) */ +/* { */ +/* int v; */ +/* v = luaopen_string(L); */ +/* } */ + + +void open_strlibext(lua_State * L) +{ + const luaL_Reg *lib; + lua_getglobal(L, "string"); + for (lib=strlibext;lib->name;lib++) { + lua_pushcfunction(L, lib->func); + lua_setfield(L, -2, lib->name); + } + lua_pop(L,1); +} + diff --git a/Build/source/texk/web2c/luatexdir/lua/luajitstuff.w b/Build/source/texk/web2c/luatexdir/lua/luajitstuff.w new file mode 100644 index 00000000000..0ae3f3f0754 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/lua/luajitstuff.w @@ -0,0 +1,643 @@ +% luastuff.w +% +% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org> +% +% This file is part of LuaTeX. +% +% LuaTeX is free software; you can redistribute it and/or modify it under +% the terms of the GNU General Public License as published by the Free +% Software Foundation; either version 2 of the License, or (at your +% option) any later version. +% +% LuaTeX is distributed in the hope that it will be useful, but WITHOUT +% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +% FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +% License for more details. +% +% You should have received a copy of the GNU General Public License along +% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. + +@ @c +static const char _svn_version[] = + "$Id: luastuff.w 4730 2014-01-03 14:44:14Z taco $" + "$URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/lua/luastuff.w $"; + +#include "ptexlib.h" +#include "lua/luatex-api.h" +#include "lua/lauxlib_bridge.h" + +@ @c +lua_State *Luas = NULL; + +int luastate_bytes = 0; + +int lua_active = 0; + +@ @c +void make_table(lua_State * L, const char *tab, const char *getfunc, + const char *setfunc) +{ + /* make the table *//* |[{<tex>}]| */ + lua_pushstring(L, tab); /* |[{<tex>},"dimen"]| */ + lua_newtable(L); /* |[{<tex>},"dimen",{}]| */ + lua_settable(L, -3); /* |[{<tex>}]| */ + /* fetch it back */ + lua_pushstring(L, tab); /* |[{<tex>},"dimen"]| */ + lua_gettable(L, -2); /* |[{<tex>},{<dimen>}]| */ + /* make the meta entries */ + luaL_newmetatable(L, tab); /* |[{<tex>},{<dimen>},{<dimen_m>}]| */ + lua_pushstring(L, "__index"); /* |[{<tex>},{<dimen>},{<dimen_m>},"__index"]| */ + lua_pushstring(L, getfunc); /* |[{<tex>},{<dimen>},{<dimen_m>},"__index","getdimen"]| */ + lua_gettable(L, -5); /* |[{<tex>},{<dimen>},{<dimen_m>},"__index",<tex.getdimen>]| */ + lua_settable(L, -3); /* |[{<tex>},{<dimen>},{<dimen_m>}]| */ + lua_pushstring(L, "__newindex"); /* |[{<tex>},{<dimen>},{<dimen_m>},"__newindex"]| */ + lua_pushstring(L, setfunc); /* |[{<tex>},{<dimen>},{<dimen_m>},"__newindex","setdimen"]| */ + lua_gettable(L, -5); /* |[{<tex>},{<dimen>},{<dimen_m>},"__newindex",<tex.setdimen>]| */ + lua_settable(L, -3); /* |[{<tex>},{<dimen>},{<dimen_m>}]| */ + lua_setmetatable(L, -2); /* |[{<tex>},{<dimen>}]| : assign the metatable */ + lua_pop(L, 1); /* |[{<tex>}]| : clean the stack */ +} + +@ @c +static +const char *getS(lua_State * L, void *ud, size_t * size) +{ + LoadS *ls = (LoadS *) ud; + (void) L; + if (ls->size == 0) + return NULL; + *size = ls->size; + ls->size = 0; + return ls->s; +} + +@ @c +#if 0 /* currently unused */ +static void *my_luaalloc(void *ud, void *ptr, size_t osize, size_t nsize) +{ + void *ret = NULL; + (void) ud; /* for -Wunused */ + if (nsize == 0) + free(ptr); + else + ret = realloc(ptr, nsize); + luastate_bytes += (int) (nsize - osize); + return ret; +} +#endif + +@ @c +static int my_luapanic(lua_State * L) +{ + (void) L; /* to avoid warnings */ + fprintf(stderr, "PANIC: unprotected error in call to Lua API (%s)\n", + lua_tostring(L, -1)); + return 0; +} + +@ @c +static const luaL_Reg lualibs[] = { + {"", luaopen_base}, + {"package", luaopen_package}, + /*{"coroutine", luaopen_coroutine},*/ + {"table", luaopen_table}, + {"io", open_iolibext}, + {"os", luaopen_os}, + {"string", luaopen_string}, + {"math", luaopen_math}, + {"debug", luaopen_debug}, + {"unicode", luaopen_unicode}, + {"zip", luaopen_zip}, + {"bit32", luaopen_bit32}, + {"md5", luaopen_md5}, + {"lfs", luaopen_lfs}, + {"profiler", luaopen_profiler}, + {"jit", luaopen_jit}, + {"ffi", luaopen_ffi}, + {"bit", luaopen_bit }, + {NULL, NULL} +}; +static const luaL_Reg lualibs_nofenv[] = { + {"lpeg", luaopen_lpeg}, + {NULL, NULL} +}; + + +@ @c +static void do_openlibs(lua_State * L) +{ + const luaL_Reg *lib = lualibs; + for (; lib->func; lib++) { + lua_pushcfunction(L, lib->func); + lua_pushstring(L, lib->name); + lua_call(L, 1, 0); + } + lib = lualibs_nofenv; + for (; lib->func; lib++) { + lua_pushcfunction(L, lib->func); + lua_newtable(L); + lua_setfenv(L,-2); + lua_pushstring(L, lib->name); + lua_call(L, 1, 0); + } +} + +@ @c +static int load_aux (lua_State *L, int status) { + if (status == 0) /* OK? */ + return 1; + else { + lua_pushnil(L); + lua_insert(L, -2); /* put before error message */ + return 2; /* return nil plus error message */ + } +} + +@ @c +static int luatex_loadfile (lua_State *L) { + int status = 0; + const char *fname = luaL_optstring(L, 1, NULL); + const char *mode = luaL_optstring(L, 2, NULL); + int env = !lua_isnone(L, 3); /* 'env' parameter? */ + if (!lua_only && !fname && interaction == batch_mode) { + lua_pushnil(L); + lua_pushstring(L, "reading from stdin is disabled in batch mode"); + return 2; /* return nil plus error message */ + } + status = luaL_loadfilex(L, fname, mode); + if (status == LUA_OK) { + recorder_record_input(fname); + if (env) { /* 'env' parameter? */ + lua_pushvalue(L, 3); + lua_setupvalue(L, -2, 1); /* set it as 1st upvalue of loaded chunk */ + } + } + return load_aux(L, status); +} + +@ @c +static int luatex_dofile (lua_State *L) { + const char *fname = luaL_optstring(L, 1, NULL); + int n = lua_gettop(L); + if (!lua_only && !fname) { + if (interaction == batch_mode) { + lua_pushnil(L); + lua_pushstring(L, "reading from stdin is disabled in batch mode"); + return 2; /* return nil plus error message */ + } else { + tprint_nl("lua> "); + } + } + if (luaL_loadfile(L, fname) != 0) lua_error(L); + recorder_record_input(fname); + lua_call(L, 0, LUA_MULTRET); + return lua_gettop(L) - n; +} + + +@ @c +void luainterpreter(void) +{ + lua_State *L; + L = luaL_newstate() ; + /*L = lua_newstate(my_luaalloc, NULL);*/ + if (L == NULL) { + fprintf(stderr, "Can't create the Lua state.\n"); + return; + } + lua_atpanic(L, &my_luapanic); + + do_openlibs(L); /* does all the 'simple' libraries */ + + if (luajiton){ + luaJIT_setmode(L, 0, LUAJIT_MODE_ENGINE|LUAJIT_MODE_ON); + } + else { + luaJIT_setmode(L, 0, LUAJIT_MODE_ENGINE|LUAJIT_MODE_OFF); + } + + + + lua_pushcfunction(L,luatex_dofile); + lua_setglobal(L, "dofile"); + lua_pushcfunction(L,luatex_loadfile); + lua_setglobal(L, "loadfile"); + + luatex_md5_lua_open(L); + + open_oslibext(L, safer_option); +/* + open_iolibext(L); +*/ + open_strlibext(L); + open_lfslibext(L); + + /* luasockets */ + /* socket and mime are a bit tricky to open because + they use a load-time dependency that has to be + worked around for luatex, where the C module is + loaded way before the lua module. + */ + if (!nosocket_option) { + lua_getglobal(L, "package"); + lua_getfield(L, -1, "loaded"); + if (!lua_istable(L, -1)) { + lua_newtable(L); + lua_setfield(L, -2, "loaded"); + lua_getfield(L, -1, "loaded"); + } + luaopen_socket_core(L); + lua_setfield(L, -2, "socket.core"); + lua_pushnil(L); + lua_setfield(L, -2, "socket"); /* package.loaded.socket = nil */ + + luaopen_mime_core(L); + lua_setfield(L, -2, "mime.core"); + lua_pushnil(L); + lua_setfield(L, -2, "mime"); /* package.loaded.mime = nil */ + lua_pop(L, 2); /* pop the tables */ + + luatex_socketlua_open(L); /* preload the pure lua modules */ + } + /* zlib. slightly odd calling convention */ + luaopen_zlib(L); + lua_setglobal(L, "zlib"); + luaopen_gzip(L); + + /* our own libraries */ + luaopen_ff(L); + luaopen_tex(L); + luaopen_token(L); + luaopen_node(L); + luaopen_texio(L); + luaopen_kpse(L); + luaopen_callback(L); + luaopen_lua(L, startup_filename); + luaopen_stats(L); + luaopen_font(L); + luaopen_lang(L); + luaopen_mplib(L); + luaopen_vf(L); + + /* |luaopen_pdf(L);| */ + /* environment table at |LUA_ENVIRONINDEX| needs to load this way: */ + lua_pushcfunction(L, luaopen_pdf); + lua_pushstring(L, "pdf"); + lua_call(L, 1, 0); + + /* |luaopen_img(L);| */ + lua_pushcfunction(L, luaopen_img); + lua_pushstring(L, "img"); + lua_call(L, 1, 0); + + /* |luaopen_epdf(L);| */ + lua_pushcfunction(L, luaopen_epdf); + lua_pushstring(L, "epdf"); + lua_call(L, 1, 0); + + /* |luaopen_pdfscanner(L);| */ + lua_pushcfunction(L, luaopen_pdfscanner); + lua_pushstring(L, "pdfscanner"); + lua_call(L, 1, 0); + + lua_createtable(L, 0, 0); + lua_setglobal(L, "texconfig"); + + if (safer_option) { + /* disable some stuff if --safer */ + (void) hide_lua_value(L, "os", "execute"); + (void) hide_lua_value(L, "os", "rename"); + (void) hide_lua_value(L, "os", "remove"); + (void) hide_lua_value(L, "io", "popen"); + /* make io.open only read files */ + luaL_checkstack(L, 2, "out of stack space"); + lua_getglobal(L, "io"); + lua_getfield(L, -1, "open_ro"); + lua_setfield(L, -2, "open"); + (void) hide_lua_value(L, "io", "tmpfile"); + (void) hide_lua_value(L, "io", "output"); + (void) hide_lua_value(L, "lfs", "chdir"); + (void) hide_lua_value(L, "lfs", "lock"); + (void) hide_lua_value(L, "lfs", "touch"); + (void) hide_lua_value(L, "lfs", "rmdir"); + (void) hide_lua_value(L, "lfs", "mkdir"); + } + Luas = L; +} + +@ @c +int hide_lua_table(lua_State * L, const char *name) +{ + int r = 0; + lua_getglobal(L, name); + if (lua_istable(L, -1)) { + r = luaL_ref(L, LUA_REGISTRYINDEX); + lua_pushnil(L); + lua_setglobal(L, name); + } + return r; +} + +@ @c +void unhide_lua_table(lua_State * L, const char *name, int r) +{ + lua_rawgeti(L, LUA_REGISTRYINDEX, r); + lua_setglobal(L, name); + luaL_unref(L, LUA_REGISTRYINDEX, r); +} + +@ @c +int hide_lua_value(lua_State * L, const char *name, const char *item) +{ + int r = 0; + lua_getglobal(L, name); + if (lua_istable(L, -1)) { + lua_getfield(L, -1, item); + r = luaL_ref(L, LUA_REGISTRYINDEX); + lua_pushnil(L); + lua_setfield(L, -2, item); + } + return r; +} + +@ @c +void unhide_lua_value(lua_State * L, const char *name, const char *item, int r) +{ + lua_getglobal(L, name); + if (lua_istable(L, -1)) { + lua_rawgeti(L, LUA_REGISTRYINDEX, r); + lua_setfield(L, -2, item); + luaL_unref(L, LUA_REGISTRYINDEX, r); + } +} + + +@ @c +int lua_traceback(lua_State * L) +{ + lua_getglobal(L, "debug"); + if (!lua_istable(L, -1)) { + lua_pop(L, 1); + return 1; + } + lua_getfield(L, -1, "traceback"); + if (!lua_isfunction(L, -1)) { + lua_pop(L, 2); + return 1; + } + lua_pushvalue(L, 1); /* pass error message */ + lua_pushinteger(L, 2); /* skip this function and traceback */ + lua_call(L, 2, 1); /* call debug.traceback */ + return 1; +} + +@ @c +static void luacall(int p, int nameptr, boolean is_string) +{ + LoadS ls; + int i; + size_t ll = 0; + char *lua_id; + char *s = NULL; + + if (Luas == NULL) { + luainterpreter(); + } + lua_active++; + if (is_string) { + const char *ss = NULL; + lua_rawgeti(Luas, LUA_REGISTRYINDEX, p); + ss = lua_tolstring(Luas, -1, &ll); + s = xmalloc(ll+1); + memcpy(s,ss,ll+1); + lua_pop(Luas,1); + } else { + int l = 0; + s = tokenlist_to_cstring(p, 1, &l); + ll = (size_t)l; + } + ls.s = s; + ls.size = ll; + if (ls.size > 0) { + if (nameptr > 0) { + int l = 0; /* not used */ + lua_id = tokenlist_to_cstring(nameptr, 1, &l); + } else if (nameptr < 0) { + char *tmp = get_lua_name((nameptr + 65536)); + if (tmp != NULL) + lua_id = xstrdup(tmp); + else + lua_id = xstrdup("\\latelua "); + } else { + lua_id = xmalloc(20); + snprintf((char *) lua_id, 20, "\\latelua "); + } + + i = lua_load(Luas, getS, &ls, lua_id); + if (i != 0) { + Luas = luatex_error(Luas, (i == LUA_ERRSYNTAX ? 0 : 1)); + } else { + int base = lua_gettop(Luas); /* function index */ + lua_checkstack(Luas, 1); + lua_pushcfunction(Luas, lua_traceback); /* push traceback function */ + lua_insert(Luas, base); /* put it under chunk */ + i = lua_pcall(Luas, 0, 0, base); + lua_remove(Luas, base); /* remove traceback function */ + if (i != 0) { + lua_gc(Luas, LUA_GCCOLLECT, 0); + Luas = luatex_error(Luas, (i == LUA_ERRRUN ? 0 : 1)); + } + } + xfree(lua_id); + xfree(ls.s); + } + lua_active--; +} + +@ @c +void late_lua(PDF pdf, halfword p) +{ + (void) pdf; + if (late_lua_type(p)==normal) { + expand_macros_in_tokenlist(p); /* sets |def_ref| */ + luacall(def_ref, late_lua_name(p), false); + flush_list(def_ref); + } else { + luacall(late_lua_data(p), late_lua_name(p), true); + } +} + +@ @c +void luatokencall(int p, int nameptr) +{ + LoadS ls; + int i, l; + char *s = NULL; + char *lua_id; + assert(Luas); + l = 0; + lua_active++; + s = tokenlist_to_cstring(p, 1, &l); + ls.s = s; + ls.size = (size_t) l; + if (ls.size > 0) { + if (nameptr > 0) { + lua_id = tokenlist_to_cstring(nameptr, 1, &l); + } else if (nameptr < 0) { + char *tmp = get_lua_name((nameptr + 65536)); + if (tmp != NULL) + lua_id = xstrdup(tmp); + else + lua_id = xstrdup("\\directlua "); + } else { + lua_id = xstrdup("\\directlua "); + } + i = lua_load(Luas, getS, &ls, lua_id); + xfree(s); + if (i != 0) { + Luas = luatex_error(Luas, (i == LUA_ERRSYNTAX ? 0 : 1)); + } else { + int base = lua_gettop(Luas); /* function index */ + lua_checkstack(Luas, 1); + lua_pushcfunction(Luas, lua_traceback); /* push traceback function */ + lua_insert(Luas, base); /* put it under chunk */ + i = lua_pcall(Luas, 0, 0, base); + lua_remove(Luas, base); /* remove traceback function */ + if (i != 0) { + lua_gc(Luas, LUA_GCCOLLECT, 0); + Luas = luatex_error(Luas, (i == LUA_ERRRUN ? 0 : 1)); + } + } + xfree(lua_id); + } + lua_active--; +} + +@ @c +lua_State *luatex_error(lua_State * L, int is_fatal) +{ + + const_lstring luaerr; + char *err = NULL; + if (lua_isstring(L, -1)) { + luaerr.s = lua_tolstring(L, -1, &luaerr.l); + err = (char *) xmalloc((unsigned) (luaerr.l + 1)); + snprintf(err, (luaerr.l + 1), "%s", luaerr.s); + } + if (is_fatal > 0) { + /* Normally a memory error from lua. + The pool may overflow during the |maketexlstring()|, but we + are crashing anyway so we may as well abort on the pool size */ + lua_fatal_error(err); + /* never reached */ + xfree(err); + lua_close(L); + return (lua_State *) NULL; + } else { + lua_norm_error(err); + xfree(err); + return L; + } +} + +@ @c +void preset_environment(lua_State * L, const parm_struct * p, const char *s) +{ + int i; + assert(L != NULL); + /* double call with same s gives assert(0) */ + lua_pushstring(L, s); /* s */ + lua_gettable(L, LUA_REGISTRYINDEX); /* t */ + assert(lua_isnil(L, -1)); + lua_pop(L, 1); /* - */ + lua_pushstring(L, s); /* s */ + lua_newtable(L); /* t s */ + for (i = 1, ++p; p->name != NULL; i++, p++) { + assert(i == p->idx); + lua_pushstring(L, p->name); /* k t s */ + lua_pushinteger(L, p->idx); /* v k t s */ + lua_settable(L, -3); /* t s */ + } + lua_settable(L, LUA_REGISTRYINDEX); /* - */ +} + + +@ @c +/* +int luaL_typerror (void *LL, int narg, const char *tname) +{ + lua_State *L = (lua_State *)LL; + const char *msg = lua_pushfstring(L, "%s expected, got %s", + tname, luaL_typename(L, narg)); + return luaL_argerror(L, narg, msg); +} +*/ + + +/* + + +Compatibility layer for luatex lua5.2 + +*/ + + + +@ @c +LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) { + void *p = lua_touserdata(L, ud); + if (p != NULL) { /* value is a userdata? */ + if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ + luaL_getmetatable(L, tname); /* get correct metatable */ + if (!lua_rawequal(L, -1, -2)) /* not the same? */ + p = NULL; /* value is a userdata with wrong metatable */ + lua_pop(L, 2); /* remove both metatables */ + return p; + } + } + return NULL; /* value is not a userdata with a metatable */ +} + +@ @c +/* It's not ok. See lua-users.org/wiki/CompatibilityWithLuafive for another solution */ +LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { + /*luaL_checkversion(L);*/ + luaL_checkstack(L, nup, "too many upvalues"); + for (; l->name != NULL; l++) { /* fill the table with given functions */ + int i; + for (i = 0; i < nup; i++) /* copy upvalues to the top */ + lua_pushvalue(L, -nup); + lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */ + lua_setfield(L, -(nup + 2), l->name); + } + lua_pop(L, nup); /* remove upvalues */ +} + + +@ @c +LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) { + lua_State *L = B->L; + if (sz > LUAL_BUFFERSIZE ) + luaL_error(L, "buffer too large"); + return luaL_prepbuffer(B) ; +} + +@ @c +LUA_API int lua_compare (lua_State *L, int o1, int o2, int op) { + /*StkId o1, o2;*/ + int i = 0; + lua_lock(L); /* may call tag method */ + /* o1 = index2addr(L, index1); */ + /* o2 = index2addr(L, index2); */ + /*if (isvalid(o1) && isvalid(o2)) {*/ + switch (op) { + case LUA_OPEQ: i = lua_equal(L, o1, o2); break; + case LUA_OPLT: i = lua_lessthan(L, o1, o2); break; + case LUA_OPLE: i = (lua_lessthan(L, o1, o2) || lua_equal(L, o1, o2)) ; break; + default: luaL_error(L, "invalid option"); + } + /*}*/ + lua_unlock(L); + return i; +} + diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h index dcccf233fbe..075c2882e90 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h +++ b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h @@ -214,7 +214,6 @@ extern char charsetstr[]; /* from mpdir/psout.w */ extern char **environ; #endif -extern int luac_main(int argc, char *argv[]); /* texluac.w */ #ifdef __cplusplus } #endif diff --git a/Build/source/texk/web2c/luatexdir/lua/texluajitc.w b/Build/source/texk/web2c/luatexdir/lua/texluajitc.w new file mode 100644 index 00000000000..f54f9c8d4a4 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/lua/texluajitc.w @@ -0,0 +1,575 @@ +/* +** LuaJIT frontend. Runs commands, scripts, read-eval-print (REPL) etc. +** Copyright (C) 2005-2012 Mike Pall. See Copyright Notice in luajit.h +** +** Major portions taken verbatim or adapted from the Lua interpreter. +** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h +*/ + +@ @c +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define luajit_c + +#include "lua.h" +#include "lauxlib.h" +#include "lualib.h" +#include "luajit.h" + +#include "lj_arch.h" + +#if LJ_TARGET_POSIX +#include <unistd.h> +#define lua_stdin_is_tty() isatty(0) +#elif LJ_TARGET_WINDOWS +#include <io.h> +#ifdef __BORLANDC__ +#define lua_stdin_is_tty() isatty(_fileno(stdin)) +#else +#define lua_stdin_is_tty() _isatty(_fileno(stdin)) +#endif +#else +#define lua_stdin_is_tty() 1 +#endif + +#if !LJ_TARGET_CONSOLE +#include <signal.h> +#endif + +#include "lua/luatex-api.h" + +static lua_State *globalL = NULL; +static const char *progname = LUA_PROGNAME; + +#if !LJ_TARGET_CONSOLE +static void lstop(lua_State *L, lua_Debug *ar) +{ + (void)ar; /* unused arg. */ + lua_sethook(L, NULL, 0, 0); + /* Avoid luaL_error -- a C hook doesn't add an extra frame. */ + luaL_where(L, 0); + lua_pushfstring(L, "%sinterrupted!", lua_tostring(L, -1)); + lua_error(L); +} + +static void laction(int i) +{ + signal(i, SIG_DFL); /* if another SIGINT happens before lstop, + terminate process (default action) */ + lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1); +} +#endif + +static void print_usage(void) +{ + fprintf(stderr, + "usage: %s [options]... [script [args]...].\n" + "Available options are:\n" + " -e chunk Execute string " LUA_QL("chunk") ".\n" + " -l name Require library " LUA_QL("name") ".\n" + " -b ... Save or list bytecode.\n" + " -j cmd Perform LuaJIT control command.\n" + " -O[opt] Control LuaJIT optimizations.\n" + " -i Enter interactive mode after executing " LUA_QL("script") ".\n" + " -v Show version information.\n" + " -E Ignore environment variables.\n" + " -- Stop handling options.\n" + " - Execute stdin and stop handling options.\n" + , + progname); + fflush(stderr); +} + +static void l_message(const char *pname, const char *msg) +{ + if (pname) fprintf(stderr, "%s: ", pname); + fprintf(stderr, "%s\n", msg); + fflush(stderr); +} + +static int report(lua_State *L, int status) +{ + if (status && !lua_isnil(L, -1)) { + const char *msg = lua_tostring(L, -1); + if (msg == NULL) msg = "(error object is not a string)"; + l_message(progname, msg); + lua_pop(L, 1); + } + return status; +} + +static int traceback(lua_State *L) +{ + if (!lua_isstring(L, 1)) { /* Non-string error object? Try metamethod. */ + if (lua_isnoneornil(L, 1) || + !luaL_callmeta(L, 1, "__tostring") || + !lua_isstring(L, -1)) + return 1; /* Return non-string error object. */ + lua_remove(L, 1); /* Replace object by result of __tostring metamethod. */ + } + luaL_traceback(L, L, lua_tostring(L, 1), 1); + return 1; +} + +static int docall(lua_State *L, int narg, int clear) +{ + int status; + int base = lua_gettop(L) - narg; /* function index */ + lua_pushcfunction(L, traceback); /* push traceback function */ + lua_insert(L, base); /* put it under chunk and args */ +#if !LJ_TARGET_CONSOLE + signal(SIGINT, laction); +#endif + status = lua_pcall(L, narg, (clear ? 0 : LUA_MULTRET), base); +#if !LJ_TARGET_CONSOLE + signal(SIGINT, SIG_DFL); +#endif + lua_remove(L, base); /* remove traceback function */ + /* force a complete garbage collection in case of errors */ + if (status != 0) lua_gc(L, LUA_GCCOLLECT, 0); + return status; +} + +static void print_version(void) +{ + fputs(LUAJIT_VERSION " -- " LUAJIT_COPYRIGHT ". " LUAJIT_URL "\n", stdout); +} + +static void print_jit_status(lua_State *L) +{ + int n; + const char *s; + lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED"); + lua_getfield(L, -1, "jit"); /* Get jit.* module table. */ + lua_remove(L, -2); + lua_getfield(L, -1, "status"); + lua_remove(L, -2); + n = lua_gettop(L); + lua_call(L, 0, LUA_MULTRET); + fputs(lua_toboolean(L, n) ? "JIT: ON" : "JIT: OFF", stdout); + for (n++; (s = lua_tostring(L, n)); n++) { + putc(' ', stdout); + fputs(s, stdout); + } + putc('\n', stdout); +} + +static int getargs(lua_State *L, char **argv, int n) +{ + int narg; + int i; + int argc = 0; + while (argv[argc]) argc++; /* count total number of arguments */ + narg = argc - (n + 1); /* number of arguments to the script */ + luaL_checkstack(L, narg + 3, "too many arguments to script"); + for (i = n+1; i < argc; i++) + lua_pushstring(L, argv[i]); + lua_createtable(L, narg, n + 1); + for (i = 0; i < argc; i++) { + lua_pushstring(L, argv[i]); + lua_rawseti(L, -2, i - n); + } + return narg; +} + +static int dofile(lua_State *L, const char *name) +{ + int status = luaL_loadfile(L, name) || docall(L, 0, 1); + return report(L, status); +} + +static int dostring(lua_State *L, const char *s, const char *name) +{ + int status = luaL_loadbuffer(L, s, strlen(s), name) || docall(L, 0, 1); + return report(L, status); +} + +static int dolibrary(lua_State *L, const char *name) +{ + lua_getglobal(L, "require"); + lua_pushstring(L, name); + return report(L, docall(L, 1, 1)); +} + +static void write_prompt(lua_State *L, int firstline) +{ + const char *p; + lua_getfield(L, LUA_GLOBALSINDEX, firstline ? "_PROMPT" : "_PROMPT2"); + p = lua_tostring(L, -1); + if (p == NULL) p = firstline ? LUA_PROMPT : LUA_PROMPT2; + fputs(p, stdout); + fflush(stdout); + lua_pop(L, 1); /* remove global */ +} + +static int incomplete(lua_State *L, int status) +{ + if (status == LUA_ERRSYNTAX) { + size_t lmsg; + const char *msg = lua_tolstring(L, -1, &lmsg); + const char *tp = msg + lmsg - (sizeof(LUA_QL("<eof>")) - 1); + if (strstr(msg, LUA_QL("<eof>")) == tp) { + lua_pop(L, 1); + return 1; + } + } + return 0; /* else... */ +} + +static int pushline(lua_State *L, int firstline) +{ + char buf[LUA_MAXINPUT]; + write_prompt(L, firstline); + if (fgets(buf, LUA_MAXINPUT, stdin)) { + size_t len = strlen(buf); + if (len > 0 && buf[len-1] == '\n') + buf[len-1] = '\0'; + if (firstline && buf[0] == '=') + lua_pushfstring(L, "return %s", buf+1); + else + lua_pushstring(L, buf); + return 1; + } + return 0; +} + +static int loadline(lua_State *L) +{ + int status; + lua_settop(L, 0); + if (!pushline(L, 1)) + return -1; /* no input */ + for (;;) { /* repeat until gets a complete line */ + status = luaL_loadbuffer(L, lua_tostring(L, 1), lua_strlen(L, 1), "=stdin"); + if (!incomplete(L, status)) break; /* cannot try to add lines? */ + if (!pushline(L, 0)) /* no more input? */ + return -1; + lua_pushliteral(L, "\n"); /* add a new line... */ + lua_insert(L, -2); /* ...between the two lines */ + lua_concat(L, 3); /* join them */ + } + lua_remove(L, 1); /* remove line */ + return status; +} + +static void dotty(lua_State *L) +{ + int status; + const char *oldprogname = progname; + progname = NULL; + while ((status = loadline(L)) != -1) { + if (status == 0) status = docall(L, 0, 0); + report(L, status); + if (status == 0 && lua_gettop(L) > 0) { /* any result to print? */ + lua_getglobal(L, "print"); + lua_insert(L, 1); + if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != 0) + l_message(progname, + lua_pushfstring(L, "error calling " LUA_QL("print") " (%s)", + lua_tostring(L, -1))); + } + } + lua_settop(L, 0); /* clear stack */ + fputs("\n", stdout); + fflush(stdout); + progname = oldprogname; +} + +static int handle_script(lua_State *L, char **argv, int n) +{ + int status; + const char *fname; + int narg = getargs(L, argv, n); /* collect arguments */ + lua_setglobal(L, "arg"); + fname = argv[n]; + if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0) + fname = NULL; /* stdin */ + status = luaL_loadfile(L, fname); + lua_insert(L, -(narg+1)); + if (status == 0) + status = docall(L, narg, 0); + else + lua_pop(L, narg); + return report(L, status); +} + +/* Load add-on module. */ +static int loadjitmodule(lua_State *L) +{ + lua_getglobal(L, "require"); + lua_pushliteral(L, "jit."); + lua_pushvalue(L, -3); + lua_concat(L, 2); + if (lua_pcall(L, 1, 1, 0)) { + const char *msg = lua_tostring(L, -1); + if (msg && !strncmp(msg, "module ", 7)) { + err: + l_message(progname, + "unknown luaJIT command or jit.* modules not installed"); + return 1; + } else { + return report(L, 1); + } + } + lua_getfield(L, -1, "start"); + if (lua_isnil(L, -1)) goto err; + lua_remove(L, -2); /* Drop module table. */ + return 0; +} + +/* Run command with options. */ +static int runcmdopt(lua_State *L, const char *opt) +{ + int narg = 0; + if (opt && *opt) { + for (;;) { /* Split arguments. */ + const char *p = strchr(opt, ','); + narg++; + if (!p) break; + if (p == opt) + lua_pushnil(L); + else + lua_pushlstring(L, opt, (size_t)(p - opt)); + opt = p + 1; + } + if (*opt) + lua_pushstring(L, opt); + else + lua_pushnil(L); + } + return report(L, lua_pcall(L, narg, 0, 0)); +} + +/* JIT engine control command: try jit library first or load add-on module. */ +static int dojitcmd(lua_State *L, const char *cmd) +{ + const char *opt = strchr(cmd, '='); + lua_pushlstring(L, cmd, opt ? (size_t)(opt - cmd) : strlen(cmd)); + lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED"); + lua_getfield(L, -1, "jit"); /* Get jit.* module table. */ + lua_remove(L, -2); + lua_pushvalue(L, -2); + lua_gettable(L, -2); /* Lookup library function. */ + if (!lua_isfunction(L, -1)) { + lua_pop(L, 2); /* Drop non-function and jit.* table, keep module name. */ + if (loadjitmodule(L)) + return 1; + } else { + lua_remove(L, -2); /* Drop jit.* table. */ + } + lua_remove(L, -2); /* Drop module name. */ + return runcmdopt(L, opt ? opt+1 : opt); +} + +/* Optimization flags. */ +static int dojitopt(lua_State *L, const char *opt) +{ + lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED"); + lua_getfield(L, -1, "jit.opt"); /* Get jit.opt.* module table. */ + lua_remove(L, -2); + lua_getfield(L, -1, "start"); + lua_remove(L, -2); + return runcmdopt(L, opt); +} + +/* Save or list bytecode. */ +static int dobytecode(lua_State *L, char **argv) +{ + int narg = 0; + lua_pushliteral(L, "bcsave"); + if (loadjitmodule(L)) + return 1; + if (argv[0][2]) { + narg++; + argv[0][1] = '-'; + lua_pushstring(L, argv[0]+1); + } + for (argv++; *argv != NULL; narg++, argv++) + lua_pushstring(L, *argv); + return report(L, lua_pcall(L, narg, 0, 0)); +} + +/* check that argument has no extra characters at the end */ +#define notail(x) {if ((x)[2] != '\0') return -1;} + +#define FLAGS_INTERACTIVE 1 +#define FLAGS_VERSION 2 +#define FLAGS_EXEC 4 +#define FLAGS_OPTION 8 +#define FLAGS_NOENV 16 + +static int collectargs(char **argv, int *flags) +{ + int i; + for (i = 1; argv[i] != NULL; i++) { + if (argv[i][0] != '-') /* Not an option? */ + return i; + switch (argv[i][1]) { /* Check option. */ + case '-': + notail(argv[i]); + return (argv[i+1] != NULL ? i+1 : 0); + case '\0': + return i; + case 'i': + notail(argv[i]); + *flags |= FLAGS_INTERACTIVE; + /* fallthrough */ + case 'v': + notail(argv[i]); + *flags |= FLAGS_VERSION; + break; + case 'e': + *flags |= FLAGS_EXEC; + case 'j': /* LuaJIT extension */ + case 'l': + *flags |= FLAGS_OPTION; + if (argv[i][2] == '\0') { + i++; + if (argv[i] == NULL) return -1; + } + break; + case 'O': break; /* LuaJIT extension */ + case 'b': /* LuaJIT extension */ + if (*flags) return -1; + *flags |= FLAGS_EXEC; + return 0; + case 'E': + *flags |= FLAGS_NOENV; + break; + default: return -1; /* invalid option */ + } + } + return 0; +} + +static int runargs(lua_State *L, char **argv, int n) +{ + int i; + for (i = 1; i < n; i++) { + if (argv[i] == NULL) continue; + lua_assert(argv[i][0] == '-'); + switch (argv[i][1]) { /* option */ + case 'e': { + const char *chunk = argv[i] + 2; + if (*chunk == '\0') chunk = argv[++i]; + lua_assert(chunk != NULL); + if (dostring(L, chunk, "=(command line)") != 0) + return 1; + break; + } + case 'l': { + const char *filename = argv[i] + 2; + if (*filename == '\0') filename = argv[++i]; + lua_assert(filename != NULL); + if (dolibrary(L, filename)) + return 1; /* stop if file fails */ + break; + } + case 'j': { /* LuaJIT extension */ + const char *cmd = argv[i] + 2; + if (*cmd == '\0') cmd = argv[++i]; + lua_assert(cmd != NULL); + if (dojitcmd(L, cmd)) + return 1; + break; + } + case 'O': /* LuaJIT extension */ + if (dojitopt(L, argv[i] + 2)) + return 1; + break; + case 'b': /* LuaJIT extension */ + return dobytecode(L, argv+i); + default: break; + } + } + return 0; +} + +static int handle_luainit(lua_State *L) +{ +#if LJ_TARGET_CONSOLE + const char *init = NULL; +#else + const char *init = getenv(LUA_INIT); +#endif + if (init == NULL) + return 0; /* status OK */ + else if (init[0] == 64) + return dofile(L, init+1); + else + return dostring(L, init, "=" LUA_INIT); +} + +struct Smain { + char **argv; + int argc; + int status; +}; + +static int pmain(lua_State *L) +{ + struct Smain *s = (struct Smain *)lua_touserdata(L, 1); + char **argv = s->argv; + int script; + int flags = 0; + globalL = L; + if (argv[0] && argv[0][0]) progname = argv[0]; + LUAJIT_VERSION_SYM(); /* linker-enforced version check */ + script = collectargs(argv, &flags); + if (script < 0) { /* invalid args? */ + print_usage(); + s->status = 1; + return 0; + } + if ((flags & FLAGS_NOENV)) { + lua_pushboolean(L, 1); + lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV"); + } + lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */ + luaL_openlibs(L); /* open libraries */ + lua_gc(L, LUA_GCRESTART, -1); + if (!(flags & FLAGS_NOENV)) { + s->status = handle_luainit(L); + if (s->status != 0) return 0; + } + if ((flags & FLAGS_VERSION)) print_version(); + s->status = runargs(L, argv, (script > 0) ? script : s->argc); + if (s->status != 0) return 0; + if (script) { + s->status = handle_script(L, argv, script); + if (s->status != 0) return 0; + } + if ((flags & FLAGS_INTERACTIVE)) { + print_jit_status(L); + dotty(L); + } else if (script == 0 && !(flags & (FLAGS_EXEC|FLAGS_VERSION))) { + if (lua_stdin_is_tty()) { + print_version(); + print_jit_status(L); + dotty(L); + } else { + dofile(L, NULL); /* executes stdin as a file */ + } + } + return 0; +} + +int luac_main(int argc, char **argv) +{ + int status; + struct Smain s; + lua_State *L = lua_open(); /* create state */ + if (L == NULL) { + l_message(argv[0], "cannot create state: not enough memory"); + return EXIT_FAILURE; + } + s.argc = argc; + s.argv = argv; + status = lua_cpcall(L, pmain, &s); + report(L, status); + lua_close(L); + return (status || s.status) ? EXIT_FAILURE : EXIT_SUCCESS; +} + diff --git a/Build/source/texk/web2c/luatexdir/luaimage.test b/Build/source/texk/web2c/luatexdir/luaimage.test index 1347bf9b90e..575154b5993 100755 --- a/Build/source/texk/web2c/luatexdir/luaimage.test +++ b/Build/source/texk/web2c/luatexdir/luaimage.test @@ -13,4 +13,5 @@ export TEXMFCNF TEXINPUTS TEXFORMATS ./luatex -fmt=luaimage luaimage || exit 1 -exit 0
\ No newline at end of file +exit 0 + diff --git a/Build/source/texk/web2c/luatexdir/luajitimage.test b/Build/source/texk/web2c/luatexdir/luajitimage.test new file mode 100755 index 00000000000..bfd60d9c230 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luajitimage.test @@ -0,0 +1,19 @@ +#! /bin/sh +# +# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +TEXMFCNF=$srcdir/../kpathsea +TEXINPUTS=.:$srcdir/tests +TEXFORMATS=. + +export TEXMFCNF TEXINPUTS TEXFORMATS + +cp $srcdir/luatexdir/tests/luaimage.tex luajitimage.tex + +./luajittex -ini luajitimage || exit 1 + +./luajittex -fmt=luajitimage luajitimage || exit 1 + +exit 0 + diff --git a/Build/source/texk/web2c/luatexdir/luajittex.test b/Build/source/texk/web2c/luatexdir/luajittex.test new file mode 100755 index 00000000000..789b27fb42f --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luajittex.test @@ -0,0 +1,9 @@ +#! /bin/sh + +# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +# Not really a test, just making sure the program executes. + +./luajittex -credits || exit 1 + |