diff options
Diffstat (limited to '')
-rw-r--r-- | ClientHamr/GuiLua/test.lua | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ClientHamr/GuiLua/test.lua b/ClientHamr/GuiLua/test.lua index 9f98520..aebe4ae 100644 --- a/ClientHamr/GuiLua/test.lua +++ b/ClientHamr/GuiLua/test.lua | |||
@@ -31,12 +31,12 @@ local fool | |||
31 | 31 | ||
32 | -- TODO - Could have a table of tables, and ipair through the top level, passing the inner ones to skang.thing{}. | 32 | -- TODO - Could have a table of tables, and ipair through the top level, passing the inner ones to skang.thing{}. |
33 | 33 | ||
34 | skang.thing('fooble,f', 'Help text goes here', 1, nil, '"edit", "The fooble:", 1, 1, 10, 50', true) | 34 | skang.thingasm('fooble,f', 'Help text goes here', 1, nil, '"edit", "The fooble:", 1, 1, 10, 50', true) |
35 | skang.thing('bar', 'Help text', "Default") | 35 | skang.thingasm('bar', 'Help text', "Default") |
36 | skang.thing('foo') | 36 | skang.thingasm('foo') |
37 | 37 | ||
38 | -- We can use inline functions if we don't need the function internally. | 38 | -- We can use inline functions if we don't need the function internally. |
39 | skang.thing('ffunc', 'Help Text', function (arg1, arg2) | 39 | skang.thingasm('ffunc', 'Help Text', function (arg1, arg2) |
40 | print('Inside test.ffunc(' .. arg1 .. ', ' .. arg2 .. ')') | 40 | print('Inside test.ffunc(' .. arg1 .. ', ' .. arg2 .. ')') |
41 | end, 'number,string') | 41 | end, 'number,string') |
42 | 42 | ||
@@ -100,7 +100,6 @@ test.fooble = 42 | |||
100 | test.fooble = 'Should fail.' | 100 | test.fooble = 'Should fail.' |
101 | test.fooble = 42 | 101 | test.fooble = 42 |
102 | test.fooble = nil | 102 | test.fooble = nil |
103 | test.fooble = nil | ||
104 | test.fooble = 42 | 103 | test.fooble = 42 |
105 | test.fooble = true | 104 | test.fooble = true |
106 | test.f = 42 | 105 | test.f = 42 |
@@ -121,12 +120,12 @@ print('') | |||
121 | local stuff = {} | 120 | local stuff = {} |
122 | stuff.t = {} | 121 | stuff.t = {} |
123 | 122 | ||
124 | skang.thing{'a', module=stuff, help = 'A test stufflet'} | 123 | skang.thingasm{stuff, 'a', help = 'A test stufflet'} |
125 | skang.thing{'b', module=stuff.t, help = 'A sub stufflet'} | 124 | skang.thingasm{stuff.t, 'b', help = 'A sub stufflet'} |
126 | skang.thing{'c', module=stuff.t, help = 'Another sub stufflet'} | 125 | skang.thingasm{stuff.t, 'c', help = 'Another sub stufflet'} |
127 | skang.thing{'s', module=stuff, help = 'A Stuff', types='table'} | 126 | skang.thingasm{stuff, 's', help = 'A Stuff', types='table'} |
128 | skang.thing{'sa,a', module=stuff.s, help = 'A stufflet in a Stuff'} | 127 | stuff.s{'sa,a', help = 'A stufflet in a Stuff'} |
129 | skang.thing{'sb,b', module=stuff.s, help = 'Another stufflet in a Stuff'} | 128 | stuff.s{'sb,b', help = 'Another stufflet in a Stuff'} |
130 | 129 | ||
131 | print('*********************************') | 130 | print('*********************************') |
132 | skang.fixNames(skang, 'skang') | 131 | skang.fixNames(skang, 'skang') |
@@ -142,7 +141,7 @@ print(skang.get(stuff.t, 'c', 'help')) | |||
142 | print(skang.get(stuff, 's', 'help')) | 141 | print(skang.get(stuff, 's', 'help')) |
143 | print(skang.get(stuff.s, 'sa', 'help')) | 142 | print(skang.get(stuff.s, 'sa', 'help')) |
144 | print(skang.get(stuff.s, 'sb', 'help')) | 143 | print(skang.get(stuff.s, 'sb', 'help')) |
145 | skang.thing{'baz,b', module=test, help = 'A test stufflet for test'} | 144 | skang.thingasm{test, 'baz,b', help = 'A test stufflet for test'} |
146 | print(skang.get(test, 'b', 'help')) | 145 | print(skang.get(test, 'b', 'help')) |
147 | print(skang.get(test, 'f', 'help')) | 146 | print(skang.get(test, 'f', 'help')) |
148 | --skang.printTableStart(getmetatable(stuff.s), '', 'stuff.s metatable') | 147 | --skang.printTableStart(getmetatable(stuff.s), '', 'stuff.s metatable') |