add keys() and values() function to hashmap; add \` to surroundingPairs in language-configuration.json

Author: Spydr06

editors/vscode/language-configuration.json

@@ -21,6 +21,7 @@
         ["[", "]"],
         ["(", ")"],
         ["\"", "\""],
-        ["'", "'"]
+        ["'", "'"],
+        ["`", "`"],
     ]
 }

examples/std/map.csp

@@ -10,6 +10,12 @@ fn main(): i32 {
         hashmap_put!(map, 2, 12); # put value 12 for key 2
         io::printf("%i\n", hashmap_get!(map, 1)); # get value with key 1
 
+        let keys = hashmap_keys!(map);
+        for let i = 0; i < vec::size(keys); i++; {
+            io::printf("%i ", keys[i]);
+        }
+        io::newline();
+
         hashmap_free!(map); # free memory
     }
 

src/std/hashmap.csp

@@ -1,5 +1,6 @@
 import "memory.csp";
 import "algorithm.csp";
+import "vec.csp";
 
 macro hashmap(key_type, val_type) {
     (struct {
@@ -61,10 +62,22 @@ macro hashmap_get(map, _key) {
     )
 }
 
+macro hashmap_keys(map) {
+    (::std::hashmap::keys((map)): &typeof (map).pairs.key)
+}
+
+macro hashmap_values(map) {
+    (::std::hashmap::values((map)): &typeof (map).pairs.val)
+}
+
 macro hashmap_size_mod(map, val) {
     ((val) & ((map).data.alloc / ((map).data.ksize + (map).data.vsize) - 1))
 }
 
+macro hashmap_num_allocated(map) {
+    ((map).data.alloc / ((map).data.ksize + (map).data.vsize))
+}
+
 namespace std {
     namespace hashmap {
         type Data: struct {
@@ -146,7 +159,7 @@ namespace std {
             let index = calc_index(map, key);
 
             # linear probing
-            for 0..(map.data.alloc / map.data.ksize + (map).data.vsize) {
+            for 0..hashmap_num_allocated!(map) {
                 let pair = &map.pairs[index * (map.data.ksize + map.data.vsize)];
 
                 if memory::eq(key, pair, map.data.ksize) || (map.data.use_str_hashing && string::equal(*(key: &&const char), *(pair: &&const char)))
@@ -177,5 +190,27 @@ namespace std {
         fn get(map: &Template, key: &u8): &u8 {
             <- find_pair(map, key, false) |> if $ == nil => $ else $ + (map.data.ksize: u64);
         }
+
+        fn keys(map: &Template): &u8 {
+            let v = vec!{u8};
+
+            for let i: u64 = 0; i < map.data.alloc; i += (map.data.ksize + map.data.vsize); {
+                if !memory::is_zero(&map.pairs[i], map.data.ksize)
+                    memory::copy(vec::__internal_add(&v, map.data.ksize), &map.pairs[i], map.data.ksize);
+            }
+
+            <- v;
+        }
+
+        fn values(map: &Template): &u8 {
+            let v = vec!{u8};
+
+            for let i: u64 = 0; i < map.data.alloc; i += (map.data.ksize + map.data.vsize); {
+                if !memory::is_zero(&map.pairs[i], map.data.ksize)
+                    memory::copy(vec::__internal_add(&v, map.data.vsize), &map.pairs[i] + map.data.ksize, map.data.vsize);
+            }
+
+            <- v;
+        }
     }
 }

src/std/io.csp

@@ -188,6 +188,9 @@ namespace std {
             <- c;
         }
 
+        fn newline()
+            syscall::write(stdout, "\n", 1);
+
         fn close(fd: i32)
         {
             syscall::close(fd); # error handling