Move compiler and reader into lang package (#260)

Author: chrisrink10

src/basilisp/cli.py

@@ -8,11 +8,11 @@
 import click
 import pytest
 
-import basilisp.compiler as compiler
+import basilisp.lang.compiler as compiler
+import basilisp.lang.reader as reader
 import basilisp.lang.runtime as runtime
 import basilisp.lang.symbol as sym
 import basilisp.main as basilisp
-import basilisp.reader as reader
 
 
 @click.group()

src/basilisp/core/__init__.lpy

@@ -1116,7 +1116,7 @@
           attempting to change the root binding of this var will not
           change the default data readers."}
   default-data-readers
-  (.--DATA-READERS basilisp.reader/ReaderContext))
+  (.--DATA-READERS basilisp.lang.reader/ReaderContext))
 
 (def
   ^{:doc     "Data readers map which will be merged in to the default data
@@ -1146,13 +1146,13 @@
   ([s]
    (read-string {:eof :eofthrow} s))
   ([opts s]
-   (first (basilisp.reader/read-str s
-                                    *resolver*
-                                    *data-readers*
-                                    (:eof opts)
-                                    (if (= (:eof opts) :eofthrow)
-                                      true
-                                      false)))))
+   (first (basilisp.lang.reader/read-str s
+                                         *resolver*
+                                         *data-readers*
+                                         (:eof opts)
+                                         (if (= (:eof opts) :eofthrow)
+                                           true
+                                           false)))))
 
 (defn read
   "Read the next form from the stream. If no stream is specified, uses
@@ -1162,36 +1162,36 @@
   data readers used reading this string.
 
   The stream must satisfy the interface of io.TextIOBase, but does not require
-  any pushback capabilities. The default basilisp.reader.StreamReader can wrap
-  any object implementing TextIOBase and provide pushback capabilities."
+  any pushback capabilities. The default basilisp.lang.reader.StreamReader can
+  wrap any object implementing TextIOBase and provide pushback capabilities."
   ([]
    (read *in*))
   ([stream]
    (read stream true nil))
   ([opts stream]
-   (first (basilisp.reader/read stream
-                                *resolver*
-                                *data-readers*
-                                (:eof opts)
-                                (if (= (:eof opts) :eofthrow)
-                                  true
-                                  false))))
+   (first (basilisp.lang.reader/read stream
+                                     *resolver*
+                                     *data-readers*
+                                     (:eof opts)
+                                     (if (= (:eof opts) :eofthrow)
+                                       true
+                                       false))))
   ([stream eof-error? eof-value]
-   (first (basilisp.reader/read stream
-                                *resolver*
-                                *data-readers*
-                                eof-value
-                                eof-error?))))
+   (first (basilisp.lang.reader/read stream
+                                     *resolver*
+                                     *data-readers*
+                                     eof-value
+                                     eof-error?))))
 
 (defn eval
   "Evaluate a form (not a string) and return its result."
   [form]
-  (let [ctx    (basilisp.compiler.CompilerContext.)
+  (let [ctx    (basilisp.lang.compiler.CompilerContext.)
         module (.-module *ns*)]
-    (basilisp.compiler/compile-and-exec-form form
-                                             ctx
-                                             module
-                                             "<Eval Input>")))
+    (basilisp.lang.compiler/compile-and-exec-form form
+                                                  ctx
+                                                  module
+                                                  "<Eval Input>")))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Namespace Utilities ;;

src/basilisp/importer.py

@@ -9,9 +9,9 @@
 from importlib.abc import MetaPathFinder, SourceLoader
 from typing import Optional, List, Dict
 
-import basilisp.compiler as compiler
+import basilisp.lang.compiler as compiler
+import basilisp.lang.reader as reader
 import basilisp.lang.runtime as runtime
-import basilisp.reader as reader
 from basilisp.lang.util import demunge
 from basilisp.util import timed
 

src/basilisp/compiler.py renamed to src/basilisp/lang/compiler.py

@@ -24,13 +24,13 @@
 import basilisp.lang.list as llist
 import basilisp.lang.map as lmap
 import basilisp.lang.meta as lmeta
+import basilisp.lang.reader as reader
 import basilisp.lang.runtime as runtime
 import basilisp.lang.seq as lseq
 import basilisp.lang.set as lset
 import basilisp.lang.symbol as sym
 import basilisp.lang.util
 import basilisp.lang.vector as vec
-import basilisp.reader as reader
 from basilisp.lang.runtime import Var
 from basilisp.lang.typing import LispForm
 from basilisp.lang.util import genname, munge
@@ -77,8 +77,8 @@
 _UNQUOTE_SPLICING = sym.symbol("unquote-splicing", _CORE_NS)
 
 _SYM_CTX_LOCAL_STARRED = kw.keyword(
-    'local-starred', ns='basilisp.compiler.var-context')
-_SYM_CTX_LOCAL = kw.keyword('local', ns='basilisp.compiler.var-context')
+    'local-starred', ns='basilisp.lang.compiler.var-context')
+_SYM_CTX_LOCAL = kw.keyword('local', ns='basilisp.lang.compiler.var-context')
 
 SymbolTableEntry = Tuple[str, kw.Keyword, sym.Symbol]
 

src/basilisp/reader.py renamed to src/basilisp/lang/reader.py

@@ -39,8 +39,8 @@
 LispReaderFn = Callable[["ReaderContext"], LispForm]
 W = TypeVar('W', bound=LispReaderFn)
 
-READER_LINE_KW = keyword.keyword('line', ns='basilisp.reader')
-READER_COL_KW = keyword.keyword('col', ns='basilisp.reader')
+READER_LINE_KW = keyword.keyword('line', ns='basilisp.lang.reader')
+READER_COL_KW = keyword.keyword('col', ns='basilisp.lang.reader')
 
 _AMPERSAND = symbol.symbol("&")
 _FN = symbol.symbol("fn*")
@@ -1063,7 +1063,7 @@ def read_str(s: str,
     """Read the contents of a string as a Lisp expression.
 
     Keyword arguments to this function have the same meanings as those of
-    basilisp.reader.read."""
+    basilisp.lang.reader.read."""
     with io.StringIO(s) as buf:
         yield from read(buf,
                         resolver=resolver,
@@ -1080,7 +1080,7 @@ def read_file(filename: str,
     """Read the contents of a file as a Lisp expression.
 
     Keyword arguments to this function have the same meanings as those of
-    basilisp.reader.read."""
+    basilisp.lang.reader.read."""
     with open(filename) as f:
         yield from read(f,
                         resolver=resolver,

src/basilisp/lang/runtime.py

@@ -238,20 +238,20 @@ class Namespace:
                                               'operator',
                                               'sys',
                                               'basilisp.lang.atom',
+                                              'basilisp.lang.compiler',
                                               'basilisp.lang.delay',
                                               'basilisp.lang.exception',
                                               'basilisp.lang.keyword',
                                               'basilisp.lang.list',
                                               'basilisp.lang.map',
                                               'basilisp.lang.multifn',
+                                              'basilisp.lang.reader',
                                               'basilisp.lang.runtime',
                                               'basilisp.lang.seq',
                                               'basilisp.lang.set',
                                               'basilisp.lang.symbol',
                                               'basilisp.lang.vector',
-                                              'basilisp.lang.util',
-                                              'basilisp.compiler',
-                                              'basilisp.reader'])
+                                              'basilisp.lang.util'])
                                          .map(sym.symbol)
                                          .to_list()))
     GATED_IMPORTS = lset.set(['basilisp.core'])

src/basilisp/test.lpy

@@ -20,7 +20,7 @@
   ([expr]
    `(is ~expr (str "Test failure: " ~expr)))
   ([expr msg]
-   (let [line-no (:basilisp.reader/line (meta &form))
+   (let [line-no (:basilisp.lang.reader/line (meta &form))
 
          eq-sym `=
 

tests/basilisp/compiler_test.py

@@ -9,15 +9,15 @@
 import dateutil.parser as dateparser
 import pytest
 
-import basilisp.compiler as compiler
+import basilisp.lang.compiler as compiler
 import basilisp.lang.keyword as kw
 import basilisp.lang.list as llist
 import basilisp.lang.map as lmap
+import basilisp.lang.reader as reader
 import basilisp.lang.runtime as runtime
 import basilisp.lang.set as lset
 import basilisp.lang.symbol as sym
 import basilisp.lang.vector as vec
-import basilisp.reader as reader
 from basilisp.lang.runtime import Var
 from basilisp.main import init
 from basilisp.util import Maybe

tests/basilisp/reader_test.py

@@ -5,12 +5,12 @@
 import basilisp.lang.keyword as kw
 import basilisp.lang.list as llist
 import basilisp.lang.map as lmap
+import basilisp.lang.reader as reader
 import basilisp.lang.runtime as runtime
 import basilisp.lang.set as lset
 import basilisp.lang.symbol as sym
 import basilisp.lang.util as langutil
 import basilisp.lang.vector as vec
-import basilisp.reader as reader
 
 
 @pytest.fixture