Move all lua related files to lua/ subfolder

Also remove the lexers sub directory from the Lua search path. As a result we attempt to open fewer files during startup: $ strace -e open -o log ./vis +q config.h && wc -l log In order to avoid having to modifiy all lexers which `require('lexer')` we instead place a symlink in the top level directory. $ ./configure --disable-lua $ rm -rf lua Should result in a source tree with most lua specifc functionality removed.
hhy5277 · Dec 7, 2016 · 3570869 · 3570869
1 parent 098504f
commit 3570869
Show file tree

Hide file tree

Showing 141 changed files with 46 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -86,10 +86,10 @@ man:
 	done
 
 luadoc:
-	@cd luadoc && ldoc . && sed -e "s/RELEASE/${VERSION}/" -i index.html
+	@cd lua/doc && ldoc . && sed -e "s/RELEASE/${VERSION}/" -i index.html
 
 luadoc-all:
-	@cd luadoc && ldoc -a . && sed -e "s/RELEASE/${VERSION}/" -i index.html
+	@cd lua/doc && ldoc -a . && sed -e "s/RELEASE/${VERSION}/" -i index.html
 
 install: vis vis-menu
 	@echo stripping executable
@@ -109,7 +109,7 @@ install: vis vis-menu
 	@test ${CONFIG_LUA} -eq 0 || { \
 		echo installing support files to ${DESTDIR}${SHAREPREFIX}/vis; \
 		mkdir -p ${DESTDIR}${SHAREPREFIX}/vis; \
-		cp -r visrc.lua vis.lua lexers ${DESTDIR}${SHAREPREFIX}/vis; \
+		cp -r lua/* ${DESTDIR}${SHAREPREFIX}/vis; \
 	}
 	@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1

diff --git a/lexers/template.txt b/lexers/template.txt
diff --git a/luadoc/README.md → lua/doc/README.md b/luadoc/README.md → lua/doc/README.md
diff --git a/luadoc/config.ld → lua/doc/config.ld b/luadoc/config.ld → lua/doc/config.ld
@@ -8,7 +8,7 @@ sort=true
 merge=true
 no_space_before_args=true
 file={
-	"../vis-lua.c",
+	"../../vis-lua.c",
 	"../vis.lua",
 }
 
diff --git a/lua/lexer.lua b/lua/lexer.lua
@@ -0,0 +1 @@
+lexers/lexer.lua
diff --git a/lexers/LICENSE → lua/lexers/LICENSE b/lexers/LICENSE → lua/lexers/LICENSE
diff --git a/lexers/README.md → lua/lexers/README.md b/lexers/README.md → lua/lexers/README.md
@@ -9,7 +9,7 @@ based lexers from the [Scintillua](http://foicica.com/scintillua/) project.
 Vis searches the lexers in the following locations:
 
  * `$VIS_PATH/lexers`
- * `./lexers` relative to the binary location (using `/proc/self/exe`)
+ * `./lua/lexers` relative to the binary location (using `/proc/self/exe`)
  * `$XDG_CONFIG_HOME/vis/lexers`
  * `/usr/local/share/vis/lexers`
  * `/usr/share/vis/lexers`
@@ -36,9 +36,34 @@ the table found at the end of the [vis.lua](/vis.lua) file.
 
 Changes to existing lexers should also be sent upstream for consideration.
 
+A template for new lexers:
+
+```
+-- ? LPeg lexer.
+
+local l = require('lexer')
+local token, word_match = l.token, l.word_match
+local P, R, S = lpeg.P, lpeg.R, lpeg.S
+
+local M = {_NAME = '?'}
+
+-- Whitespace.
+local ws = token(l.WHITESPACE, l.space^1)
+
+M._rules = {
+  {'whitespace', ws},
+}
+
+M._tokenstyles = {
+
+}
+
+return M
+```
+
 # Color Themes
 
-The `themes` sub directory contains the color schemes. At startup the
+The `../themes` directory contains the color schemes. At startup the
 `default.lua` theme which should be a symlink to your prefered style is
 used. Themes can be changed at runtime via the `:set theme <name>`
 command where `<name>` does not include the `.lua` file extension.

diff --git a/lexers/actionscript.lua → lua/lexers/actionscript.lua b/lexers/actionscript.lua → lua/lexers/actionscript.lua
diff --git a/lexers/ada.lua → lua/lexers/ada.lua b/lexers/ada.lua → lua/lexers/ada.lua
diff --git a/lexers/ansi_c.lua → lua/lexers/ansi_c.lua b/lexers/ansi_c.lua → lua/lexers/ansi_c.lua
diff --git a/lexers/antlr.lua → lua/lexers/antlr.lua b/lexers/antlr.lua → lua/lexers/antlr.lua
diff --git a/lexers/apdl.lua → lua/lexers/apdl.lua b/lexers/apdl.lua → lua/lexers/apdl.lua
diff --git a/lexers/apl.lua → lua/lexers/apl.lua b/lexers/apl.lua → lua/lexers/apl.lua
diff --git a/lexers/applescript.lua → lua/lexers/applescript.lua b/lexers/applescript.lua → lua/lexers/applescript.lua
diff --git a/lexers/asm.lua → lua/lexers/asm.lua b/lexers/asm.lua → lua/lexers/asm.lua
diff --git a/lexers/asp.lua → lua/lexers/asp.lua b/lexers/asp.lua → lua/lexers/asp.lua
diff --git a/lexers/autoit.lua → lua/lexers/autoit.lua b/lexers/autoit.lua → lua/lexers/autoit.lua
diff --git a/lexers/awk.lua → lua/lexers/awk.lua b/lexers/awk.lua → lua/lexers/awk.lua
diff --git a/lexers/bash.lua → lua/lexers/bash.lua b/lexers/bash.lua → lua/lexers/bash.lua
diff --git a/lexers/batch.lua → lua/lexers/batch.lua b/lexers/batch.lua → lua/lexers/batch.lua
diff --git a/lexers/bibtex.lua → lua/lexers/bibtex.lua b/lexers/bibtex.lua → lua/lexers/bibtex.lua
diff --git a/lexers/boo.lua → lua/lexers/boo.lua b/lexers/boo.lua → lua/lexers/boo.lua
diff --git a/lexers/caml.lua → lua/lexers/caml.lua b/lexers/caml.lua → lua/lexers/caml.lua
diff --git a/lexers/chuck.lua → lua/lexers/chuck.lua b/lexers/chuck.lua → lua/lexers/chuck.lua
diff --git a/lexers/cmake.lua → lua/lexers/cmake.lua b/lexers/cmake.lua → lua/lexers/cmake.lua
diff --git a/lexers/coffeescript.lua → lua/lexers/coffeescript.lua b/lexers/coffeescript.lua → lua/lexers/coffeescript.lua
diff --git a/lexers/container.lua → lua/lexers/container.lua b/lexers/container.lua → lua/lexers/container.lua
diff --git a/lexers/context.lua → lua/lexers/context.lua b/lexers/context.lua → lua/lexers/context.lua
diff --git a/lexers/cpp.lua → lua/lexers/cpp.lua b/lexers/cpp.lua → lua/lexers/cpp.lua
diff --git a/lexers/crystal.lua → lua/lexers/crystal.lua b/lexers/crystal.lua → lua/lexers/crystal.lua
diff --git a/lexers/csharp.lua → lua/lexers/csharp.lua b/lexers/csharp.lua → lua/lexers/csharp.lua
diff --git a/lexers/css.lua → lua/lexers/css.lua b/lexers/css.lua → lua/lexers/css.lua
diff --git a/lexers/cuda.lua → lua/lexers/cuda.lua b/lexers/cuda.lua → lua/lexers/cuda.lua
diff --git a/lexers/dart.lua → lua/lexers/dart.lua b/lexers/dart.lua → lua/lexers/dart.lua
diff --git a/lexers/desktop.lua → lua/lexers/desktop.lua b/lexers/desktop.lua → lua/lexers/desktop.lua
diff --git a/lexers/diff.lua → lua/lexers/diff.lua b/lexers/diff.lua → lua/lexers/diff.lua
diff --git a/lexers/django.lua → lua/lexers/django.lua b/lexers/django.lua → lua/lexers/django.lua
diff --git a/lexers/dmd.lua → lua/lexers/dmd.lua b/lexers/dmd.lua → lua/lexers/dmd.lua
diff --git a/lexers/dockerfile.lua → lua/lexers/dockerfile.lua b/lexers/dockerfile.lua → lua/lexers/dockerfile.lua
diff --git a/lexers/dot.lua → lua/lexers/dot.lua b/lexers/dot.lua → lua/lexers/dot.lua
diff --git a/lexers/dsv.lua → lua/lexers/dsv.lua b/lexers/dsv.lua → lua/lexers/dsv.lua
diff --git a/lexers/eiffel.lua → lua/lexers/eiffel.lua b/lexers/eiffel.lua → lua/lexers/eiffel.lua
diff --git a/lexers/elixir.lua → lua/lexers/elixir.lua b/lexers/elixir.lua → lua/lexers/elixir.lua
diff --git a/lexers/erlang.lua → lua/lexers/erlang.lua b/lexers/erlang.lua → lua/lexers/erlang.lua
diff --git a/lexers/faust.lua → lua/lexers/faust.lua b/lexers/faust.lua → lua/lexers/faust.lua
diff --git a/lexers/fish.lua → lua/lexers/fish.lua b/lexers/fish.lua → lua/lexers/fish.lua
diff --git a/lexers/forth.lua → lua/lexers/forth.lua b/lexers/forth.lua → lua/lexers/forth.lua
diff --git a/lexers/fortran.lua → lua/lexers/fortran.lua b/lexers/fortran.lua → lua/lexers/fortran.lua
diff --git a/lexers/fsharp.lua → lua/lexers/fsharp.lua b/lexers/fsharp.lua → lua/lexers/fsharp.lua
diff --git a/lexers/fstab.lua → lua/lexers/fstab.lua b/lexers/fstab.lua → lua/lexers/fstab.lua
diff --git a/lexers/gap.lua → lua/lexers/gap.lua b/lexers/gap.lua → lua/lexers/gap.lua
diff --git a/lexers/gettext.lua → lua/lexers/gettext.lua b/lexers/gettext.lua → lua/lexers/gettext.lua
diff --git a/lexers/gherkin.lua → lua/lexers/gherkin.lua b/lexers/gherkin.lua → lua/lexers/gherkin.lua
diff --git a/lexers/glsl.lua → lua/lexers/glsl.lua b/lexers/glsl.lua → lua/lexers/glsl.lua
diff --git a/lexers/gnuplot.lua → lua/lexers/gnuplot.lua b/lexers/gnuplot.lua → lua/lexers/gnuplot.lua
diff --git a/lexers/go.lua → lua/lexers/go.lua b/lexers/go.lua → lua/lexers/go.lua
diff --git a/lexers/groovy.lua → lua/lexers/groovy.lua b/lexers/groovy.lua → lua/lexers/groovy.lua
diff --git a/lexers/gtkrc.lua → lua/lexers/gtkrc.lua b/lexers/gtkrc.lua → lua/lexers/gtkrc.lua
diff --git a/lexers/haskell.lua → lua/lexers/haskell.lua b/lexers/haskell.lua → lua/lexers/haskell.lua
diff --git a/lexers/html.lua → lua/lexers/html.lua b/lexers/html.lua → lua/lexers/html.lua
diff --git a/lexers/icon.lua → lua/lexers/icon.lua b/lexers/icon.lua → lua/lexers/icon.lua
diff --git a/lexers/idl.lua → lua/lexers/idl.lua b/lexers/idl.lua → lua/lexers/idl.lua
diff --git a/lexers/inform.lua → lua/lexers/inform.lua b/lexers/inform.lua → lua/lexers/inform.lua
diff --git a/lexers/ini.lua → lua/lexers/ini.lua b/lexers/ini.lua → lua/lexers/ini.lua
diff --git a/lexers/io_lang.lua → lua/lexers/io_lang.lua b/lexers/io_lang.lua → lua/lexers/io_lang.lua
diff --git a/lexers/java.lua → lua/lexers/java.lua b/lexers/java.lua → lua/lexers/java.lua
diff --git a/lexers/javascript.lua → lua/lexers/javascript.lua b/lexers/javascript.lua → lua/lexers/javascript.lua
diff --git a/lexers/json.lua → lua/lexers/json.lua b/lexers/json.lua → lua/lexers/json.lua
diff --git a/lexers/jsp.lua → lua/lexers/jsp.lua b/lexers/jsp.lua → lua/lexers/jsp.lua
diff --git a/lexers/latex.lua → lua/lexers/latex.lua b/lexers/latex.lua → lua/lexers/latex.lua
diff --git a/lexers/ledger.lua → lua/lexers/ledger.lua b/lexers/ledger.lua → lua/lexers/ledger.lua
diff --git a/lexers/less.lua → lua/lexers/less.lua b/lexers/less.lua → lua/lexers/less.lua
diff --git a/lexers/lexer.lua → lua/lexers/lexer.lua b/lexers/lexer.lua → lua/lexers/lexer.lua
@@ -1039,7 +1039,7 @@ function M.load(name, alt_name)
 
   -- Load the language lexer with its rules, styles, etc.
   M.WHITESPACE = (alt_name or name)..'_whitespace'
-  local lexer_file, error = package.searchpath(name, M.LEXERPATH)
+  local lexer_file, error = package.searchpath('lexers/'..name, M.LEXERPATH)
   local ok, lexer = pcall(dofile, lexer_file or '')
   if not ok then
     return nil

diff --git a/lexers/lilypond.lua → lua/lexers/lilypond.lua b/lexers/lilypond.lua → lua/lexers/lilypond.lua
diff --git a/lexers/lisp.lua → lua/lexers/lisp.lua b/lexers/lisp.lua → lua/lexers/lisp.lua
diff --git a/lexers/litcoffee.lua → lua/lexers/litcoffee.lua b/lexers/litcoffee.lua → lua/lexers/litcoffee.lua
diff --git a/lexers/lua.lua → lua/lexers/lua.lua b/lexers/lua.lua → lua/lexers/lua.lua
diff --git a/lexers/makefile.lua → lua/lexers/makefile.lua b/lexers/makefile.lua → lua/lexers/makefile.lua
diff --git a/lexers/man.lua → lua/lexers/man.lua b/lexers/man.lua → lua/lexers/man.lua
diff --git a/lexers/markdown.lua → lua/lexers/markdown.lua b/lexers/markdown.lua → lua/lexers/markdown.lua
diff --git a/lexers/matlab.lua → lua/lexers/matlab.lua b/lexers/matlab.lua → lua/lexers/matlab.lua
diff --git a/lexers/moonscript.lua → lua/lexers/moonscript.lua b/lexers/moonscript.lua → lua/lexers/moonscript.lua
diff --git a/lexers/nemerle.lua → lua/lexers/nemerle.lua b/lexers/nemerle.lua → lua/lexers/nemerle.lua
diff --git a/lexers/networkd.lua → lua/lexers/networkd.lua b/lexers/networkd.lua → lua/lexers/networkd.lua
diff --git a/lexers/nim.lua → lua/lexers/nim.lua b/lexers/nim.lua → lua/lexers/nim.lua
diff --git a/lexers/nsis.lua → lua/lexers/nsis.lua b/lexers/nsis.lua → lua/lexers/nsis.lua
diff --git a/lexers/null.lua → lua/lexers/null.lua b/lexers/null.lua → lua/lexers/null.lua
diff --git a/lexers/objective_c.lua → lua/lexers/objective_c.lua b/lexers/objective_c.lua → lua/lexers/objective_c.lua
diff --git a/lexers/pascal.lua → lua/lexers/pascal.lua b/lexers/pascal.lua → lua/lexers/pascal.lua
diff --git a/lexers/perl.lua → lua/lexers/perl.lua b/lexers/perl.lua → lua/lexers/perl.lua
diff --git a/lexers/php.lua → lua/lexers/php.lua b/lexers/php.lua → lua/lexers/php.lua
diff --git a/lexers/pico8.lua → lua/lexers/pico8.lua b/lexers/pico8.lua → lua/lexers/pico8.lua
diff --git a/lexers/pike.lua → lua/lexers/pike.lua b/lexers/pike.lua → lua/lexers/pike.lua
diff --git a/lexers/pkgbuild.lua → lua/lexers/pkgbuild.lua b/lexers/pkgbuild.lua → lua/lexers/pkgbuild.lua
diff --git a/lexers/powershell.lua → lua/lexers/powershell.lua b/lexers/powershell.lua → lua/lexers/powershell.lua
diff --git a/lexers/prolog.lua → lua/lexers/prolog.lua b/lexers/prolog.lua → lua/lexers/prolog.lua
diff --git a/lexers/props.lua → lua/lexers/props.lua b/lexers/props.lua → lua/lexers/props.lua
diff --git a/lexers/protobuf.lua → lua/lexers/protobuf.lua b/lexers/protobuf.lua → lua/lexers/protobuf.lua
diff --git a/lexers/ps.lua → lua/lexers/ps.lua b/lexers/ps.lua → lua/lexers/ps.lua
diff --git a/lexers/pure.lua → lua/lexers/pure.lua b/lexers/pure.lua → lua/lexers/pure.lua
diff --git a/lexers/python.lua → lua/lexers/python.lua b/lexers/python.lua → lua/lexers/python.lua
diff --git a/lexers/rails.lua → lua/lexers/rails.lua b/lexers/rails.lua → lua/lexers/rails.lua
diff --git a/lexers/rebol.lua → lua/lexers/rebol.lua b/lexers/rebol.lua → lua/lexers/rebol.lua
diff --git a/lexers/rest.lua → lua/lexers/rest.lua b/lexers/rest.lua → lua/lexers/rest.lua
diff --git a/lexers/rexx.lua → lua/lexers/rexx.lua b/lexers/rexx.lua → lua/lexers/rexx.lua
diff --git a/lexers/rhtml.lua → lua/lexers/rhtml.lua b/lexers/rhtml.lua → lua/lexers/rhtml.lua
diff --git a/lexers/rstats.lua → lua/lexers/rstats.lua b/lexers/rstats.lua → lua/lexers/rstats.lua
diff --git a/lexers/ruby.lua → lua/lexers/ruby.lua b/lexers/ruby.lua → lua/lexers/ruby.lua
diff --git a/lexers/rust.lua → lua/lexers/rust.lua b/lexers/rust.lua → lua/lexers/rust.lua
diff --git a/lexers/sass.lua → lua/lexers/sass.lua b/lexers/sass.lua → lua/lexers/sass.lua
diff --git a/lexers/scala.lua → lua/lexers/scala.lua b/lexers/scala.lua → lua/lexers/scala.lua
diff --git a/lexers/scheme.lua → lua/lexers/scheme.lua b/lexers/scheme.lua → lua/lexers/scheme.lua
diff --git a/lexers/smalltalk.lua → lua/lexers/smalltalk.lua b/lexers/smalltalk.lua → lua/lexers/smalltalk.lua
diff --git a/lexers/sml.lua → lua/lexers/sml.lua b/lexers/sml.lua → lua/lexers/sml.lua
diff --git a/lexers/snobol4.lua → lua/lexers/snobol4.lua b/lexers/snobol4.lua → lua/lexers/snobol4.lua
diff --git a/lexers/sql.lua → lua/lexers/sql.lua b/lexers/sql.lua → lua/lexers/sql.lua
diff --git a/lexers/systemd.lua → lua/lexers/systemd.lua b/lexers/systemd.lua → lua/lexers/systemd.lua
diff --git a/lexers/taskpaper.lua → lua/lexers/taskpaper.lua b/lexers/taskpaper.lua → lua/lexers/taskpaper.lua
diff --git a/lexers/tcl.lua → lua/lexers/tcl.lua b/lexers/tcl.lua → lua/lexers/tcl.lua
diff --git a/lexers/tex.lua → lua/lexers/tex.lua b/lexers/tex.lua → lua/lexers/tex.lua
diff --git a/lexers/texinfo.lua → lua/lexers/texinfo.lua b/lexers/texinfo.lua → lua/lexers/texinfo.lua
diff --git a/lexers/text.lua → lua/lexers/text.lua b/lexers/text.lua → lua/lexers/text.lua
diff --git a/lexers/toml.lua → lua/lexers/toml.lua b/lexers/toml.lua → lua/lexers/toml.lua
diff --git a/lexers/vala.lua → lua/lexers/vala.lua b/lexers/vala.lua → lua/lexers/vala.lua
diff --git a/lexers/vb.lua → lua/lexers/vb.lua b/lexers/vb.lua → lua/lexers/vb.lua
diff --git a/lexers/vbscript.lua → lua/lexers/vbscript.lua b/lexers/vbscript.lua → lua/lexers/vbscript.lua
diff --git a/lexers/vcard.lua → lua/lexers/vcard.lua b/lexers/vcard.lua → lua/lexers/vcard.lua
diff --git a/lexers/verilog.lua → lua/lexers/verilog.lua b/lexers/verilog.lua → lua/lexers/verilog.lua
diff --git a/lexers/vhdl.lua → lua/lexers/vhdl.lua b/lexers/vhdl.lua → lua/lexers/vhdl.lua
diff --git a/lexers/wsf.lua → lua/lexers/wsf.lua b/lexers/wsf.lua → lua/lexers/wsf.lua
diff --git a/lexers/xml.lua → lua/lexers/xml.lua b/lexers/xml.lua → lua/lexers/xml.lua
diff --git a/lexers/xtend.lua → lua/lexers/xtend.lua b/lexers/xtend.lua → lua/lexers/xtend.lua
diff --git a/lexers/yaml.lua → lua/lexers/yaml.lua b/lexers/yaml.lua → lua/lexers/yaml.lua
diff --git a/lexers/themes/dark-16.lua → lua/themes/dark-16.lua b/lexers/themes/dark-16.lua → lua/themes/dark-16.lua
diff --git a/lexers/themes/default-16.lua → lua/themes/default-16.lua b/lexers/themes/default-16.lua → lua/themes/default-16.lua
diff --git a/lexers/themes/default-256.lua → lua/themes/default-256.lua b/lexers/themes/default-256.lua → lua/themes/default-256.lua
diff --git a/lexers/themes/light-16.lua → lua/themes/light-16.lua b/lexers/themes/light-16.lua → lua/themes/light-16.lua
diff --git a/lexers/themes/solarized.lua → lua/themes/solarized.lua b/lexers/themes/solarized.lua → lua/themes/solarized.lua
diff --git a/vis.lua → lua/vis.lua b/vis.lua → lua/vis.lua
diff --git a/visrc.lua → lua/visrc.lua b/visrc.lua → lua/visrc.lua
diff --git a/vis-lua.c b/vis-lua.c
@@ -1804,10 +1804,8 @@ bool vis_lua_path_add(Vis *vis, const char *path) {
 	lua_getglobal(L, "package");
 	lua_pushstring(L, path);
 	lua_pushstring(L, "/?.lua;");
-	lua_pushstring(L, path);
-	lua_pushstring(L, "/lexers/?.lua;");
-	lua_getfield(L, -5, "path");
-	lua_concat(L, 5);
+	lua_getfield(L, -3, "path");
+	lua_concat(L, 3);
 	lua_setfield(L, -2, "path");
 	lua_pop(L, 1); /* package */
 	return true;
@@ -1888,7 +1886,17 @@ void vis_lua_init(Vis *vis) {
 	ssize_t len = readlink("/proc/self/exe", path, sizeof(path)-1);
 	if (len > 0) {
 		path[len] = '\0';
-		vis_lua_path_add(vis, dirname(path));
+		/* some idotic dirname(3) implementations return pointers to statically
+		 * allocated memory, hence we use memmove to copy it back */
+		char *dir = dirname(path);
+		if (dir) {
+			size_t len = strlen(dir)+1;
+			if (len < sizeof(path) - sizeof("/lua")) {
+				memmove(path, dir, len);
+				strcat(path, "/lua");
+				vis_lua_path_add(vis, path);
+			}
+		}
 	}
 
 	vis_lua_path_add(vis, getenv("VIS_PATH"));