Allow creating keywords and symbols from other keywords and symbols (#914)

Fixes #911

Author: chrisrink10

CHANGELOG.md

@@ -14,7 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
  * Fix a bug where `.` characters were not allowed in keyword names (#899)
  * Fix a bug where nested quotation marks were not escaped properly by various print functions and at the REPL (#894)
- * Fixed a bug that caused a syntax error when presenting any filepath that includes the MS-Windows `\` file separator to the cli run command (#912)
+ * Fix a bug that caused a syntax error when presenting any filepath that includes the MS-Windows `\` file separator to the cli run command (#912)
+ * Fix a bug where the core functions `symbol` and `keyword` would not accept non-string data types (#911)
 
 ### Other
  * Update Sphinx documentation theme (#909)

src/basilisp/core.lpy

@@ -508,19 +508,30 @@
    (basilisp.lang.queue/queue coll)))
 
 (defn symbol
-  "Create a new symbol with ``name`` and optional namespace ``ns``."
+  "Create a new symbol with ``name`` and optional namespace ``ns``.
+
+  ``name`` may be keyword, symbol, string, or Var. If ``name`` is a keyword or symbol with a
+  namespace, the namespace will be included in the resulting value. If ``name`` is a Var,
+  the Var's namespace will always be the namespace of the resulting value.
+
+  If ``ns`` is not ``nil``, then both ``name`` and ``ns`` must be strings."
   ([name]
-   (basilisp.lang.symbol/symbol name))
+   (basilisp.lang.runtime/symbol-from-name name))
   ([ns name]
-   (basilisp.lang.symbol/symbol name ns)))
+   (basilisp.lang.runtime/symbol name ns)))
 
 (defn keyword
   "Create a new keyword with ``name`` and optional namespace ``ns``\\. Keywords will
-  have the colon prefix added automatically, so it should not be provided."
+  have the colon prefix added automatically, so it should not be provided.
+
+  ``name`` may be keyword, symbol, or string. If ``name`` is a keyword or symbol with a
+  namespace, the namespace will be included in the resulting value.
+
+  If ``ns`` is not ``nil``, then both ``name`` and ``ns`` must be strings."
   ([name]
-   (basilisp.lang.keyword/keyword name))
+   (basilisp.lang.runtime/keyword-from-name name))
   ([ns name]
-   (basilisp.lang.keyword/keyword name ns)))
+   (basilisp.lang.runtime/keyword name ns)))
 
 (defn name
   "Return the name of a string, symbol, or keyword."

src/basilisp/lang/runtime.py

@@ -26,6 +26,7 @@
     Iterator,
     List,
     Mapping,
+    NoReturn,
     Optional,
     Set,
     Tuple,
@@ -976,6 +977,69 @@ def pop_thread_bindings() -> None:
 T = TypeVar("T")
 
 
+def keyword(name: Any, ns: Any = None) -> kw.Keyword:
+    """Return a new keyword with runtime type checks for name and namespace."""
+    if not isinstance(name, str):
+        raise TypeError(f"Keyword name must be a string, not '{type(name)}'")
+    if not isinstance(ns, (type(None), str)):
+        raise TypeError(f"Keyword namespace must be a string or nil, not '{type(ns)}")
+    return kw.keyword(name, ns)
+
+
+@functools.singledispatch
+def keyword_from_name(o: Any) -> NoReturn:
+    raise TypeError(f"Cannot create keyword from '{type(o)}'")
+
+
+@keyword_from_name.register(kw.Keyword)
+def _keyword_from_name_keyword(o: kw.Keyword) -> kw.Keyword:
+    return o
+
+
+@keyword_from_name.register(sym.Symbol)
+def _keyword_from_name_symbol(o: sym.Symbol) -> kw.Keyword:
+    return kw.keyword(o.name, ns=o.ns)
+
+
+@keyword_from_name.register(str)
+def _keyword_from_name_str(o: str) -> kw.Keyword:
+    return kw.keyword(o)
+
+
+def symbol(name: Any, ns: Any = None) -> sym.Symbol:
+    """Return a new symbol with runtime type checks for name and namespace."""
+    if not isinstance(name, str):
+        raise TypeError(f"Symbol name must be a string, not '{type(name)}'")
+    if not isinstance(ns, (type(None), str)):
+        raise TypeError(f"Symbol namespace must be a string or nil, not '{type(ns)}")
+    return sym.symbol(name, ns)
+
+
+@functools.singledispatch
+def symbol_from_name(o: Any) -> NoReturn:
+    raise TypeError(f"Cannot create symbol from '{type(o)}'")
+
+
+@symbol_from_name.register(kw.Keyword)
+def _symbol_from_name_keyword(o: kw.Keyword) -> sym.Symbol:
+    return sym.symbol(o.name, ns=o.ns)
+
+
+@symbol_from_name.register(sym.Symbol)
+def _symbol_from_name_symbol(o: sym.Symbol) -> sym.Symbol:
+    return o
+
+
+@symbol_from_name.register(str)
+def _symbol_from_name_str(o: str) -> sym.Symbol:
+    return sym.symbol(o)
+
+
+@symbol_from_name.register(Var)
+def _symbol_from_name_var(o: Var) -> sym.Symbol:
+    return sym.symbol(o.name.name, ns=o.ns.name)
+
+
 @functools.singledispatch
 def first(o):
     """If o is a ISeq, return the first element from o. If o is None, return

tests/basilisp/test_core_fns.lpy

@@ -7,6 +7,54 @@
    [basilisp.set :as set]
    [basilisp.test :refer [deftest are is testing]]))
 
+(deftest keyword-test
+  (testing "name only"
+    (are [res name] (= res (keyword name))
+      (keyword "") ""
+      :name        "name"
+      :ns/name     :ns/name
+      :ns/name     'ns/name)
+
+    (are [v] (thrown? python/TypeError (keyword v))
+      nil
+      #'basilisp.core/map))
+
+  (testing "name and namespace"
+    (are [res ns name] (= res (keyword ns name))
+      (keyword "" "") ""          ""
+      :name           nil         "name"
+      :ns/name        "ns"        "name"
+      :dotted.ns/name "dotted.ns" "name")
+
+    (are [ns name] (thrown? python/TypeError (keyword ns name))
+      nil nil
+      :kw :kw
+      'sym 'sym)))
+
+(deftest symbol-test
+  (testing "name only"
+    (are [res name] (= res (symbol name))
+      (symbol "")        ""
+      'name              "name"
+      'ns/name           :ns/name
+      'ns/name           'ns/name
+      'basilisp.core/map #'basilisp.core/map)
+
+    (are [v] (thrown? python/TypeError (symbol v))
+      nil))
+
+  (testing "name and namespace"
+    (are [res ns name] (= res (symbol ns name))
+      (symbol "" "") ""          ""
+      'name           nil         "name"
+      'ns/name        "ns"        "name"
+      'dotted.ns/name "dotted.ns" "name")
+
+    (are [ns name] (thrown? python/TypeError (symbol ns name))
+      nil  nil
+      :kw  :kw
+      'sym 'sym)))
+
 (deftest vary-meta-test
   (testing "with lists"
     (let [l  '(:list)