aboutsummaryrefslogtreecommitdiff
path: root/src/all_types.hpp
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-03-06 18:24:49 -0500
committerAndrew Kelley <superjoe30@gmail.com>2018-03-06 18:31:31 -0500
commiteff3530dfab5ecb4e480e0516ed57a8f564543f5 (patch)
tree6d407f8f334e1910e0ae6ea16190aa9c3e5de016 /src/all_types.hpp
parent44ae891bd79cc8b2f9040a39c176317ebf4a4ef8 (diff)
downloadzig-eff3530dfab5ecb4e480e0516ed57a8f564543f5.tar.gz
zig-eff3530dfab5ecb4e480e0516ed57a8f564543f5.zip
var is no longer a pseudo-type, it is syntax
closes #779
Diffstat (limited to 'src/all_types.hpp')
-rw-r--r--src/all_types.hpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/all_types.hpp b/src/all_types.hpp
index 72ec860556..6f36d34bfd 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -16,6 +16,7 @@
#include "bigint.hpp"
#include "bigfloat.hpp"
#include "target.hpp"
+#include "tokenizer.hpp"
struct AstNode;
struct ImportTableEntry;
@@ -399,7 +400,6 @@ enum NodeType {
NodeTypeStructValueField,
NodeTypeArrayType,
NodeTypeErrorType,
- NodeTypeVarLiteral,
NodeTypeIfErrorExpr,
NodeTypeTestExpr,
NodeTypeErrorSetDecl,
@@ -427,6 +427,7 @@ struct AstNodeFnProto {
Buf *name;
ZigList<AstNode *> params;
AstNode *return_type;
+ Token *return_var_token;
bool is_var_args;
bool is_extern;
bool is_export;
@@ -456,6 +457,7 @@ struct AstNodeFnDecl {
struct AstNodeParamDecl {
Buf *name;
AstNode *type;
+ Token *var_token;
bool is_noalias;
bool is_inline;
bool is_var_args;
@@ -866,9 +868,6 @@ struct AstNodeUnreachableExpr {
struct AstNodeErrorType {
};
-struct AstNodeVarLiteral {
-};
-
struct AstNodeAwaitExpr {
AstNode *expr;
};
@@ -933,7 +932,6 @@ struct AstNode {
AstNodeUnreachableExpr unreachable_expr;
AstNodeArrayType array_type;
AstNodeErrorType error_type;
- AstNodeVarLiteral var_literal;
AstNodeErrorSetDecl err_set_decl;
AstNodeCancelExpr cancel_expr;
AstNodeResumeExpr resume_expr;
@@ -1134,7 +1132,6 @@ struct TypeTableEntryPromise {
enum TypeTableEntryId {
TypeTableEntryIdInvalid,
- TypeTableEntryIdVar,
TypeTableEntryIdMetaType,
TypeTableEntryIdVoid,
TypeTableEntryIdBool,