From 4e7b652014c3098c06235b2749f56934e08b9f51 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 9 May 2018 20:34:32 -0700 Subject: Switched luajit to use custom built luajit lpeg, allowed `find` to traverse symbolic links. --- nomsu.lua | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'nomsu.lua') diff --git a/nomsu.lua b/nomsu.lua index 67aafae..3a29261 100644 --- a/nomsu.lua +++ b/nomsu.lua @@ -1,7 +1,5 @@ if jit then - package.path = "LPegLJ/src/?.lua;" .. tostring(package.path) - lpeg = require('lpeglj') - re = require('re') + package.cpath = "./luajit_lpeg/?.so;" .. package.cpath bit32 = require('bit') local _pairs, _ipairs = pairs, ipairs pairs = function(x) @@ -26,10 +24,9 @@ if jit then end return _ipairs(x) end -else - re = require('re') - lpeg = require('lpeg') end +re = require('re') +lpeg = require('lpeg') lpeg.setmaxstack(10000) local P, R, V, S, Cg, C, Cp, B, Cmt P, R, V, S, Cg, C, Cp, B, Cmt = lpeg.P, lpeg.R, lpeg.V, lpeg.S, lpeg.Cg, lpeg.C, lpeg.Cp, lpeg.B, lpeg.Cmt @@ -91,7 +88,7 @@ all_files = function(path) return iterate_single, path end path = path:gsub("\\", "\\\\"):gsub("`", ""):gsub('"', '\\"'):gsub("$", "") - return io.popen("find \"" .. path .. "\" -type f -name \"*.nom\""):lines() + return io.popen("find -L \"" .. path .. "\" -type f -name \"*.nom\""):lines() end local line_counter = re.compile([[ lines <- {| line (%nl line)* |} line <- {} (!%nl .)* -- cgit v1.2.3