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

Nice-ify errors with hy2py and hyc

Browse Source
This commit is contained in:
Ryan Gonzalez 2015-10-16 15:00:30 -05:00
parent b875feccff
commit d4764dcc2a
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hy/cmdline.py
View File

@ -179,16 +179,18 @@ require("hy.cmdline", "__main__")
SIMPLE_TRACEBACKS = True SIMPLE_TRACEBACKS = True
def run_command(source): def pretty_error(func, *args, **kw):
try: try:
import_buffer_to_module("__main__", source) return func(*args, **kw)
except (HyTypeError, LexException) as e: except (HyTypeError, LexException) as e:
if SIMPLE_TRACEBACKS: if SIMPLE_TRACEBACKS:
sys.stderr.write(str(e)) sys.stderr.write(str(e))
return 1 sys.exit(1)
raise
except Exception:
raise raise
def run_command(source):
pretty_error(import_buffer_to_module, "__main__", source)
return 0 return 0
@ -206,15 +208,7 @@ def run_module(mod_name):
def run_file(filename): def run_file(filename):
from hy.importer import import_file_to_module from hy.importer import import_file_to_module
try: pretty_error(import_file_to_module, "__main__", filename)
import_file_to_module("__main__", filename)
except (HyTypeError, LexException) as e:
if SIMPLE_TRACEBACKS:
sys.stderr.write(str(e))
return 1
raise
except Exception:
raise
return 0 return 0
@ -359,8 +353,8 @@ def hyc_main():
for file in options.files: for file in options.files:
try: try:
write_hy_as_pyc(file)
print("Compiling %s" % file) print("Compiling %s" % file)
pretty_error(write_hy_as_pyc, file)
except IOError as x: except IOError as x:
sys.stderr.write("hyc: Can't open file '%s': [Errno %d] %s\n" % sys.stderr.write("hyc: Can't open file '%s': [Errno %d] %s\n" %
(x.filename, x.errno, x.strerror)) (x.filename, x.errno, x.strerror))
@ -391,7 +385,7 @@ def hy2py_main():
parser.exit(1, parser.format_help()) parser.exit(1, parser.format_help())
if options.with_source: if options.with_source:
hst = import_file_to_hst(options.args[0]) hst = pretty_error(import_file_to_hst, options.args[0])
# need special printing on Windows in case the # need special printing on Windows in case the
# codepage doesn't support utf-8 characters # codepage doesn't support utf-8 characters
if PY3 and platform.system() == "Windows": if PY3 and platform.system() == "Windows":
@ -405,7 +399,7 @@ def hy2py_main():
print() print()
print() print()
_ast = import_file_to_ast(options.args[0], module_name) _ast = pretty_error(import_file_to_ast, options.args[0], module_name)
if options.with_ast: if options.with_ast:
if PY3 and platform.system() == "Windows": if PY3 and platform.system() == "Windows":
_print_for_windows(astor.dump(_ast)) _print_for_windows(astor.dump(_ast))