aboutsummaryrefslogtreecommitdiff
path: root/src/all_types.hpp
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-02-02 18:13:32 -0500
committerAndrew Kelley <superjoe30@gmail.com>2018-02-02 18:13:32 -0500
commitb8f59e14cdbf90cf724ed9e721c1909293f41b3b (patch)
treeef7a9f2b4534f691e6284b16218c354654abb9e5 /src/all_types.hpp
parent39d5f44863aafa77163b2a7e32f2553a589dbb2c (diff)
downloadzig-b8f59e14cdbf90cf724ed9e721c1909293f41b3b.tar.gz
zig-b8f59e14cdbf90cf724ed9e721c1909293f41b3b.zip
*WIP* error sets - correctly resolve inferred error sets
Diffstat (limited to 'src/all_types.hpp')
-rw-r--r--src/all_types.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/all_types.hpp b/src/all_types.hpp
index 304fa5651a..c94c158046 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -510,8 +510,7 @@ enum BinOpType {
BinOpTypeAssignBitAnd,
BinOpTypeAssignBitXor,
BinOpTypeAssignBitOr,
- BinOpTypeAssignBoolAnd,
- BinOpTypeAssignBoolOr,
+ BinOpTypeAssignMergeErrorSets,
BinOpTypeBoolOr,
BinOpTypeBoolAnd,
BinOpTypeCmpEq,
@@ -537,6 +536,7 @@ enum BinOpType {
BinOpTypeArrayCat,
BinOpTypeArrayMult,
BinOpTypeErrorUnion,
+ BinOpTypeMergeErrorSets,
};
struct AstNodeBinOpExpr {
@@ -2054,6 +2054,7 @@ enum IrBinOp {
IrBinOpRemMod,
IrBinOpArrayCat,
IrBinOpArrayMult,
+ IrBinOpMergeErrorSets,
};
struct IrInstructionBinOp {