Switched luajit to use custom built luajit lpeg, allowed `find` to

traverse symbolic links.

2 files changed, 9 insertions, 14 deletions

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 .)*
diff --git a/nomsu.moon b/nomsu.moon
index 76becf0..f76b530 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -12,9 +12,7 @@
 --        lua nomsu.lua [input_file [output_file or -]]
 export lpeg, re
 if jit
-    package.path = "LPegLJ/src/?.lua;#{package.path}"
-    lpeg = require 'lpeglj'
-    re = require 're'
+    package.cpath = "./luajit_lpeg/?.so;"..package.cpath
     
     export bit32
     bit32 = require('bit')
@@ -31,9 +29,9 @@ if jit
             if mt.__ipairs
                 return mt.__ipairs(x)
         return _ipairs(x)
-else
-    re = require 're'
-    lpeg = require 'lpeg'
+
+re = require 're'
+lpeg = require 'lpeg'
 lpeg.setmaxstack 10000
 {:P,:R,:V,:S,:Cg,:C,:Cp,:B,:Cmt} = lpeg
 utils = require 'utils'
@@ -79,7 +77,7 @@ all_files = (path)->
         return iterate_single, path
     -- TODO: improve sanitization
     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!
 
 line_counter = re.compile([[
     lines <- {| line (%nl line)* |}