Skip to content

Commit 3967f44

Browse files
authored
Rename parser to analyzer to reflect its true purpose (#390)
1 parent f6eba09 commit 3967f44

File tree

5 files changed

+234
-226
lines changed

5 files changed

+234
-226
lines changed

src/basilisp/lang/compiler/__init__.py

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
from astor import code_gen as codegen
88

99
import basilisp.lang.runtime as runtime
10+
from basilisp.lang.compiler.analyzer import ( # noqa
11+
AnalyzerContext,
12+
WARN_ON_SHADOWED_NAME,
13+
WARN_ON_SHADOWED_VAR,
14+
WARN_ON_UNUSED_NAMES,
15+
analyze_form,
16+
)
1017
from basilisp.lang.compiler.exception import CompilerException, CompilerPhase # noqa
1118
from basilisp.lang.compiler.generator import ( # noqa
1219
GeneratedPyAST,
@@ -19,13 +26,6 @@
1926
statementize as _statementize,
2027
)
2128
from basilisp.lang.compiler.optimizer import PythonASTOptimizer
22-
from basilisp.lang.compiler.parser import ( # noqa
23-
ParserContext,
24-
WARN_ON_SHADOWED_NAME,
25-
WARN_ON_SHADOWED_VAR,
26-
WARN_ON_UNUSED_NAMES,
27-
parse_ast,
28-
)
2929
from basilisp.lang.typing import ReaderForm
3030
from basilisp.lang.util import genname
3131

@@ -42,25 +42,25 @@ def to_py_str(t: ast.AST) -> str:
4242

4343

4444
class CompilerContext:
45-
__slots__ = ("_filename", "_gctx", "_pctx", "_optimizer")
45+
__slots__ = ("_filename", "_actx", "_gctx", "_optimizer")
4646

4747
def __init__(self, filename: str, opts: Optional[Mapping[str, bool]] = None):
4848
self._filename = filename
49+
self._actx = AnalyzerContext(filename=filename, opts=opts)
4950
self._gctx = GeneratorContext(filename=filename, opts=opts)
50-
self._pctx = ParserContext(filename=filename, opts=opts)
5151
self._optimizer = PythonASTOptimizer()
5252

5353
@property
5454
def filename(self) -> str:
5555
return self._filename
5656

5757
@property
58-
def generator_context(self) -> GeneratorContext:
59-
return self._gctx
58+
def analyzer_context(self) -> AnalyzerContext:
59+
return self._actx
6060

6161
@property
62-
def parser_context(self) -> ParserContext:
63-
return self._pctx
62+
def generator_context(self) -> GeneratorContext:
63+
return self._gctx
6464

6565
@property
6666
def py_ast_optimizer(self) -> PythonASTOptimizer:
@@ -104,7 +104,7 @@ def compile_and_exec_form( # pylint: disable= too-many-arguments
104104

105105
final_wrapped_name = genname(wrapped_fn_name)
106106

107-
lisp_ast = parse_ast(ctx.parser_context, form)
107+
lisp_ast = analyze_form(ctx.analyzer_context, form)
108108
py_ast = gen_py_ast(ctx.generator_context, lisp_ast)
109109
form_ast = list(
110110
map(
@@ -191,7 +191,9 @@ def compile_module(
191191
_bootstrap_module(ctx.generator_context, ctx.py_ast_optimizer, module)
192192

193193
for form in forms:
194-
nodes = gen_py_ast(ctx.generator_context, parse_ast(ctx.parser_context, form))
194+
nodes = gen_py_ast(
195+
ctx.generator_context, analyze_form(ctx.analyzer_context, form)
196+
)
195197
_incremental_compile_module(
196198
ctx.py_ast_optimizer,
197199
nodes,

0 commit comments

Comments
 (0)