diff options
author | David Walter Seikel | 2014-03-30 09:03:02 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-03-30 09:03:02 +1000 |
commit | b0aa1bd6b016c6f0bc054df19a2b73c95ea27300 (patch) | |
tree | 696b7b7c4a4bc66b503d88cf9fbcd762e3c37918 /ClientHamr/GuiLua/test.lua | |
parent | Add fixNames() to sort out all but lowest level Thing names. (diff) | |
download | SledjHamr-b0aa1bd6b016c6f0bc054df19a2b73c95ea27300.zip SledjHamr-b0aa1bd6b016c6f0bc054df19a2b73c95ea27300.tar.gz SledjHamr-b0aa1bd6b016c6f0bc054df19a2b73c95ea27300.tar.bz2 SledjHamr-b0aa1bd6b016c6f0bc054df19a2b73c95ea27300.tar.xz |
Various fixes, mostly to do with stufflets, which are still slightly broken.
Diffstat (limited to '')
-rw-r--r-- | ClientHamr/GuiLua/test.lua | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/ClientHamr/GuiLua/test.lua b/ClientHamr/GuiLua/test.lua index 73cacee..d74e22c 100644 --- a/ClientHamr/GuiLua/test.lua +++ b/ClientHamr/GuiLua/test.lua | |||
@@ -105,6 +105,7 @@ test.fooble = 42 | |||
105 | test.fooble = true | 105 | test.fooble = true |
106 | test.f = 42 | 106 | test.f = 42 |
107 | test.f = nil | 107 | test.f = nil |
108 | test.bar = 123 | ||
108 | print('') | 109 | print('') |
109 | 110 | ||
110 | skang.set(test, 'f', 'required', false) | 111 | skang.set(test, 'f', 'required', false) |
@@ -123,6 +124,10 @@ stuff.t = {} | |||
123 | skang.thing{'a', module=stuff, help = 'A test stufflet'} | 124 | skang.thing{'a', module=stuff, help = 'A test stufflet'} |
124 | skang.thing{'b', module=stuff.t, help = 'A sub stufflet'} | 125 | skang.thing{'b', module=stuff.t, help = 'A sub stufflet'} |
125 | skang.thing{'c', module=stuff.t, help = 'Another sub stufflet'} | 126 | skang.thing{'c', module=stuff.t, help = 'Another sub stufflet'} |
127 | skang.thing{'s', module=stuff, help = 'A Stuff', types='table'} | ||
128 | skang.thing{'sa', module=stuff.s, help = 'A stufflet in a Stuff'} | ||
129 | skang.thing{'sb', module=stuff.s, help = 'Another stufflet in a Stuff'} | ||
130 | |||
126 | print('*********************************') | 131 | print('*********************************') |
127 | skang.fixNames(skang, 'skang') | 132 | skang.fixNames(skang, 'skang') |
128 | skang.fixNames(test, 'test') | 133 | skang.fixNames(test, 'test') |
@@ -134,10 +139,14 @@ print('*********************************') | |||
134 | print(skang.get(stuff, 'a', 'help')) | 139 | print(skang.get(stuff, 'a', 'help')) |
135 | print(skang.get(stuff.t, 'b', 'help')) | 140 | print(skang.get(stuff.t, 'b', 'help')) |
136 | print(skang.get(stuff.t, 'c', 'help')) | 141 | print(skang.get(stuff.t, 'c', 'help')) |
142 | print(skang.get(stuff, 's', 'help')) | ||
143 | print(skang.get(stuff.s, 'sa,a', 'help')) | ||
144 | print(skang.get(stuff.s, 'sb,b', 'help')) | ||
137 | skang.thing{'baz,b', module=test, help = 'A test stufflet for test'} | 145 | skang.thing{'baz,b', module=test, help = 'A test stufflet for test'} |
138 | print(skang.get(test, 'b', 'help')) | 146 | print(skang.get(test, 'b', 'help')) |
139 | print(skang.get(test, 'f', 'help')) | 147 | print(skang.get(test, 'f', 'help')) |
140 | stuff.a = '1' | 148 | -- Should fail isValid() |
149 | stuff.a = 1 | ||
141 | stuff.t.b = '2' | 150 | stuff.t.b = '2' |
142 | stuff.t.c = '3' | 151 | stuff.t.c = '3' |
143 | test.b = '422222' | 152 | test.b = '422222' |
@@ -145,6 +154,14 @@ test.f = 5 | |||
145 | test_c.cbar = '666' | 154 | test_c.cbar = '666' |
146 | -- This one doesn't actually exist. | 155 | -- This one doesn't actually exist. |
147 | test_c.bar = '7' | 156 | test_c.bar = '7' |
157 | -- The sa should fail isValid() | ||
158 | stuff.s.sa = true | ||
159 | stuff.s.sb = 22 | ||
160 | -- TODO - This one should fail, but doesn't. It goes through to the real stuff.s table. | ||
161 | stuff.s.b = 33 | ||
162 | -- TODO - And the 'a' one just gets dropped. | ||
163 | stuff.s = {a=8, sb='9'} | ||
164 | stuff.s.sb = 44 | ||
148 | print('') | 165 | print('') |
149 | 166 | ||
150 | print(skang.get(stuff, 'a')) | 167 | print(skang.get(stuff, 'a')) |
@@ -156,6 +173,9 @@ print(skang.get(test, 'f')) | |||
156 | print(skang.get(test, 'fooble')) | 173 | print(skang.get(test, 'fooble')) |
157 | print(skang.get(test_c, 'cbar')) | 174 | print(skang.get(test_c, 'cbar')) |
158 | print(skang.get(test_c, 'bar')) | 175 | print(skang.get(test_c, 'bar')) |
176 | print(type(skang.get(stuff, 's'))) | ||
177 | print(skang.get(stuff.s, 'sa')) | ||
178 | print(skang.get(stuff.s, 'sb')) | ||
159 | print('') | 179 | print('') |
160 | 180 | ||
161 | print(stuff.a) | 181 | print(stuff.a) |
@@ -169,3 +189,6 @@ print(test_c.cbar) | |||
169 | print(test_c.bar) | 189 | print(test_c.bar) |
170 | print(test_c.c) | 190 | print(test_c.c) |
171 | print(test_c.cfooble) | 191 | print(test_c.cfooble) |
192 | print(stuff.s.sa) | ||
193 | print(stuff.s.sb) | ||
194 | skang.printTableStart(stuff.s, '', 'stuff.s') | ||