No need to pass module to skang.thing(), it can work it out.

2 files changed, 14 insertions, 10 deletions

diff --git a/ClientHamr/GuiLua/skang.lua b/ClientHamr/GuiLua/skang.lua
index e81c598..adf4edf 100644
--- a/ClientHamr/GuiLua/skang.lua
+++ b/ClientHamr/GuiLua/skang.lua
@@ -304,7 +304,10 @@ end
 -- required     - "boolean" to say if this thing is required.  TODO - Maybe fold this into types somehow, or acl?
 -- acl          - Access Control List defining security restrains.
 -- boss         - the Thing or person that owns this Thing, otherwise it is self owned.
-thing = function (module, names, help, default, types, widget, required, acl, boss)
+thing = function (names, help, default, types, widget, required, acl, boss)
+  -- Grad the environment of the calling function, so this new thing automatically becomes a global in it.
+  module = getfenv(2)
+
   -- Break out the names.
   local n = {}
   local i = 1
@@ -382,12 +385,12 @@ end
 quit = function ()
 end
 
-thing(_M, 'nada',       'Do nothing.',                                  nada)
-thing(_M, 'clear',      'The current skin is cleared of all widgets.',  clear)
-thing(_M, 'window',     'The size and title of the application Frame.', window, 'x,y,name', nil, nil, 'GGG')
-thing(_M, 'module',     'Load a module.',                               module, 'file,acl')
-thing(_M, 'skang',      'Parse the contents of a skang file or URL.',   skang,  'URL')
-thing(_M, 'quit',       'Quit, exit, remove thyself.',                  quit)
+thing('nada',   'Do nothing.',                                  nada)
+thing('clear',  'The current skin is cleared of all widgets.',  clear)
+thing('window', 'The size and title of the application Frame.', window, 'x,y,name', nil, nil, 'GGG')
+thing('module', 'Load a module.',                               module, 'file,acl')
+thing('skang',  'Parse the contents of a skang file or URL.',   skang,  'URL')
+thing('quit',   'Quit, exit, remove thyself.',                  quit)
 
 
 moduleEnd(_M)
diff --git a/ClientHamr/GuiLua/test.lua b/ClientHamr/GuiLua/test.lua
index 6a38cde..5a5fda1 100644
--- a/ClientHamr/GuiLua/test.lua
+++ b/ClientHamr/GuiLua/test.lua
@@ -30,11 +30,12 @@ print('code')
 -- A variable that is private to this module.
 local foo
 
-skang.thing(_M, 'fooble,f', 'Help text goes here', 1, 'number', '"edit", "The fooble:", 1, 1, 10, 50', true)
-skang.thing(_M, 'bar', 'Help text', "Default")
+skang.thing('fooble,f', 'Help text goes here', 1, 'number', '"edit", "The fooble:", 1, 1, 10, 50', true)
+skang.thing('bar', 'Help text', "Default")
+skang.thing('foo')
 
 -- We can use inline functions if we don't need the function internally.
-skang.thing(_M, 'ffunc', 'Help Text', function (arg1, arg2)
+skang.thing('ffunc', 'Help Text', function (arg1, arg2)
   print('Inside test.ffunc ' .. arg1 .. ', ' .. arg2)
 end, 'number,string')