Merge branch 'master' into blub/bc3

[xonotic/gmqcc.git] / ast.h

diff --git a/ast.h b/ast.h
index 737f2dcc81ecea5877ce1f4b79fd6ee49757af35..ace081f412a4d433a2f0651ec3babbe036bb842e 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -182,7 +182,6 @@ struct ast_return_s
     ast_expression *operand;
 };
 ast_return* ast_return_new(lex_ctx    ctx,
-                           int        op,
                            ast_expression *expr);
 void ast_return_delete(ast_return*);
 
@@ -362,6 +361,7 @@ struct ast_block_s
 };
 ast_block* ast_block_new(lex_ctx ctx);
 void ast_block_delete(ast_block*);
+bool ast_block_set_type(ast_block*, ast_expression *from);
 
 MEM_VECTOR_PROTO(ast_block, ast_value*, locals);
 MEM_VECTOR_PROTO(ast_block, ast_expression*, exprs);