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

Fix using deprecated forms in nat-archive-tool

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-07-25 21:10:34 -06:00
parent 872b4861f8
commit ed50d939fa
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/kiss-vscode/config/KissConfig.kiss
View File

@@ -238,7 +238,7 @@
random Std.random
int Std.int)))
(defmacro withValueOrInputBox [v &body body]
(defMacro withValueOrInputBox [v &body body]
`(if ,v
{,@body}
(awaitLet [,v (inputBox)]

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

@@ -107,7 +107,7 @@
(set lastCollector (_composeArgCollector collectedArgs arg lastCollector)))
(lastCollector)))
(defmacro defcommand [name args &body body]
(defMacro defCommand [name args &body body]
(let [argPairs
(groups (expList args) 2)
methodArgs
@@ -134,34 +134,34 @@
&mut :ChangeSet lastChangeSet []
:Map<String,Command> commands (new Map)]
(defcommand selectEntry [e OneEntry]
(defCommand selectEntry [e OneEntry]
(set selectedEntries [e]) [])
(defcommand selectEntries [entries (Entries null null)]
(defCommand selectEntries [entries (Entries null null)]
(set selectedEntries entries) [])
(defcommand selectAllEntries []
(defCommand selectAllEntries []
(set selectedEntries (for =>id e archive.entries e)) [])
(defcommand selectLastChangeSet []
(defCommand selectLastChangeSet []
(set selectedEntries lastChangeSet) [])
(defcommand printSelectedEntries [entries (SelectedEntries null null)]
(defCommand printSelectedEntries [entries (SelectedEntries null null)]
(doFor e entries (ui.displayMessage (archive.fullString e))) [])
(defcommand printComponent [entries (SelectedEntries null null)
(defCommand printComponent [entries (SelectedEntries null null)
componentType (Text null)]
(doFor e entries (ui.displayMessage (archive.componentData e componentType))) [])
(defcommand createEntry [name (Text null)]
(defCommand createEntry [name (Text null)]
[(archive.createEntry ->e
(addComponent archive e Name name))])
(defcommand createEntries [names (VarText null)]
(defCommand createEntries [names (VarText null)]
(flatten (for name names
(createEntry name))))
(defcommand addTags [entries (SelectedEntries 1 null)
(defCommand addTags [entries (SelectedEntries 1 null)
tagsToAdd (VarText null)]
(doFor e entries
(withWritableEntry archive e
@@ -171,7 +171,7 @@
(addComponent archive e Tags (for tag tagsToAdd =>tag 1)))))
entries) // TODO this includes entries that already had the tag in the changeset
(defcommand removeTags [entries (SelectedEntries 1 null)
(defCommand removeTags [entries (SelectedEntries 1 null)
tagsToRemove (VarText null)]
(doFor e entries
(withWritableEntry archive e
@@ -180,8 +180,8 @@
(doFor tag tagsToRemove (tags.remove tag))))))
entries) // TODO this includes entries that didn't have the tag in the changeset
(defcommand selectByTags [tagsBoolExp (Text null)]
(defCommand selectByTags [tagsBoolExp (Text null)]
(selectEntries (filter archive.entries ->e (tagsMatch archive e tagsBoolExp))))
(defcommand selectByComponents [componentsBoolExp (Text null)]
(defCommand selectByComponents [componentsBoolExp (Text null)]
(selectEntries (filter archive.entries ->e (componentsMatch e componentsBoolExp)))))

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

@@ -1,14 +1,16 @@
// Lib is its own class because, while it would make sense to group its functions and macros in Archive.kiss,
// other files would not be able to (load "Archive.kiss") for the macro definitions without taking on Archive's constructor.
(defmacro hasComponent [e componentType]
// External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
(defMacro hasComponent [e componentType]
`(.exists .components ,e ,(symbolName componentType)))
(defmacro _componentPath [archive e componentType]
(defMacro _componentPath [archive e componentType]
`(joinPath .archiveDir (the nat.Archive ,archive) "components" (+ (dictGet (the Map<String,String> .components ,e) ,(symbolName componentType)) ".json")))
// Changes to the object returned by (readComponent) will not be saved! Use (withWritableComponents) for making changes
(defmacro readComponent [archive e componentType]
(defMacro readComponent [archive e componentType]
// TODO add to the documentation a hint that macros should use fully qualified type paths so macro caller classes don't need to import everything
`(the nat.components ,componentType
(tink.Json.parse
@@ -16,14 +18,14 @@
// Components have to be saved individually after writing because the Entity only knows their ids,
// not the data they contain. This is more ergonomically done by using (withWritableComponents...)
(defmacro writeComponent [archive e componentType c]
(defMacro writeComponent [archive e componentType c]
`(sys.io.File.saveContent
(_componentPath ,archive ,e ,componentType)
(tink.Json.stringify
(the nat.components ,componentType ,c))))
// TODO check not overwriting a component
(defmacro addComponent [archive e componentType c]
(defMacro addComponent [archive e componentType c]
`(let [componentId (Uuid.v4)]
(dictSet .components ,e ,(symbolName componentType) componentId)
(writeComponent ,archive ,e ,componentType ,c)
@@ -31,7 +33,7 @@
// Retrieve multiple components from an Entity with mutable access.
// All components will be serialized after the block is done.
(defmacro withWritableComponents [archive e bindings &body body]
(defMacro withWritableComponents [archive e bindings &body body]
(let [bindingPairs
(groups (expList bindings) 2 Throw)
bindingList
@@ -49,7 +51,7 @@
,@saveList
,retValSymbol)))
(defmacro withWritableEntry [archive e &body body]
(defMacro withWritableEntry [archive e &body body]
(let [retValSymbol
(symbol)]
`(let [,retValSymbol {,@body}]
@@ -57,7 +59,7 @@
,retValSymbol)))
// Create a system that selects Entries according to a single string component (i.e. Name or Author) matching the given value
(defmacro stringComponentSystem [archive componentType value process]
(defMacro stringComponentSystem [archive componentType value process]
`(new System
(lambda [archive :Entry e]
?(and (hasComponent e ,componentType)