aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-04-09 09:22:43 +1000
committerDavid Walter Seikel2014-04-09 09:22:43 +1000
commitbe7ff727702fa5a4599a0578e98c04386530769a (patch)
tree0c5b4986dc13314e260a72b58dbc2d73a2db3b5c
parentPass C command arguments to skang. (diff)
downloadSledjHamr-be7ff727702fa5a4599a0578e98c04386530769a.zip
SledjHamr-be7ff727702fa5a4599a0578e98c04386530769a.tar.gz
SledjHamr-be7ff727702fa5a4599a0578e98c04386530769a.tar.bz2
SledjHamr-be7ff727702fa5a4599a0578e98c04386530769a.tar.xz
Implement skang.module().
-rw-r--r--ClientHamr/GuiLua/skang.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/ClientHamr/GuiLua/skang.lua b/ClientHamr/GuiLua/skang.lua
index 2957fcc..e738a50 100644
--- a/ClientHamr/GuiLua/skang.lua
+++ b/ClientHamr/GuiLua/skang.lua
@@ -282,6 +282,8 @@ parseType = function (module, thingy, v, value)
282 else 282 else
283 module[v[2] ]() 283 module[v[2] ]()
284 end 284 end
285 end
286
285 if 'boolean' == thingy.types[1] then 287 if 'boolean' == thingy.types[1] then
286 if value then 288 if value then
287 -- Only parse the next value as a boolean if it doesn't have an introducer. 289 -- Only parse the next value as a boolean if it doesn't have an introducer.
@@ -967,6 +969,7 @@ window = function (width, height, title)
967end 969end
968 970
969module = function (name) 971module = function (name)
972 return require(name)
970end 973end
971 974
972skang = function (name) 975skang = function (name)
@@ -976,7 +979,7 @@ end
976 979
977thingasm('clear', 'The current skin is cleared of all widgets.', clear) 980thingasm('clear', 'The current skin is cleared of all widgets.', clear)
978thingasm{'window', 'The size and title of the application Frame.', window, 'x,y,name', acl='GGG'} 981thingasm{'window', 'The size and title of the application Frame.', window, 'x,y,name', acl='GGG'}
979thingasm('module', 'Load a module.', module, 'file,acl') 982thingasm('module,l', 'Load a module.', module, 'file')
980thingasm('skang', 'Parse the contents of a skang file or URL.', skang, 'URL') 983thingasm('skang', 'Parse the contents of a skang file or URL.', skang, 'URL')
981thingasm('quit', 'Quit, exit, remove thyself.', quit) 984thingasm('quit', 'Quit, exit, remove thyself.', quit)
982 985