Add create-ns, find-ns, remove-ns, the-ns

jank-lang · Nov 13, 2023 · f326199 · f326199
1 parent 16be24b
commit f326199
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/include/cpp/jank/runtime/context.hpp b/include/cpp/jank/runtime/context.hpp
@@ -29,11 +29,15 @@ namespace jank::runtime
     void dump() const;
 
     ns_ptr intern_ns(obj::symbol_ptr const &);
+    option<ns_ptr> remove_ns(obj::symbol_ptr const &);
+    option<ns_ptr> find_ns(obj::symbol_ptr const &);
+
+    obj::symbol_ptr qualify_symbol(obj::symbol_ptr const &);
+    option<object_ptr> find_local(obj::symbol_ptr const &);
+
     result<var_ptr, native_string> intern_var(obj::symbol_ptr const &);
     result<var_ptr, native_string> intern_var(native_string const &ns, native_string const &name);
-    obj::symbol_ptr qualify_symbol(obj::symbol_ptr const &);
     option<var_ptr> find_var(obj::symbol_ptr const &);
-    option<object_ptr> find_local(obj::symbol_ptr const &);
 
     obj::keyword_ptr intern_keyword(obj::symbol const &sym, bool const resolved);
     obj::keyword_ptr intern_keyword(native_string_view const &ns, native_string_view const &name, bool resolved);

diff --git a/src/cpp/jank/runtime/context.cpp b/src/cpp/jank/runtime/context.cpp
@@ -329,6 +329,28 @@ namespace jank::runtime
     return result.first->second;
   }
 
+  option<ns_ptr> context::remove_ns(obj::symbol_ptr const &sym)
+  {
+    auto locked_namespaces(namespaces.wlock());
+    auto const found(locked_namespaces->find(sym));
+    if(found != locked_namespaces->end())
+    {
+      auto const ret(found->second);
+      locked_namespaces->erase(found);
+      return ret;
+    }
+    return none;
+  }
+
+  option<ns_ptr> context::find_ns(obj::symbol_ptr const &sym)
+  {
+    auto locked_namespaces(namespaces.rlock());
+    auto const found(locked_namespaces->find(sym));
+    if(found != locked_namespaces->end())
+    { return found->second; }
+    return none;
+  }
+
   result<var_ptr, native_string> context::intern_var
   (native_string const &ns, native_string const &name)
   { return intern_var(make_box<obj::symbol>(ns, name)); }

diff --git a/src/jank/clojure/core.jank b/src/jank/clojure/core.jank
@@ -875,6 +875,33 @@
                                      :unboxed-output? true}}})
 
 ; Namespaces (again).
+(defn create-ns
+  [sym]
+  (assert (symbol? sym))
+  (native/raw "__value = __rt_ctx.intern_ns(expect_object<obj::symbol>(#{ sym }#));"))
+
+(defn find-ns
+  [sym]
+  (assert (symbol? sym))
+  (native/raw "__value = __rt_ctx.find_ns(expect_object<obj::symbol>(#{ sym }#)).unwrap_or(nullptr);
+               if(!__value)
+               { __value = obj::nil::nil_const(); }"))
+
+(defn remove-ns
+  [sym]
+  (assert (symbol? sym))
+  (native/raw "__value = __rt_ctx.remove_ns(expect_object<obj::symbol>(#{ sym }#)).unwrap_or(nullptr);
+               if(!__value)
+               { __value = obj::nil::nil_const(); }"))
+
+(defn the-ns
+  [ns-or-sym]
+  (if (native/raw "__value = make_box(#{ ns-or-sym }#->type == object_type::ns);")
+    ns-or-sym
+    (let [found (find-ns ns-or-sym)]
+      (if (nil? found)
+        (native/raw "throw #{ (ex-info :not-an-ns-or-sym {:value ns-or-sym}) }#;")
+        found))))
 
 ; TODO: Handle multiple paths
 ; TODO: Handle relative paths
@@ -898,4 +925,7 @@
                   __rt_ctx.load_module(s).expect_ok() ;")
       (recur (rest libs)))))
 
+(defn alias [alias ns-sym]
+  "TODO")
+
 (println "Bottom of clojure.core")