f6160c755a
This version is much simpler. At the point that the exception is raised, we don't have access to the actual source, just the current expression. but as the exception percolates up, we can intercept it, add the source and the re-raise it. Then at the final point, in the cmdline handler, we can choose to let the entire traceback print, or just the simpler, direct error message. And even with the full traceback, the last bit is nicely formatted just like the shorter, simpler message. The error message is colored if clint is installed, but to avoid yet another dependency, you get monochrome without clint. I'm sure there is a better way to do the markup, the current method is kludgy but works. I wish there was more shared code between HyTypeError and LexException but they are kind of different in some fundamental ways. This doesn't work (yet) with runtime errors generated from Python, like NameError, but I have a method that can catch NameError and turn it into a more pleasing output. Finally, there is no obvious way to raise HyTypeError from pure Hy code, so methods in core/language.hy throw ugly TypeError/ValueError.
216 lines
6.4 KiB
Python
216 lines
6.4 KiB
Python
# Copyright (c) 2013 Paul Tagliamonte <paultag@debian.org>
|
|
# Copyright (c) 2013 Bob Tolbert <bob@tolbert.org>
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
# to deal in the Software without restriction, including without limitation
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in
|
|
# all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
# DEALINGS IN THE SOFTWARE.
|
|
|
|
from py_compile import wr_long, MAGIC
|
|
from hy.compiler import hy_compile, HyTypeError
|
|
from hy.models import HyObject
|
|
from hy.lex import tokenize, LexException
|
|
|
|
from io import open
|
|
import marshal
|
|
import imp
|
|
import sys
|
|
import ast
|
|
import os
|
|
import __future__
|
|
|
|
from hy._compat import builtins, long_type
|
|
|
|
|
|
def ast_compile(ast, filename, mode):
|
|
"""Compile AST.
|
|
Like Python's compile, but with some special flags."""
|
|
flags = (__future__.CO_FUTURE_DIVISION |
|
|
__future__.CO_FUTURE_PRINT_FUNCTION)
|
|
return compile(ast, filename, mode, flags)
|
|
|
|
|
|
def import_buffer_to_hst(buf):
|
|
"""Import content from buf and return an Hy AST."""
|
|
return tokenize(buf + "\n")
|
|
|
|
|
|
def import_file_to_hst(fpath):
|
|
"""Import content from fpath and return an Hy AST."""
|
|
with open(fpath, 'r', encoding='utf-8') as f:
|
|
return import_buffer_to_hst(f.read())
|
|
|
|
|
|
def import_buffer_to_ast(buf, module_name):
|
|
""" Import content from buf and return a Python AST."""
|
|
return hy_compile(import_buffer_to_hst(buf), module_name)
|
|
|
|
|
|
def import_file_to_ast(fpath, module_name):
|
|
"""Import content from fpath and return a Python AST."""
|
|
return hy_compile(import_file_to_hst(fpath), module_name)
|
|
|
|
|
|
def import_file_to_module(module_name, fpath):
|
|
"""Import content from fpath and puts it into a Python module.
|
|
|
|
Returns the module."""
|
|
try:
|
|
_ast = import_file_to_ast(fpath, module_name)
|
|
mod = imp.new_module(module_name)
|
|
mod.__file__ = fpath
|
|
eval(ast_compile(_ast, fpath, "exec"), mod.__dict__)
|
|
except (HyTypeError, LexException) as e:
|
|
if e.source is None:
|
|
fp = open(fpath, 'rt')
|
|
e.source = fp.read()
|
|
fp.close()
|
|
e.filename = fpath
|
|
raise
|
|
except Exception:
|
|
sys.modules.pop(module_name, None)
|
|
raise
|
|
return mod
|
|
|
|
|
|
def import_buffer_to_module(module_name, buf):
|
|
try:
|
|
_ast = import_buffer_to_ast(buf, module_name)
|
|
mod = imp.new_module(module_name)
|
|
eval(ast_compile(_ast, "", "exec"), mod.__dict__)
|
|
except (HyTypeError, LexException) as e:
|
|
if e.source is None:
|
|
e.source = buf
|
|
e.filename = '<stdin>'
|
|
raise
|
|
return mod
|
|
|
|
|
|
def hy_eval(hytree, namespace, module_name):
|
|
foo = HyObject()
|
|
foo.start_line = 0
|
|
foo.end_line = 0
|
|
foo.start_column = 0
|
|
foo.end_column = 0
|
|
hytree.replace(foo)
|
|
_ast, expr = hy_compile(hytree, module_name, get_expr=True)
|
|
|
|
# Spoof the positions in the generated ast...
|
|
for node in ast.walk(_ast):
|
|
node.lineno = 1
|
|
node.col_offset = 1
|
|
|
|
for node in ast.walk(expr):
|
|
node.lineno = 1
|
|
node.col_offset = 1
|
|
|
|
# Two-step eval: eval() the body of the exec call
|
|
eval(ast_compile(_ast, "<eval_body>", "exec"), namespace)
|
|
|
|
# Then eval the expression context and return that
|
|
return eval(ast_compile(expr, "<eval>", "eval"), namespace)
|
|
|
|
|
|
def write_hy_as_pyc(fname):
|
|
with open(fname, 'U') as f:
|
|
try:
|
|
st = os.fstat(f.fileno())
|
|
except AttributeError:
|
|
st = os.stat(fname)
|
|
timestamp = long_type(st.st_mtime)
|
|
|
|
_ast = import_file_to_ast(fname,
|
|
os.path.basename(os.path.splitext(fname)[0]))
|
|
code = ast_compile(_ast, fname, "exec")
|
|
cfile = "%s.pyc" % fname[:-len(".hy")]
|
|
|
|
open_ = builtins.open
|
|
|
|
with open_(cfile, 'wb') as fc:
|
|
if sys.version_info[0] >= 3:
|
|
fc.write(b'\0\0\0\0')
|
|
else:
|
|
fc.write('\0\0\0\0')
|
|
wr_long(fc, timestamp)
|
|
if (sys.version_info[0] >= 3 and sys.version_info[1] >= 3):
|
|
wr_long(fc, st.st_size)
|
|
marshal.dump(code, fc)
|
|
fc.flush()
|
|
fc.seek(0, 0)
|
|
fc.write(MAGIC)
|
|
|
|
|
|
class MetaLoader(object):
|
|
def __init__(self, path):
|
|
self.path = path
|
|
|
|
def is_package(self, fullname):
|
|
dirpath = "/".join(fullname.split("."))
|
|
for pth in sys.path:
|
|
pth = os.path.abspath(pth)
|
|
composed_path = "%s/%s/__init__.hy" % (pth, dirpath)
|
|
if os.path.exists(composed_path):
|
|
return True
|
|
return False
|
|
|
|
def load_module(self, fullname):
|
|
if fullname in sys.modules:
|
|
return sys.modules[fullname]
|
|
|
|
if not self.path:
|
|
return
|
|
|
|
sys.modules[fullname] = None
|
|
mod = import_file_to_module(fullname,
|
|
self.path)
|
|
|
|
ispkg = self.is_package(fullname)
|
|
|
|
mod.__file__ = self.path
|
|
mod.__loader__ = self
|
|
mod.__name__ = fullname
|
|
|
|
if ispkg:
|
|
mod.__path__ = []
|
|
mod.__package__ = fullname
|
|
else:
|
|
mod.__package__ = fullname.rpartition('.')[0]
|
|
|
|
sys.modules[fullname] = mod
|
|
return mod
|
|
|
|
|
|
class MetaImporter(object):
|
|
def find_on_path(self, fullname):
|
|
fls = ["%s/__init__.hy", "%s.hy"]
|
|
dirpath = "/".join(fullname.split("."))
|
|
|
|
for pth in sys.path:
|
|
pth = os.path.abspath(pth)
|
|
for fp in fls:
|
|
composed_path = fp % ("%s/%s" % (pth, dirpath))
|
|
if os.path.exists(composed_path):
|
|
return composed_path
|
|
|
|
def find_module(self, fullname, path=None):
|
|
path = self.find_on_path(fullname)
|
|
if path:
|
|
return MetaLoader(path)
|
|
|
|
|
|
sys.meta_path.append(MetaImporter())
|
|
sys.path.insert(0, "")
|