Update of PR #1217

.github/workflows/build-and-test.yml

@@ -32,3 +32,4 @@ jobs:
     needs: build
     uses: ./.github/workflows/deploy-trigger.yml
     secrets: inherit
+    if: github.event_name != 'pull_request'

.github/workflows/deploy-release.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   deploy:
+    if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
       - name: Trigger pyret-release-update in drydock

src/arr/compiler/libs.arr

@@ -1,5 +1,6 @@
 import base as _
 import essentials2020 as _
+import starter2024 as _
 
 import arrays as _
 import ast as _
@@ -53,3 +54,5 @@ import image-typed as _
 import color as _
 import csv as _
 import charts as _
+
+

src/arr/compiler/type-defaults.arr

@@ -304,7 +304,9 @@ module-const-sets = t-module("builtin://sets",
     "branch", t-arrow([list: t-top, t-number, t-avl, t-avl], t-avl),
     "fold", t-forall([list: tva, tvb], t-arrow([list: t-arrow([list: tvb, tva], tvb), tvb, t-set-app(tva)], tvb)),
     "all", t-forall([list: tva], t-arrow([list: t-arrow([list: tva], t-boolean), t-set-app(tva)], t-boolean)),
-    "any", t-forall([list: tva], t-arrow([list: t-arrow([list: tva], t-boolean), t-set-app(tva)], t-boolean))
+    "any", t-forall([list: tva], t-arrow([list: t-arrow([list: tva], t-boolean), t-set-app(tva)], t-boolean)),
+    "map", t-forall([list: tva, tvb], t-arrow([list: t-set-app(tva), t-arrow([list: tva], tvb)], t-set-app(tvb))),
+    "filter", t-forall([list: tva], t-arrow([list: t-arrow([list: tva], t-boolean), t-set-app(tva)], t-set-app(tva))),
   ]),
   SD.make-string-dict()
     .set("AVLTree", t-data("AVLTree", [list:], [list:], [string-dict:]))

src/arr/trove/sets.arr

@@ -11,6 +11,8 @@ provide:
   set-fold as fold,
   set-all as all,
   set-any as any,
+  set-map as map,
+  set-filter as filter,
   data Set,
   data AVLTree
 end
@@ -375,6 +377,14 @@ data Set:
 
     method any(self, f) -> Boolean:
       self.elems.any(f)
+    end,
+
+    method map(self, f) -> Set:
+      list-to-list-set(self.to-list().map(f))
+    end,
+
+    method filter(self, f) -> Set:
+      list-to-list-set(self.to-list().filter(f))
     end
 
   | tree-set(elems :: AVLTree) with:
@@ -444,6 +454,14 @@ data Set:
 
     method any(self, f) -> Boolean:
       self.elems.any(f)
+    end,
+
+    method map(self, f) -> Set:
+      list-to-tree-set(self.to-list().map(f))
+    end,
+
+    method filter(self, f) -> Set:
+      list-to-tree-set(self.to-list().filter(f))
     end
 
 sharing:
@@ -597,6 +615,14 @@ fun list-to-tree(lst :: List):
   end
 end
 
+fun set-map<T, U>(s :: Set<T>, f :: (T -> U)) -> Set<U>:
+  s.map(f)
+end
+
+fun set-filter<T>(f :: (T -> Boolean), s :: Set<T>) -> Set<T>:
+  s.filter(f)
+end
+
 fun arr-to-list-set(arr :: RawArray) -> Set:
   for raw-array-fold(ls from list-set(empty), elt from arr, _ from 0):
     ls.add(elt)