add move queues

+ Returning blocks don't want to show moves for subsequent statements,
  but do want to show them for possible closure callers above.

1 files changed, 21 insertions, 2 deletions

diff --git a/src/lower.c b/src/lower.c
index b683e0b..8d3e4ea 100644
--- a/src/lower.c
+++ b/src/lower.c
@@ -322,6 +322,9 @@ static int lower_mark_moved(struct state *state, struct ast *moves)
 	return 0;
 }
 
+/** @todo this is probably more complicated than it really needs to be, maybe
+ * refactor into lower_checked_call and lower_implicit_call or something for
+ * explicit and implicit error handling cases? */
 static int lower_call(struct state *state, struct ast *call, bool ret)
 {
 	struct ast *err = call_err(call);
@@ -351,12 +354,28 @@ static int lower_call(struct state *state, struct ast *call, bool ret)
 	}
 
 	printf("))");
-	if (err)
-		return lower_err_branch(state, err);
+	if (err) {
+		if (lower_err_branch(state, err))
+			return -1;
+
+		if (ret) {
+			printf("\n");
+			indent(state);
+			printf("return nullptr;\n");
+		}
+
+		return 0;
+	}
 
 	printf("\n");
 	indent(state);
 	printf(" return %s;\n", err_str);
+
+	if (ret) {
+		indent(state);
+		printf("return nullptr;\n");
+	}
+
 	return 0;
 }