aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ClientHamr/GuiLua
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-03-28 03:34:11 +1000
committerDavid Walter Seikel2014-03-28 03:34:11 +1000
commit7ddebdbe4756f1c81f5e6a245420cc69a48fbd1b (patch)
tree6b90347acdf19db31dce40bc260ea9d5b71bbb24 /ClientHamr/GuiLua
parentTODO++ - Should use positional and named arguments when we write the widget s... (diff)
downloadSledjHamr-7ddebdbe4756f1c81f5e6a245420cc69a48fbd1b.zip
SledjHamr-7ddebdbe4756f1c81f5e6a245420cc69a48fbd1b.tar.gz
SledjHamr-7ddebdbe4756f1c81f5e6a245420cc69a48fbd1b.tar.bz2
SledjHamr-7ddebdbe4756f1c81f5e6a245420cc69a48fbd1b.tar.xz
Shuffle the version printing around.
Diffstat (limited to 'ClientHamr/GuiLua')
-rw-r--r--ClientHamr/GuiLua/skang.lua4
-rw-r--r--ClientHamr/GuiLua/test.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/ClientHamr/GuiLua/skang.lua b/ClientHamr/GuiLua/skang.lua
index bd712f2..b7cf59b 100644
--- a/ClientHamr/GuiLua/skang.lua
+++ b/ClientHamr/GuiLua/skang.lua
@@ -136,6 +136,8 @@ moduleBegin = function (name, author, copyright, version, timestamp, skin)
136 -- Dunno if this causes problems with the do ... end style of joining modules. It does. So we need to restore in moduleEnd(). 136 -- Dunno if this causes problems with the do ... end style of joining modules. It does. So we need to restore in moduleEnd().
137 -- Next question, does this screw with the environment of the skang module? No it doesn't, coz that's set up at require 'skang' time. 137 -- Next question, does this screw with the environment of the skang module? No it doesn't, coz that's set up at require 'skang' time.
138 138
139 print('Loaded module ' .. _M._NAME .. ' version ' .. _M.VERSION .. ', ' .. _M.COPYRIGHT .. '.\n ' .. _M.VERSION_DESC)
140
139 return _M 141 return _M
140end 142end
141 143
@@ -149,7 +151,7 @@ end
149 151
150-- Call this now so that from now on, this is like any other module. 152-- Call this now so that from now on, this is like any other module.
151local _M = moduleBegin('skang', 'David Seikel', 'Copyright 2014 David Seikel', '0.1', '2014-03-27 02:57:00') 153local _M = moduleBegin('skang', 'David Seikel', 'Copyright 2014 David Seikel', '0.1', '2014-03-27 02:57:00')
152print('Skang loaded, running under Lua version ' .. _VERSION) 154print('Skang is running under Lua version ' .. _VERSION)
153 155
154 156
155csv2table = function (csv) 157csv2table = function (csv)
diff --git a/ClientHamr/GuiLua/test.lua b/ClientHamr/GuiLua/test.lua
index 2115098..3c2e9ab 100644
--- a/ClientHamr/GuiLua/test.lua
+++ b/ClientHamr/GuiLua/test.lua
@@ -49,8 +49,6 @@ local skang = require 'skang'
49local test = require 'test' 49local test = require 'test'
50local test_c = require 'test_c' 50local test_c = require 'test_c'
51 51
52print('MODULE ' .. test._NAME .. ', ' .. test.COPYRIGHT .. ' Version: ' .. test.VERSION .. '\n' .. test.VERSION_DESC .. '\n')
53
54print('foo = ' .. test.foo .. ' ->> ' .. skang.things.foo.help) 52print('foo = ' .. test.foo .. ' ->> ' .. skang.things.foo.help)
55print('End ' .. test.bar .. ' ' .. test.VERSION .. ' ' .. skang.things.ffunc.help .. ' ->> ' .. skang.things.f.action) 53print('End ' .. test.bar .. ' ' .. test.VERSION .. ' ' .. skang.things.ffunc.help .. ' ->> ' .. skang.things.f.action)
56test.ffunc('one', 2) 54test.ffunc('one', 2)