Correctly set node syntax position for deftype members (#523)

* Correctly set node syntax position for deftype members

* Change the log

Author: chrisrink10

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
  * Added support for `future`s (#441)
 
+### Fixed
+ * Fixed a bug where the Basilisp AST nodes for return values of `deftype` members could be marked as _statements_ rather than _expressions_, resulting in an incorrect `nil` return (#523)
+
 ## [v0.1.dev13] - 2020-03-16
 ### Added
  * Added support for Shebang-style line comments (#469)

src/basilisp/lang/compiler/analyzer.py

@@ -933,7 +933,8 @@ def __deftype_classmethod(
 
         params = args[1:]
         has_vargs, param_nodes = __deftype_method_param_bindings(ctx, params)
-        stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
+        with ctx.expr_pos():
+            stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
         method = ClassMethod(
             form=form,
             name=method_name,
@@ -987,7 +988,8 @@ def __deftype_method(
 
         loop_id = genname(method_name)
         with ctx.new_recur_point(loop_id, param_nodes):
-            stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
+            with ctx.expr_pos():
+                stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
             method = Method(
                 form=form,
                 name=method_name,
@@ -1047,7 +1049,8 @@ def __deftype_property(
 
         assert not has_vargs, "deftype* properties may not have arguments"
 
-        stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
+        with ctx.expr_pos():
+            stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
         prop = PropertyMethod(
             form=form,
             name=method_name,
@@ -1077,7 +1080,8 @@ def __deftype_staticmethod(
     """Emit a node for a :staticmethod member of a deftype* form."""
     with ctx.hide_parent_symbol_table(), ctx.new_symbol_table(method_name):
         has_vargs, param_nodes = __deftype_method_param_bindings(ctx, args)
-        stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
+        with ctx.expr_pos():
+            stmts, ret = _body_ast(ctx, runtime.nthrest(form, 2))
         method = StaticMethod(
             form=form,
             name=method_name,
@@ -1432,7 +1436,8 @@ def __fn_method_ast(  # pylint: disable=too-many-branches,too-many-locals
 
         fn_loop_id = genname("fn_arity" if fnname is None else fnname.name)
         with ctx.new_recur_point(fn_loop_id, param_nodes):
-            stmts, ret = _body_ast(ctx, form.rest)
+            with ctx.expr_pos():
+                stmts, ret = _body_ast(ctx, form.rest)
             method = FnMethod(
                 form=form,
                 loop_id=fn_loop_id,

tests/basilisp/compiler_test.py

@@ -868,6 +868,21 @@ def test_deftype_empty_classmethod_body(
             )
             assert None is Point.create()
 
+        def test_deftype_classmethod_returns_value(
+            self, lcompile: CompileFn, class_interface: Var
+        ):
+            Point = lcompile(
+                """
+            (do
+              (def ^:dynamic a nil)
+              (deftype* Point [x]
+                :implements [WithCls]
+                (^:classmethod create [cls x]
+                  (set! a x)))
+              Point)"""
+            )
+            assert kw.keyword("a") is Point.create(kw.keyword("a"))
+
     class TestDefTypeMethod:
         def test_deftype_fields_and_methods(self, lcompile: CompileFn):
             Point = lcompile(
@@ -1009,6 +1024,24 @@ def test_deftype_method_args_are_syms(self, lcompile: CompileFn, code: str):
             with pytest.raises(compiler.CompilerException):
                 lcompile(code)
 
+        def test_deftype_method_returns_value(
+            self, lcompile: CompileFn,
+        ):
+            Point = lcompile(
+                """
+            (import* collections.abc)
+            (do
+              (deftype* Point [^:mutable x]
+                :implements [collections.abc/Callable]
+                (--call-- [this new-val]
+                  (set! x new-val)))
+              Point)"""
+            )
+            pt = Point(1)
+            assert pt.x == 1
+            assert 5 == pt(5)
+            assert pt.x == 5
+
     class TestDefTypeProperty:
         @pytest.fixture
         def property_interface(self, lcompile: CompileFn):
@@ -1111,6 +1144,25 @@ def test_deftype_empty_property_body(
             )
             assert None is Point(1, 2, 3).prop
 
+        def test_deftype_property_returns_value(
+            self, lcompile: CompileFn, property_interface: Var
+        ):
+            Point = lcompile(
+                """
+            (do
+              (deftype* Point [^:mutable x]
+                :implements [WithProp]
+                (^:property prop [this]
+                  (set! x (inc x))))
+              Point)"""
+            )
+            pt = Point(1)
+            assert pt.x == 1
+            assert pt.prop == 2
+            assert pt.x == 2
+            assert pt.prop == 3
+            assert pt.x == 3
+
     class TestDefTypeStaticMethod:
         @pytest.fixture
         def static_interface(self, lcompile: CompileFn):
@@ -1236,6 +1288,21 @@ def test_deftype_empty_staticmethod_body(
             )
             assert None is Point.dostatic("x", "y")
 
+        def test_deftype_staticmethod_returns_value(
+            self, lcompile: CompileFn, static_interface: Var
+        ):
+            Point = lcompile(
+                """
+            (do
+              (def ^:dynamic a nil)
+              (deftype* Point [x]
+                :implements [WithStatic]
+                (^:staticmethod dostatic [x]
+                  (set! a x)))
+              Point)"""
+            )
+            assert kw.keyword("a") is Point.dostatic(kw.keyword("a"))
+
     class TestDefTypeReaderForm:
         def test_ns_does_not_exist(self, lcompile: CompileFn, test_ns: str):
             with pytest.raises(reader.SyntaxError):