!104 get and contains for case-hash-table in (liii scala)

LiiiLabs · Jan 11, 2025 · 587aa78 · 587aa78
1 parent fd63b60
commit 587aa78
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 1 deletion.
diff --git a/goldfish/liii/scala.scm b/goldfish/liii/scala.scm
@@ -263,6 +263,12 @@
          data)
       (case-hash-table r))))
 
+(define (%get k)
+  (option (hash-table-ref/default data k '())))
+
+(define (%contains k)
+  (hash-table-contains? data k))
+
 )
 
 (define (box x)

diff --git a/liii_scala.tmu b/liii_scala.tmu
@@ -497,7 +497,7 @@
     \;
   </scm-chunk>
 
-  <paragraph|case-list%find>
+  <paragraph|case-list%find><typehint|((pred procedure?)) =\<gtr\> option?>
 
   <\scm-chunk|goldfish/liii/scala.scm|true|true>
     \ \ (define (%find pred)
@@ -1077,6 +1077,46 @@
     \ \ \ \ \ \ 
   </goldfish-chunk>
 
+  <paragraph|case-hash-table%get><typehint|((k any?)) =\<gtr\> option?>
+
+  <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
+    (define (%get k)
+
+    \ \ (option (hash-table-ref/default data k '())))
+
+    \;
+  </goldfish-chunk>
+
+  <\goldfish-chunk|tests/goldfish/liii/scala-test.scm|true|true>
+    (let1 ht (box (hash-table 'a 1 'b 2 'c 3))
+
+    \ \ (check ((ht :get 'a) :get) =\<gtr\> 1)
+
+    \ \ (check ((ht :get 'd) :empty?) =\<gtr\> #t))
+
+    \;
+  </goldfish-chunk>
+
+  <paragraph|case-hash-table%contains><typehint|((k any?)) =\<gtr\> boolean?>
+
+  <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
+    (define (%contains k)
+
+    \ \ (hash-table-contains? data k))
+
+    \;
+  </goldfish-chunk>
+
+  <\goldfish-chunk|tests/goldfish/liii/scala-test.scm|true|true>
+    (let1 ht (box (hash-table 'a 1 'b 2 'c 3))
+
+    \ \ (check-true (ht :contains 'a))
+
+    \ \ (check-false (ht :contains 'd)))
+
+    \;
+  </goldfish-chunk>
+
   <\goldfish-chunk|goldfish/liii/scala.scm|true|true>
     )
 

diff --git a/tests/goldfish/liii/scala-test.scm b/tests/goldfish/liii/scala-test.scm
@@ -188,5 +188,13 @@
     (check (r 'b) => 3)
     (check (r 'c) => 4)))
 
+(let1 ht (box (hash-table 'a 1 'b 2 'c 3))
+  (check ((ht :get 'a) :get) => 1)
+  (check ((ht :get 'd) :empty?) => #t))
+
+(let1 ht (box (hash-table 'a 1 'b 2 'c 3))
+  (check-true (ht :contains 'a))
+  (check-false (ht :contains 'd)))
+
 (check-report)