Intern *compiler-options* so it can be reused on require (#507)

* Intern *compiler-options* so it can be reused on require

* Slightly refactor stuff

* Munge and de-munge compiler options into keywords

* Use keywords rather than strings for compiler options

* Debug log

Author: chrisrink10

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  * Fixed a reader bug where no exception was being thrown splicing reader conditional forms appeared outside of valid splicing contexts (#470)
  * Fixed a bug where fully Namespace-qualified symbols would not resolve if the current Namespace did not alias the referenced Namespace (#479)
  * Fixed a bug where the `quote` special form allowed more than one argument and raised an unintended exception when no argument was provided (#497)
+ * Fixed a bug where compiler options specified via command-line argument or environment variable were not honored by the importer (#???)
 
 ## [v0.1.dev12] - 2020-01-26
 ### Added

src/basilisp/cli.py

@@ -66,51 +66,58 @@ def bootstrap_repl(ctx: compiler.CompilerContext, which_ns: str) -> types.Module
     default=runtime.REPL_DEFAULT_NS,
     help="default namespace to use for the REPL",
 )
-@click.option(
-    "--use-var-indirection",
-    default=False,
-    is_flag=True,
-    envvar="BASILISP_USE_VAR_INDIRECTION",
-    help="if provided, all Var accesses will be performed via Var indirection",
-)
 @click.option(
     "--warn-on-shadowed-name",
-    default=False,
+    default=None,
     is_flag=True,
     envvar="BASILISP_WARN_ON_SHADOWED_NAME",
     help="if provided, emit warnings if a local name is shadowed by another local name",
 )
 @click.option(
     "--warn-on-shadowed-var",
-    default=False,
+    default=None,
     is_flag=True,
     envvar="BASILISP_WARN_ON_SHADOWED_VAR",
     help="if provided, emit warnings if a Var name is shadowed by a local name",
 )
+@click.option(
+    "--warn-on-unused-names",
+    default=None,
+    is_flag=True,
+    envvar="BASILISP_WARN_ON_UNUSED_NAMES",
+    help="if provided, emit warnings if a local name is bound and unused",
+)
+@click.option(
+    "--use-var-indirection",
+    default=None,
+    is_flag=True,
+    envvar="BASILISP_USE_VAR_INDIRECTION",
+    help="if provided, all Var accesses will be performed via Var indirection",
+)
 @click.option(
     "--warn-on-var-indirection",
-    default=True,
+    default=None,
     is_flag=True,
     envvar="BASILISP_WARN_ON_VAR_INDIRECTION",
     help="if provided, emit warnings if a Var reference cannot be direct linked",
 )
-def repl(
+def repl(  # pylint: disable=too-many-arguments,too-many-locals
     default_ns,
-    use_var_indirection,
     warn_on_shadowed_name,
     warn_on_shadowed_var,
+    warn_on_unused_names,
+    use_var_indirection,
     warn_on_var_indirection,
 ):
-    basilisp.init()
-    ctx = compiler.CompilerContext(
-        filename=REPL_INPUT_FILE_PATH,
-        opts={
-            compiler.WARN_ON_SHADOWED_NAME: warn_on_shadowed_name,
-            compiler.WARN_ON_SHADOWED_VAR: warn_on_shadowed_var,
-            compiler.USE_VAR_INDIRECTION: use_var_indirection,
-            compiler.WARN_ON_VAR_INDIRECTION: warn_on_var_indirection,
-        },
+    opts = compiler.compiler_opts(
+        warn_on_shadowed_name=warn_on_shadowed_name,
+        warn_on_shadowed_var=warn_on_shadowed_var,
+        warn_on_unused_names=warn_on_unused_names,
+        use_var_indirection=use_var_indirection,
+        warn_on_var_indirection=warn_on_var_indirection,
     )
+    basilisp.init(opts)
+    ctx = compiler.CompilerContext(filename=REPL_INPUT_FILE_PATH, opts=opts)
     repl_module = bootstrap_repl(ctx, default_ns)
     ns_var = runtime.set_current_ns(default_ns)
     prompter = get_prompter()
@@ -156,30 +163,37 @@ def repl(
 @click.option(
     "--in-ns", default=runtime.REPL_DEFAULT_NS, help="namespace to use for the code"
 )
-@click.option(
-    "--use-var-indirection",
-    default=False,
-    is_flag=True,
-    envvar="BASILISP_USE_VAR_INDIRECTION",
-    help="if provided, all Var accesses will be performed via Var indirection",
-)
 @click.option(
     "--warn-on-shadowed-name",
-    default=False,
+    default=None,
     is_flag=True,
     envvar="BASILISP_WARN_ON_SHADOWED_NAME",
     help="if provided, emit warnings if a local name is shadowed by another local name",
 )
 @click.option(
     "--warn-on-shadowed-var",
-    default=False,
+    default=None,
     is_flag=True,
     envvar="BASILISP_WARN_ON_SHADOWED_VAR",
     help="if provided, emit warnings if a Var name is shadowed by a local name",
 )
+@click.option(
+    "--warn-on-unused-names",
+    default=None,
+    is_flag=True,
+    envvar="BASILISP_WARN_ON_UNUSED_NAMES",
+    help="if provided, emit warnings if a local name is bound and unused",
+)
+@click.option(
+    "--use-var-indirection",
+    default=None,
+    is_flag=True,
+    envvar="BASILISP_USE_VAR_INDIRECTION",
+    help="if provided, all Var accesses will be performed via Var indirection",
+)
 @click.option(
     "--warn-on-var-indirection",
-    default=True,
+    default=None,
     is_flag=True,
     envvar="BASILISP_WARN_ON_VAR_INDIRECTION",
     help="if provided, emit warnings if a Var reference cannot be direct linked",
@@ -188,25 +202,28 @@ def run(  # pylint: disable=too-many-arguments
     file_or_code,
     code,
     in_ns,
-    use_var_indirection,
     warn_on_shadowed_name,
     warn_on_shadowed_var,
+    warn_on_unused_names,
+    use_var_indirection,
     warn_on_var_indirection,
 ):
     """Run a Basilisp script or a line of code, if it is provided."""
-    basilisp.init()
+    opts = compiler.compiler_opts(
+        warn_on_shadowed_name=warn_on_shadowed_name,
+        warn_on_shadowed_var=warn_on_shadowed_var,
+        warn_on_unused_names=warn_on_unused_names,
+        use_var_indirection=use_var_indirection,
+        warn_on_var_indirection=warn_on_var_indirection,
+    )
+    basilisp.init(opts)
     ctx = compiler.CompilerContext(
         filename=CLI_INPUT_FILE_PATH
         if code
         else (
             STDIN_INPUT_FILE_PATH if file_or_code == STDIN_FILE_NAME else file_or_code
         ),
-        opts={
-            compiler.WARN_ON_SHADOWED_NAME: warn_on_shadowed_name,
-            compiler.WARN_ON_SHADOWED_VAR: warn_on_shadowed_var,
-            compiler.USE_VAR_INDIRECTION: use_var_indirection,
-            compiler.WARN_ON_VAR_INDIRECTION: warn_on_var_indirection,
-        },
+        opts=opts,
     )
     eof = object()
 

src/basilisp/importer.py

@@ -252,7 +252,9 @@ def _exec_cached_module(
             )
             compiler.compile_bytecode(
                 cached_code,
-                compiler.GeneratorContext(filename=filename),
+                compiler.GeneratorContext(
+                    filename=filename, opts=runtime.get_compiler_opts()
+                ),
                 compiler.PythonASTOptimizer(),
                 ns,
             )
@@ -288,7 +290,9 @@ def _exec_module(
             )
             compiler.compile_module(  # pylint: disable=unexpected-keyword-arg
                 forms,
-                compiler.CompilerContext(filename=filename),
+                compiler.CompilerContext(
+                    filename=filename, opts=runtime.get_compiler_opts()
+                ),
                 ns,
                 collect_bytecode=all_bytecode.append,
             )

src/basilisp/lang/compiler/__init__.py

@@ -1,11 +1,12 @@
 import itertools
 import os
 import types
-from typing import Any, Callable, Iterable, List, Mapping, Optional
+from typing import Any, Callable, Iterable, List, Optional
 
 from astor import code_gen as codegen
 
 import basilisp._pyast as ast
+import basilisp.lang.map as lmap
 import basilisp.lang.runtime as runtime
 from basilisp.lang.compiler.analyzer import (  # noqa
     WARN_ON_SHADOWED_NAME,
@@ -28,7 +29,7 @@
     statementize as _statementize,
 )
 from basilisp.lang.compiler.optimizer import PythonASTOptimizer
-from basilisp.lang.typing import ReaderForm
+from basilisp.lang.typing import CompilerOpts, ReaderForm
 from basilisp.lang.util import genname
 
 _DEFAULT_FN = "__lisp_expr__"
@@ -40,13 +41,13 @@ def to_py_str(t: ast.AST) -> str:
     return codegen.to_source(t)
 
 
-BytecodeCollector = Optional[Callable[[types.CodeType], None]]
+BytecodeCollector = Callable[[types.CodeType], None]
 
 
 class CompilerContext:
     __slots__ = ("_filename", "_actx", "_gctx", "_optimizer")
 
-    def __init__(self, filename: str, opts: Optional[Mapping[str, bool]] = None):
+    def __init__(self, filename: str, opts: Optional[CompilerOpts] = None):
         self._filename = filename
         self._actx = AnalyzerContext(filename=filename, opts=opts)
         self._gctx = GeneratorContext(filename=filename, opts=opts)
@@ -69,6 +70,27 @@ def py_ast_optimizer(self) -> PythonASTOptimizer:
         return self._optimizer
 
 
+def compiler_opts(
+    warn_on_shadowed_name: Optional[bool] = None,
+    warn_on_shadowed_var: Optional[bool] = None,
+    warn_on_unused_names: Optional[bool] = None,
+    use_var_indirection: Optional[bool] = None,
+    warn_on_var_indirection: Optional[bool] = None,
+) -> CompilerOpts:
+    """Return a map of compiler options with defaults applied."""
+    return lmap.map(
+        {
+            # Analyzer options
+            WARN_ON_SHADOWED_NAME: warn_on_shadowed_name or False,
+            WARN_ON_SHADOWED_VAR: warn_on_shadowed_var or False,
+            WARN_ON_UNUSED_NAMES: warn_on_unused_names or True,
+            # Generator options
+            USE_VAR_INDIRECTION: use_var_indirection or False,
+            WARN_ON_VAR_INDIRECTION: warn_on_var_indirection or True,
+        }
+    )
+
+
 def _emit_ast_string(
     ns: runtime.Namespace, module: ast.AST,
 ) -> None:  # pragma: no cover

src/basilisp/lang/compiler/analyzer.py

@@ -120,17 +120,17 @@
 )
 from basilisp.lang.interfaces import IMeta, IRecord, ISeq, IType, IWithMeta
 from basilisp.lang.runtime import Var
-from basilisp.lang.typing import LispForm, ReaderForm
+from basilisp.lang.typing import CompilerOpts, LispForm, ReaderForm
 from basilisp.lang.util import count, genname, munge
 from basilisp.util import Maybe, partition
 
 # Analyzer logging
 logger = logging.getLogger(__name__)
 
 # Analyzer options
-WARN_ON_SHADOWED_NAME = "warn_on_shadowed_name"
-WARN_ON_SHADOWED_VAR = "warn_on_shadowed_var"
-WARN_ON_UNUSED_NAMES = "warn_on_unused_names"
+WARN_ON_SHADOWED_NAME = kw.keyword("warn-on-shadowed-name")
+WARN_ON_SHADOWED_VAR = kw.keyword("warn-on-shadowed-var")
+WARN_ON_UNUSED_NAMES = kw.keyword("warn-on-unused-names")
 
 # Lisp AST node keywords
 INIT = kw.keyword("init")
@@ -295,7 +295,7 @@ class AnalyzerContext:
     def __init__(
         self,
         filename: Optional[str] = None,
-        opts: Optional[Mapping[str, bool]] = None,
+        opts: Optional[CompilerOpts] = None,
         should_macroexpand: bool = True,
         allow_unresolved_symbols: bool = False,
     ) -> None:

src/basilisp/lang/compiler/generator.py

@@ -99,16 +99,16 @@
     BasilispModule,
     Var,
 )
-from basilisp.lang.typing import LispForm
+from basilisp.lang.typing import CompilerOpts, LispForm
 from basilisp.lang.util import count, genname, munge
 from basilisp.util import Maybe
 
 # Generator logging
 logger = logging.getLogger(__name__)
 
 # Generator options
-USE_VAR_INDIRECTION = "use_var_indirection"
-WARN_ON_VAR_INDIRECTION = "warn_on_var_indirection"
+USE_VAR_INDIRECTION = kw.keyword("use-var-indirection")
+WARN_ON_VAR_INDIRECTION = kw.keyword("warn-on-var-indirection")
 
 # String constants used in generating code
 _DEFAULT_FN = "__lisp_expr__"
@@ -203,7 +203,7 @@ class GeneratorContext:
     )
 
     def __init__(
-        self, filename: Optional[str] = None, opts: Optional[Mapping[str, bool]] = None
+        self, filename: Optional[str] = None, opts: Optional[CompilerOpts] = None
     ) -> None:
         self._filename = Maybe(filename).or_else_get(DEFAULT_COMPILER_FILE_PATH)
         self._opts = Maybe(opts).map(lmap.map).or_else_get(lmap.m())  # type: ignore
@@ -214,7 +214,7 @@ def __init__(
 
         if logger.isEnabledFor(logging.DEBUG):  # pragma: no cover
             for k, v in self._opts:
-                logger.debug("Compiler option %s=%s", k, v)
+                logger.debug("Compiler option %s = %s", k, v)
 
     @property
     def current_ns(self) -> runtime.Namespace: