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

Merge pull request #897 from farhaven/eval-args-typecheck

Browse Source 
Eval args typecheck
This commit is contained in:
Gregor Best 2015-08-18 11:01:36 +02:00
commit c29737d421
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hy/compiler.py
View File

@ -729,15 +729,11 @@ class HyASTCompiler(object):
elist = [HySymbol("hy_eval")] + [expr[0]] elist = [HySymbol("hy_eval")] + [expr[0]]
if len(expr) >= 2: if len(expr) >= 2:
if not isinstance(expr[1], (HyDict, HySymbol)):
raise HyTypeError(expr, "Globals must be a dictionary")
elist.append(expr[1]) elist.append(expr[1])
else: else:
elist.append(HyExpression([HySymbol("locals")])) elist.append(HyExpression([HySymbol("locals")]))
if len(expr) == 3: if len(expr) == 3:
if not isinstance(expr[2], HyString):
raise HyTypeError(expr, "Module name must be a string")
elist.append(expr[2]) elist.append(expr[2])
else: else:
elist.append(HyString(self.module_name)) elist.append(HyString(self.module_name))

8
hy/importer.py
View File

@ -33,6 +33,7 @@ import os
import __future__ import __future__
from hy._compat import PY3, PY33, MAGIC, builtins, long_type, wr_long from hy._compat import PY3, PY33, MAGIC, builtins, long_type, wr_long
from hy._compat import string_types
def ast_compile(ast, filename, mode): def ast_compile(ast, filename, mode):
@ -108,6 +109,10 @@ def hy_eval(hytree, namespace, module_name):
foo.start_column = 0 foo.start_column = 0
foo.end_column = 0 foo.end_column = 0
replace_hy_obj(hytree, foo) replace_hy_obj(hytree, foo)
if not isinstance(module_name, string_types):
raise HyTypeError(foo, "Module name must be a string")
_ast, expr = hy_compile(hytree, module_name, get_expr=True) _ast, expr = hy_compile(hytree, module_name, get_expr=True)
# Spoof the positions in the generated ast... # Spoof the positions in the generated ast...
@ -119,6 +124,9 @@ def hy_eval(hytree, namespace, module_name):
node.lineno = 1 node.lineno = 1
node.col_offset = 1 node.col_offset = 1
if not isinstance(namespace, dict):
raise HyTypeError(foo, "Globals must be a dictionary")
# Two-step eval: eval() the body of the exec call # Two-step eval: eval() the body of the exec call
eval(ast_compile(_ast, "<eval_body>", "exec"), namespace) eval(ast_compile(_ast, "<eval_body>", "exec"), namespace)

21
tests/native_tests/language.hy
View File

@ -880,18 +880,6 @@
(assert (= None (eval (quote (print "")))))) (assert (= None (eval (quote (print ""))))))
(defmacro assert-raise [exc-type &rest body]
`(try
(do
(eval ~@body)
(assert False "we shouldn't have arrived here"))
(except [e Exception]
(assert (instance? ~exc-type e)
(.format "Expected exception of type {}, got {}: {}"
(. ~exc-type --name--)
(. (type e) --name--)
(str e))))))
(defn test-eval-globals [] (defn test-eval-globals []
"NATIVE: test eval with explicit global dict" "NATIVE: test eval with explicit global dict"
(assert (= 'bar (eval (quote foo) {'foo 'bar}))) (assert (= 'bar (eval (quote foo) {'foo 'bar})))
@ -910,10 +898,11 @@
(defn test-eval-failure [] (defn test-eval-failure []
"NATIVE: test eval failure modes" "NATIVE: test eval failure modes"
(import [hy.errors [HyTypeError]]) (import [hy.errors [HyTypeError]])
(assert-raise HyTypeError '(eval)) ; yo dawg
(assert-raise HyTypeError '(eval "snafu")) (try (eval '(eval)) (except [e HyTypeError]) (else (assert False)))
(assert-raise HyTypeError '(eval 'false [])) (try (eval '(eval "snafu")) (except [e HyTypeError]) (else (assert False)))
(assert-raise HyTypeError '(eval 'false {} 1))) (try (eval 'false []) (except [e HyTypeError]) (else (assert False)))
(try (eval 'false {} 1) (except [e HyTypeError]) (else (assert False))))
(defn test-import-syntax [] (defn test-import-syntax []