1 files changed, 10 insertions, 29 deletions

diff --git a/src/ast.c b/src/ast.c
index 427c4c4..73599cb 100644
--- a/src/ast.c
+++ b/src/ast.c
@@ -214,9 +214,6 @@ void ast_dump(int depth, struct ast *n)
 	DUMP(AST_CLOSURE);
 	DUMP(AST_IF);
 	DUMP(AST_NIL);
-	DUMP(AST_OWN);
-	DUMP(AST_ERR_BRANCH);
-	DUMP(AST_ERROR);
 	DUMP(AST_LET);
 	DUMP(AST_INIT);
 	DUMP(AST_CALL);
@@ -299,6 +296,9 @@ struct ast *clone_ast(struct ast *n)
 
 	assert(n->k);
 	struct ast *new = create_empty_ast();
+	if (!new)
+		return NULL;
+
 	new->scope = n->scope;
 	new->loc = n->loc;
 	new->k = n->k;
@@ -574,50 +574,34 @@ void fix_closures(struct ast *root)
 
 		assert(next);
 
-		struct ast *block = gen_block(next, NULL, root->loc);
+		struct ast *block = gen_block(next, root->loc);
 		closure_body(arg) = block;
 		root->n = NULL;
 		root = next;
 	}
 }
 
-static bool special_auto_very_bad(struct type *a, struct type *b)
-{
-	/** @todo massive hack, accept 'auto' as a placeholder and match it
-	 * against anything, will need to be fixed eventually */
-	if (a->k == TYPE_ID && strcmp(a->id, "auto") == 0)
-		return true;
-
-	if (b->k == TYPE_ID && strcmp(b->id, "auto") == 0)
-		return true;
-
-	return false;
-}
-
 bool types_match(struct type *a, struct type *b)
 {
-	if (!a && !b)
-		return true;
-
 	if (a && !b)
 		return false;
 
 	if (!a && b)
 		return false;
 
-	if (special_auto_very_bad(a, b))
-		return true;
-
 	if (a->k != b->k)
 		return false;
 
-	if (a->id && b->id && strcmp(a->id, b->id) != 0)
+	if (!a->t0 && !b->t0)
+		return true;
+
+	if (a->t0 && !b->t0)
 		return false;
 
-	if (!type_lists_match(a->t0, b->t0))
+	if (!a->t0 && b->t0)
 		return false;
 
-	return true;
+	return type_lists_match(a->t0, b->t0);
 }
 
 bool type_lists_match(struct type *al, struct type *bl)
@@ -649,9 +633,6 @@ const char *ast_str(enum ast_kind k)
 	CASE(AST_CLOSURE);
 	CASE(AST_IF);
 	CASE(AST_NIL);
-	CASE(AST_OWN);
-	CASE(AST_ERR_BRANCH);
-	CASE(AST_ERROR);
 	CASE(AST_LET);
 	CASE(AST_INIT);
 	CASE(AST_CALL);