e4a7b317e1
* with-decorator: Allow a `setv` form as the form to be decorated This feature is of dubious value by itself, but it's necessary to allow `defn` to create a lambda instead of a `def`. * Make `fn` work the same as `lambda` That is, allow it to generate a `lambda` instead of a `def` statement if the function body is just an expression. I've removed two uses of with_decorator in hy.compiler because they'd require adding another case to HyASTCompiler.compile_decorate_expression and they have no ultimate effect, anyway. In a few tests, I've added a meaningless statement in `fn` bodies to force generation of a `def`. I've removed `test_fn_compiler_empty_function` rather than rewrite it because it seems like a pain to maintain and not very useful. * Remove `lambda`, now that `fn` does the same thing
116 lines
4.6 KiB
Python
116 lines
4.6 KiB
Python
# Copyright (c) 2013 Julien Danjou <julien@danjou.info>
|
|
# Copyright (c) 2013 Nicolas Dandrimont <nicolas.dandrimont@crans.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.
|
|
|
|
import ast
|
|
import sys
|
|
|
|
from hy import compiler
|
|
from hy.models import HyExpression, HyList, HySymbol, HyInteger
|
|
from hy._compat import PY33
|
|
|
|
if sys.version_info[0] <= 2 and sys.version_info[1] <= 6:
|
|
import unittest2 as unittest
|
|
else:
|
|
import unittest
|
|
|
|
|
|
class CompilerTest(unittest.TestCase):
|
|
|
|
def test_builds_with_dash(self):
|
|
self.assert_(callable(compiler.builds("foobar")))
|
|
self.assert_(callable(compiler.builds("foo_bar")))
|
|
self.assert_(callable(compiler.builds("-")))
|
|
self.assertRaisesRegexp(TypeError,
|
|
r"\*post\* translated strings",
|
|
compiler.builds, "foobar-with-dash-")
|
|
|
|
|
|
class HyASTCompilerTest(unittest.TestCase):
|
|
|
|
@staticmethod
|
|
def _make_expression(*args):
|
|
h = HyExpression(args)
|
|
h.start_line = 1
|
|
h.end_line = 1
|
|
h.start_column = 1
|
|
h.end_column = 1
|
|
return h.replace(h)
|
|
|
|
def setUp(self):
|
|
self.c = compiler.HyASTCompiler('test')
|
|
|
|
def test_compiler_bare_names(self):
|
|
"""
|
|
Check that the compiler doesn't drop bare names from code branches
|
|
"""
|
|
ret = self.c.compile(self._make_expression(HySymbol("do"),
|
|
HySymbol("a"),
|
|
HySymbol("b"),
|
|
HySymbol("c")))
|
|
|
|
# We expect two statements and a final expr.
|
|
self.assertEqual(len(ret.stmts), 2)
|
|
stmt = ret.stmts[0]
|
|
self.assertIsInstance(stmt, ast.Expr)
|
|
self.assertIsInstance(stmt.value, ast.Name)
|
|
self.assertEqual(stmt.value.id, "a")
|
|
stmt = ret.stmts[1]
|
|
self.assertIsInstance(stmt, ast.Expr)
|
|
self.assertIsInstance(stmt.value, ast.Name)
|
|
self.assertEqual(stmt.value.id, "b")
|
|
expr = ret.expr
|
|
self.assertIsInstance(expr, ast.Name)
|
|
self.assertEqual(expr.id, "c")
|
|
|
|
def test_compiler_yield_return(self):
|
|
"""
|
|
Check that the compiler correctly generates return statements for
|
|
a generator function. In Python versions prior to 3.3, the return
|
|
statement in a generator can't take a value, so the final expression
|
|
should not generate a return statement. From 3.3 onwards a return
|
|
value should be generated.
|
|
"""
|
|
ret = self.c.compile_function_def(
|
|
self._make_expression(HySymbol("fn"),
|
|
HyList(),
|
|
HyExpression([HySymbol("yield"),
|
|
HyInteger(2)]),
|
|
HyExpression([HySymbol("+"),
|
|
HyInteger(1),
|
|
HyInteger(1)])))
|
|
|
|
self.assertEqual(len(ret.stmts), 1)
|
|
stmt = ret.stmts[0]
|
|
self.assertIsInstance(stmt, ast.FunctionDef)
|
|
body = stmt.body
|
|
self.assertEquals(len(body), 2)
|
|
self.assertIsInstance(body[0], ast.Expr)
|
|
self.assertIsInstance(body[0].value, ast.Yield)
|
|
|
|
if PY33:
|
|
# From 3.3+, the final statement becomes a return value
|
|
self.assertIsInstance(body[1], ast.Return)
|
|
self.assertIsInstance(body[1].value, ast.BinOp)
|
|
else:
|
|
# In earlier versions, the expression is not returned
|
|
self.assertIsInstance(body[1], ast.Expr)
|
|
self.assertIsInstance(body[1].value, ast.BinOp)
|