dirs: Moved sources into their own subdirectory to prevent module col…

…lision

Makefile

@@ -3,7 +3,7 @@ WS_PLUGIN_DIR := $(HOME)/.config/wireshark/plugins/
 
 bootstrap: wssdl.lua
 
-wssdl.lua: $(wildcard src/*.lua)
+wssdl.lua: $(wildcard src/wssdl/*.lua)
 	$(LUA) pack.lua src > wssdl.lua
 
 install: $(HOME)/.config/wireshark/plugins/ | bootstrap

pack.lua

@@ -21,9 +21,9 @@ local fs = require 'lfs'
 
 local args = {...}
 local root = args[1]:gsub('/$', ''):gsub('\\$', '')
+local files = {}
 
 function scandir(root, path)
-  local files = {}
   -- adapted from http://keplerproject.github.com/luafilesystem/examples.html
   path = path or ''
   for file in fs.dir(root..path) do
@@ -49,7 +49,7 @@ function scandir(root, path)
   return files
 end
 
-local files = scandir(root)
+scandir(root)
 
 acc = { [[
 --
@@ -99,7 +99,7 @@ do
   end
 end
 
-return require 'wssdl-core'
+return require 'wssdl.core'
 ]])
 
 print(table.concat(acc))

src/wssdl-core.lua → src/wssdl/core.lua

@@ -37,10 +37,10 @@ function tprint (tbl, indent)
   end
 end
 
-require('bit') -- Monkey-patch 'bit' library
+require('wssdl.bit') -- Monkey-patch 'bit' library
 
-local placeholder = require('placeholder'):init(wssdl)
-local utils       = require('utils')
+local placeholder = require('wssdl.placeholder'):init(wssdl)
+local utils       = require('wssdl.utils')
 
 wssdl.init = function (self, env)
   self.env = env

src/placeholder.lua → src/wssdl/placeholder.lua

@@ -16,7 +16,7 @@
 --  You should have received a copy of the GNU General Public License
 --  along with wssdl.  If not, see <http://www.gnu.org/licenses/>.
 
-local specifiers = require 'specifiers'
+local specifiers = require 'wssdl.specifiers'
 
 -- Module
 local placeholder = {}