diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/all_types.hpp | 1 | ||||
| -rw-r--r-- | src/analyze.cpp | 2 | ||||
| -rw-r--r-- | src/ast_render.cpp | 1 | ||||
| -rw-r--r-- | src/ir.cpp | 2 | ||||
| -rw-r--r-- | src/parser.cpp | 1 | ||||
| -rw-r--r-- | src/tokenizer.cpp | 6 | ||||
| -rw-r--r-- | src/tokenizer.hpp | 1 |
7 files changed, 1 insertions, 13 deletions
diff --git a/src/all_types.hpp b/src/all_types.hpp index 50af911092..4388619840 100644 --- a/src/all_types.hpp +++ b/src/all_types.hpp @@ -594,7 +594,6 @@ enum PrefixOp { PrefixOpDereference, PrefixOpMaybe, PrefixOpError, - PrefixOpUnwrapError, PrefixOpUnwrapMaybe, }; diff --git a/src/analyze.cpp b/src/analyze.cpp index 596bced2f1..2c6f0f209e 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -2587,7 +2587,7 @@ TypeTableEntry *get_test_fn_type(CodeGen *g) { return g->test_fn_type; FnTypeId fn_type_id = {0}; - fn_type_id.return_type = g->builtin_types.entry_void; + fn_type_id.return_type = get_error_type(g, g->builtin_types.entry_void); g->test_fn_type = get_fn_type(g, &fn_type_id); return g->test_fn_type; } diff --git a/src/ast_render.cpp b/src/ast_render.cpp index 47da6c8e2f..abe880941c 100644 --- a/src/ast_render.cpp +++ b/src/ast_render.cpp @@ -68,7 +68,6 @@ static const char *prefix_op_str(PrefixOp prefix_op) { case PrefixOpDereference: return "*"; case PrefixOpMaybe: return "?"; case PrefixOpError: return "%"; - case PrefixOpUnwrapError: return "catch"; case PrefixOpUnwrapMaybe: return "??"; } zig_unreachable(); diff --git a/src/ir.cpp b/src/ir.cpp index 826015c4ad..176e5791f8 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -3963,8 +3963,6 @@ static IrInstruction *ir_gen_prefix_op_expr(IrBuilder *irb, Scope *scope, AstNod return ir_lval_wrap(irb, scope, ir_gen_prefix_op_id(irb, scope, node, IrUnOpMaybe), lval); case PrefixOpError: return ir_lval_wrap(irb, scope, ir_gen_prefix_op_id(irb, scope, node, IrUnOpError), lval); - case PrefixOpUnwrapError: - return ir_gen_err_assert_ok(irb, scope, node, node->data.prefix_op_expr.primary_expr, lval); case PrefixOpUnwrapMaybe: return ir_gen_maybe_assert_ok(irb, scope, node, lval); } diff --git a/src/parser.cpp b/src/parser.cpp index 9ee1147729..511936fb30 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -956,7 +956,6 @@ static PrefixOp tok_to_prefix_op(Token *token) { case TokenIdStar: return PrefixOpDereference; case TokenIdMaybe: return PrefixOpMaybe; case TokenIdPercent: return PrefixOpError; - case TokenIdPercentPercent: return PrefixOpUnwrapError; case TokenIdDoubleQuestion: return PrefixOpUnwrapMaybe; case TokenIdStarStar: return PrefixOpDereference; default: return PrefixOpInvalid; diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index cc586e1623..f12f539626 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -816,11 +816,6 @@ void tokenize(Buf *buf, Tokenization *out) { end_token(&t); t.state = TokenizeStateStart; break; - case '%': - set_token_id(&t, t.cur_tok, TokenIdPercentPercent); - end_token(&t); - t.state = TokenizeStateStart; - break; default: t.pos -= 1; end_token(&t); @@ -1564,7 +1559,6 @@ const char * token_name(TokenId id) { case TokenIdNumberSign: return "#"; case TokenIdPercent: return "%"; case TokenIdPercentDot: return "%."; - case TokenIdPercentPercent: return "%%"; case TokenIdPlus: return "+"; case TokenIdPlusEq: return "+="; case TokenIdPlusPercent: return "+%"; diff --git a/src/tokenizer.hpp b/src/tokenizer.hpp index 84a96383d3..43d1309026 100644 --- a/src/tokenizer.hpp +++ b/src/tokenizer.hpp @@ -101,7 +101,6 @@ enum TokenId { TokenIdNumberSign, TokenIdPercent, TokenIdPercentDot, - TokenIdPercentPercent, TokenIdPlus, TokenIdPlusEq, TokenIdPlusPercent, |