Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Fold load_stdlib into the compiler

Browse Source
This commit is contained in:
Kodi Arfer 2018-06-17 09:37:14 -07:00
parent d501b073d8
commit 21f7ef0713
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hy/compiler.py
View File

@ -34,21 +34,6 @@ else:
Inf = float('inf') Inf = float('inf')
_stdlib = {}
def load_stdlib():
import hy.core
if not _stdlib:
for module in hy.core.STDLIB:
mod = importlib.import_module(module)
for e in map(ast_str, mod.EXPORTS):
if getattr(mod, e) is not getattr(builtins, e, ''):
# Don't bother putting a name in _stdlib if it
# points to a builtin with the same name. This
# prevents pointless imports.
_stdlib[e] = module
def ast_str(x, piecewise=False): def ast_str(x, piecewise=False):
if piecewise: if piecewise:
@ -321,6 +306,9 @@ def is_unpack(kind, x):
and x[0] == "unpack-" + kind) and x[0] == "unpack-" + kind)
_stdlib = {}
class HyASTCompiler(object): class HyASTCompiler(object):
def __init__(self, module_name): def __init__(self, module_name):
@ -333,8 +321,17 @@ class HyASTCompiler(object):
or module_name == "hy.core.macros") or module_name == "hy.core.macros")
# Everything in core needs to be explicit (except for # Everything in core needs to be explicit (except for
# the core macros, which are built with the core functions). # the core macros, which are built with the core functions).
if self.can_use_stdlib: if self.can_use_stdlib and not _stdlib:
load_stdlib() # Populate _stdlib.
import hy.core
for module in hy.core.STDLIB:
mod = importlib.import_module(module)
for e in map(ast_str, mod.EXPORTS):
if getattr(mod, e) is not getattr(builtins, e, ''):
# Don't bother putting a name in _stdlib if it
# points to a builtin with the same name. This
# prevents pointless imports.
_stdlib[e] = module
def get_anon_var(self): def get_anon_var(self):
self.anon_var_count += 1 self.anon_var_count += 1