Accept namespaces or symbols in Var.intern and Var.find APIs (#499)

Author: chrisrink10

src/basilisp/importer.py

@@ -273,9 +273,9 @@ def _exec_module(
                 f"Loaded Basilisp module '{fullname}' in {duration / 1000000}ms"
             )
         ):
-            # During compilation, bytecode objects are added to the list via the closure
-            # add_bytecode below, which is passed to the compiler. The collected bytecodes
-            # will be used to generate an .lpyc file for caching the compiled file.
+            # During compilation, bytecode objects are added to the list which is
+            # passed to the compiler. The collected bytecodes will be used to generate
+            # an .lpyc file for caching the compiled file.
             all_bytecode: List[types.CodeType] = []
 
             logger.debug(f"Reading and compiling Basilisp module '{fullname}'")

src/basilisp/lang/compiler/analyzer.py

@@ -2484,7 +2484,7 @@ def __resolve_namespaced_symbol_in_ns(  # pylint: disable=too-many-branches
         )
     elif ns_sym in which_ns.aliases:
         aliased_ns: runtime.Namespace = which_ns.aliases[ns_sym]
-        v = Var.find(sym.symbol(form.name, ns=aliased_ns.name))
+        v = Var.find_in_ns(aliased_ns, sym.symbol(form.name))
         if v is None:
             raise AnalyzerException(
                 f"unable to resolve symbol '{sym.symbol(form.name, ns_sym.name)}' in this context",

src/basilisp/lang/compiler/generator.py

@@ -678,7 +678,7 @@ def _def_to_py_ast(  # pylint: disable=too-many-branches
     else:
         def_ast = GeneratedPyAST(node=ast.Constant(None))
 
-    ns_name = ast.Call(func=_NEW_SYM_FN_NAME, args=[_NS_VAR_NAME], keywords=[])
+    ns_name = _load_attr(_NS_VAR_VALUE)
     def_name = ast.Call(
         func=_NEW_SYM_FN_NAME, args=[ast.Constant(defsym.name)], keywords=[]
     )

src/basilisp/lang/runtime.py

@@ -270,28 +270,41 @@ def value(self, v):
 
     @staticmethod
     def intern(
-        ns: sym.Symbol, name: sym.Symbol, val, dynamic: bool = False, meta=None
+        ns: Union["Namespace", sym.Symbol],
+        name: sym.Symbol,
+        val,
+        dynamic: bool = False,
+        meta=None,
     ) -> "Var":
         """Intern the value bound to the symbol `name` in namespace `ns`."""
-        var_ns = Namespace.get_or_create(ns)
-        var = var_ns.intern(name, Var(var_ns, name, dynamic=dynamic, meta=meta))
+        if isinstance(ns, sym.Symbol):
+            ns = Namespace.get_or_create(ns)
+        var = ns.intern(name, Var(ns, name, dynamic=dynamic, meta=meta))
         var.root = val
         return var
 
     @staticmethod
     def intern_unbound(
-        ns: sym.Symbol, name: sym.Symbol, dynamic: bool = False, meta=None
+        ns: Union["Namespace", sym.Symbol],
+        name: sym.Symbol,
+        dynamic: bool = False,
+        meta=None,
     ) -> "Var":
         """Create a new unbound `Var` instance to the symbol `name` in namespace `ns`."""
-        var_ns = Namespace.get_or_create(ns)
-        return var_ns.intern(name, Var(var_ns, name, dynamic=dynamic, meta=meta))
+        if isinstance(ns, sym.Symbol):
+            ns = Namespace.get_or_create(ns)
+        return ns.intern(name, Var(ns, name, dynamic=dynamic, meta=meta))
 
     @staticmethod
-    def find_in_ns(ns_sym: sym.Symbol, name_sym: sym.Symbol) -> "Optional[Var]":
+    def find_in_ns(
+        ns_or_sym: Union["Namespace", sym.Symbol], name_sym: sym.Symbol
+    ) -> "Optional[Var]":
         """Return the value current bound to the name `name_sym` in the namespace
         specified by `ns_sym`."""
-        ns = Namespace.get(ns_sym)
-        if ns:
+        ns = (
+            Namespace.get(ns_or_sym) if isinstance(ns_or_sym, sym.Symbol) else ns_or_sym
+        )
+        if ns is not None:
             return ns.find(name_sym)
         return None
 
@@ -1387,9 +1400,9 @@ def _basilisp_fn(f):
 
 def init_ns_var(which_ns: str = CORE_NS, ns_var_name: str = NS_VAR_NAME) -> Var:
     """Initialize the dynamic `*ns*` variable in the Namespace `which_ns`."""
-    core_sym = sym.Symbol(which_ns)
+    core_sym = sym.symbol(which_ns)
     core_ns = Namespace.get_or_create(core_sym)
-    ns_var = Var.intern(core_sym, sym.Symbol(ns_var_name), core_ns, dynamic=True)
+    ns_var = Var.intern(core_ns, sym.Symbol(ns_var_name), core_ns, dynamic=True)
     logger.debug(f"Created namespace variable {sym.symbol(ns_var_name, ns=which_ns)}")
     return ns_var
 
@@ -1504,7 +1517,7 @@ def add_generated_python(
         which_ns = get_current_ns()
     v = Maybe(which_ns.find(sym.symbol(var_name))).or_else(
         lambda: Var.intern(
-            sym.symbol(which_ns.name),  # type: ignore
+            which_ns,  # type: ignore
             sym.symbol(var_name),
             "",
             dynamic=True,

tests/basilisp/reader_test.py

@@ -22,7 +22,7 @@ def test_ns() -> str:
 
 @pytest.fixture
 def ns(test_ns: str) -> runtime.Namespace:
-    runtime.init_ns_var(which_ns=runtime.CORE_NS)
+    runtime.init_ns_var()
     with runtime.ns_bindings(test_ns) as ns:
         yield ns
 

tests/basilisp/runtime_test.py

@@ -379,7 +379,7 @@ def test_trampoline_args():
 
 @pytest.fixture
 def core_ns():
-    ns_var = runtime.init_ns_var(which_ns=runtime.CORE_NS)
+    ns_var = runtime.init_ns_var()
     yield ns_var.value