kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

catch bad NAT command implementations at runtime

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-09-08 05:00:55 +00:00
parent dfd4807b80
commit 599b39370b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
projects/nat-archive-tool/src/nat/ArchiveController.kiss
View File

@@ -142,8 +142,14 @@
[] []
&mut lastCollector &mut lastCollector
(lambda [] (lambda []
(set lastChangeSet (the ChangeSet (Reflect.callMethod null command.handler collectedArgs))) (let [result (Reflect.callMethod null command.handler collectedArgs)]
(when lastChangeSet (ui.handleChanges archive lastChangeSet)))] (assert !(Prelude.isNull result) "Command implementation forgot to return a ChangeSet")
(set lastChangeSet (the ChangeSet result))
(when lastChangeSet
(doFor e lastChangeSet
(assert (and e (isEntry e)) "Lib function forgot to return the Entry that was modified"))
(ui.handleChanges archive lastChangeSet))))]
// To facilitate asynchronous arg input via UI, we need to construct an insanely complicated nested callback to give the UI // To facilitate asynchronous arg input via UI, we need to construct an insanely complicated nested callback to give the UI
(doFor arg (reverse command.args) (doFor arg (reverse command.args)
(set lastCollector (_composeArgCollector collectedArgs arg stream lastCollector))) (set lastCollector (_composeArgCollector collectedArgs arg stream lastCollector)))

11
projects/nat-archive-tool/src/nat/Lib.kiss
View File

@@ -136,9 +136,16 @@
(if (hasComponent e Connections) (if (hasComponent e Connections)
(withWritableComponents archive e [conn Connections] (withWritableComponents archive e [conn Connections]
(doFor e2 entriesToConnect (dictSet conn e2.id 1))) (doFor e2 entriesToConnect (dictSet conn e2.id 1)))
(addComponent archive e Connections (for e2 entriesToConnect =>e2.id 1)))) (addComponent archive e Connections (for e2 entriesToConnect =>e2.id 1)))
)
(function removeConnections [:nat.Archive archive :nat.Entry e :Array<Entry> entriesToRemove] (function removeConnections [:nat.Archive archive :nat.Entry e :Array<Entry> entriesToRemove]
(when (hasComponent e Connections) (when (hasComponent e Connections)
(withWritableComponents archive e [conn Connections] (withWritableComponents archive e [conn Connections]
(doFor e2 entriesToRemove (conn.remove e2.id))))) (doFor e2 entriesToRemove (conn.remove e2.id))))
e)
(function isEntry [o]
(let [fields (Reflect.fields o)]
(and (= fields.length 3)
(apply and (for f ["id" "components" "files"] (contains fields f))))))