Commit 939bd52c8a389993ab168ec9bb88c4e395045ac7 | zig

author	Jacob G-W <jacoblevgw@gmail.com> 2020-12-25 10:41:48-05:00
committer	Veikka Tuominen <git@vexu.eu> 2020-12-26 02:39:34+02:00
log	939bd52c8a389993ab168ec9bb88c4e395045ac7
tree	94f20e96a43d81959afd533e929a5791e2b46a00
parent	864a5442f1d1a61c29fd6390f4a1c86ce301ceb2

remove '||=' from stage1

It seems depreciated.

6 files changed, 0 insertions(+), 35 deletions(-)

src
- stage1

src/stage1/all_types.hpp-1

...	...	@@ -818,7 +818,6 @@ enum BinOpType {
818	818	BinOpTypeAssignBitAnd,
819	819	BinOpTypeAssignBitXor,
820	820	BinOpTypeAssignBitOr,
821		BinOpTypeAssignMergeErrorSets,
822	821	BinOpTypeBoolOr,
823	822	BinOpTypeBoolAnd,
824	823	BinOpTypeCmpEq,

src/stage1/ast_render.cpp-1

...	...	@@ -49,7 +49,6 @@ static const char *bin_op_str(BinOpType bin_op) {
49	49	case BinOpTypeAssignBitAnd: return "&=";
50	50	case BinOpTypeAssignBitXor: return "^=";
51	51	case BinOpTypeAssignBitOr: return "\|=";
52		case BinOpTypeAssignMergeErrorSets: return "\|\|=";
53	52	case BinOpTypeUnwrapOptional: return "orelse";
54	53	case BinOpTypeArrayCat: return "++";
55	54	case BinOpTypeArrayMult: return "**";

src/stage1/ir.cpp-15

...	...	@@ -5748,19 +5748,6 @@ static IrInstSrc ir_gen_assign(IrBuilderSrc irb, Scope scope, AstNode node)
5748	5748	return ir_build_const_void(irb, scope, node);
5749	5749	}
5750	5750
5751		static IrInstSrc ir_gen_assign_merge_err_sets(IrBuilderSrc irb, Scope scope, AstNode node) {
5752		IrInstSrc *lvalue = ir_gen_node_extra(irb, node->data.bin_op_expr.op1, scope, LValAssign, nullptr);
5753		if (lvalue == irb->codegen->invalid_inst_src)
5754		return lvalue;
5755		IrInstSrc *op1 = ir_build_load_ptr(irb, scope, node->data.bin_op_expr.op1, lvalue);
5756		IrInstSrc *op2 = ir_gen_node(irb, node->data.bin_op_expr.op2, scope);
5757		if (op2 == irb->codegen->invalid_inst_src)
5758		return op2;
5759		IrInstSrc *result = ir_build_merge_err_sets(irb, scope, node, op1, op2, nullptr);
5760		ir_build_store_ptr(irb, scope, node, lvalue, result);
5761		return ir_build_const_void(irb, scope, node);
5762		}
5763
5764	5751	static IrInstSrc ir_gen_assign_op(IrBuilderSrc irb, Scope scope, AstNode node, IrBinOp op_id) {
5765	5752	IrInstSrc *lvalue = ir_gen_node_extra(irb, node->data.bin_op_expr.op1, scope, LValAssign, nullptr);
5766	5753	if (lvalue == irb->codegen->invalid_inst_src)
...	...	@@ -6001,8 +5988,6 @@ static IrInstSrc ir_gen_bin_op(IrBuilderSrc irb, Scope scope, AstNode node,
6001	5988	return ir_lval_wrap(irb, scope, ir_gen_assign_op(irb, scope, node, IrBinOpBinXor), lval, result_loc);
6002	5989	case BinOpTypeAssignBitOr:
6003	5990	return ir_lval_wrap(irb, scope, ir_gen_assign_op(irb, scope, node, IrBinOpBinOr), lval, result_loc);
6004		case BinOpTypeAssignMergeErrorSets:
6005		return ir_lval_wrap(irb, scope, ir_gen_assign_merge_err_sets(irb, scope, node), lval, result_loc);
6006	5991	case BinOpTypeBoolOr:
6007	5992	return ir_lval_wrap(irb, scope, ir_gen_bool_or(irb, scope, node), lval, result_loc);
6008	5993	case BinOpTypeBoolAnd:

src/stage1/parser.cpp-1

...	...	@@ -2460,7 +2460,6 @@ static AstNode ast_parse_assign_op(ParseContext pc) {
2460	2460	// In C, we have `T arr[N] = {[i] = T{}};` but it doesn't
2461	2461	// seem to work in C++...
2462	2462	BinOpType table[TokenIdCount] = {};
2463		table[TokenIdBarBarEq] = BinOpTypeAssignMergeErrorSets;
2464	2463	table[TokenIdBitAndEq] = BinOpTypeAssignBitAnd;
2465	2464	table[TokenIdBitOrEq] = BinOpTypeAssignBitOr;
2466	2465	table[TokenIdBitShiftLeftEq] = BinOpTypeAssignBitShiftLeft;

src/stage1/tokenizer.cpp-16

...	...	@@ -208,7 +208,6 @@ enum TokenizeState {
208	208	TokenizeStateSawAmpersand,
209	209	TokenizeStateSawCaret,
210	210	TokenizeStateSawBar,
211		TokenizeStateSawBarBar,
212	211	TokenizeStateDocComment,
213	212	TokenizeStateContainerDocComment,
214	213	TokenizeStateLineComment,
...	...	@@ -833,19 +832,6 @@ void tokenize(Buf buf, Tokenization out) {
833	832	break;
834	833	case '\|':
835	834	set_token_id(&t, t.cur_tok, TokenIdBarBar);
836		t.state = TokenizeStateSawBarBar;
837		break;
838		default:
839		t.pos -= 1;
840		end_token(&t);
841		t.state = TokenizeStateStart;
842		continue;
843		}
844		break;
845		case TokenizeStateSawBarBar:
846		switch (c) {
847		case '=':
848		set_token_id(&t, t.cur_tok, TokenIdBarBarEq);
849	835	end_token(&t);
850	836	t.state = TokenizeStateStart;
851	837	break;
...	...	@@ -1500,7 +1486,6 @@ void tokenize(Buf buf, Tokenization out) {
1500	1486	case TokenizeStateSawMinusPercent:
1501	1487	case TokenizeStateLineString:
1502	1488	case TokenizeStateLineStringEnd:
1503		case TokenizeStateSawBarBar:
1504	1489	case TokenizeStateDocComment:
1505	1490	case TokenizeStateContainerDocComment:
1506	1491	end_token(&t);
...	...	@@ -1659,7 +1644,6 @@ const char * token_name(TokenId id) {
1659	1644	case TokenIdTimesEq: return "*=";
1660	1645	case TokenIdTimesPercent: return "*%";
1661	1646	case TokenIdTimesPercentEq: return "*%=";
1662		case TokenIdBarBarEq: return "\|\|=";
1663	1647	case TokenIdCount:
1664	1648	zig_unreachable();
1665	1649	}

src/stage1/tokenizer.hpp-1

...	...	@@ -18,7 +18,6 @@ enum TokenId {
18	18	TokenIdAtSign,
19	19	TokenIdBang,
20	20	TokenIdBarBar,
21		TokenIdBarBarEq,
22	21	TokenIdBinOr,
23	22	TokenIdBinXor,
24	23	TokenIdBitAndEq,