std.zig: update syntax for orelse keyword

andrewrk · andrewrk · commit 0a95b0f1ffeb · 2018-06-10T01:18:31.000-04:00
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -14842,22 +14842,6 @@ static TypeTableEntry *ir_analyze_instruction_unwrap_maybe(IrAnalyze *ira,
     TypeTableEntry *type_entry = ptr_type->data.pointer.child_type;
     if (type_is_invalid(type_entry)) {
         return ira->codegen->builtin_types.entry_invalid;
-    } else if (type_entry->id == TypeTableEntryIdMetaType) {
-        // surprise! actually this is just ??T not an unwrap maybe instruction
-        ConstExprValue *ptr_val = const_ptr_pointee(ira->codegen, &value->value);
-        assert(ptr_val->type->id == TypeTableEntryIdMetaType);
-        TypeTableEntry *child_type = ptr_val->data.x_type;
-
-        type_ensure_zero_bits_known(ira->codegen, child_type);
-        TypeTableEntry *layer1 = get_maybe_type(ira->codegen, child_type);
-        TypeTableEntry *layer2 = get_maybe_type(ira->codegen, layer1);
-
-        IrInstruction *const_instr = ir_build_const_type(&ira->new_irb, unwrap_maybe_instruction->base.scope,
-                unwrap_maybe_instruction->base.source_node, layer2);
-        IrInstruction *result_instr = ir_get_ref(ira, &unwrap_maybe_instruction->base, const_instr,
-                ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile);
-        ir_link_new_instruction(result_instr, &unwrap_maybe_instruction->base);
-        return result_instr->value.type;
     } else if (type_entry->id != TypeTableEntryIdOptional) {
         ir_add_error_node(ira, unwrap_maybe_instruction->value->source_node,
                 buf_sprintf("expected optional type, found '%s'", buf_ptr(&type_entry->name)));
diff --git a/std/zig/parse.zig b/std/zig/parse.zig
@@ -3248,7 +3248,7 @@ fn tokenIdToAssignment(id: *const Token.Id) ?ast.Node.InfixOp.Op {
 fn tokenIdToUnwrapExpr(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {
     return switch (id) {
         Token.Id.Keyword_catch => ast.Node.InfixOp.Op{ .Catch = null },
-        Token.Id.QuestionMarkQuestionMark => ast.Node.InfixOp.Op{ .UnwrapOptional = void{} },
+        Token.Id.Keyword_orelse => ast.Node.InfixOp.Op{ .UnwrapOptional = void{} },
         else => null,
     };
 }
diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig
@@ -1151,7 +1151,7 @@ test "zig fmt: infix operators" {
         \\    _ = i!i;
         \\    _ = i ** i;
         \\    _ = i ++ i;
-        \\    _ = i ?? i;
+        \\    _ = i orelse i;
         \\    _ = i % i;
         \\    _ = i / i;
         \\    _ = i *% i;
diff --git a/std/zig/tokenizer.zig b/std/zig/tokenizer.zig
@@ -39,6 +39,7 @@ pub const Token = struct {
         Keyword{ .bytes = "noalias", .id = Id.Keyword_noalias },
         Keyword{ .bytes = "null", .id = Id.Keyword_null },
         Keyword{ .bytes = "or", .id = Id.Keyword_or },
+        Keyword{ .bytes = "orelse", .id = Id.Keyword_orelse },
         Keyword{ .bytes = "packed", .id = Id.Keyword_packed },
         Keyword{ .bytes = "promise", .id = Id.Keyword_promise },
         Keyword{ .bytes = "pub", .id = Id.Keyword_pub },
@@ -129,7 +130,6 @@ pub const Token = struct {
         Ampersand,
         AmpersandEqual,
         QuestionMark,
-        QuestionMarkQuestionMark,
         AngleBracketLeft,
         AngleBracketLeftEqual,
         AngleBracketAngleBracketLeft,
@@ -171,6 +171,7 @@ pub const Token = struct {
         Keyword_noalias,
         Keyword_null,
         Keyword_or,
+        Keyword_orelse,
         Keyword_packed,
         Keyword_promise,
         Keyword_pub,
@@ -254,7 +255,6 @@ pub const Tokenizer = struct {
         Ampersand,
         Caret,
         Percent,
-        QuestionMark,
         Plus,
         PlusPercent,
         AngleBracketLeft,
@@ -345,6 +345,11 @@ pub const Tokenizer = struct {
                         self.index += 1;
                         break;
                     },
+                    '?' => {
+                        result.id = Token.Id.QuestionMark;
+                        self.index += 1;
+                        break;
+                    },
                     ':' => {
                         result.id = Token.Id.Colon;
                         self.index += 1;
@@ -359,9 +364,6 @@ pub const Tokenizer = struct {
                     '+' => {
                         state = State.Plus;
                     },
-                    '?' => {
-                        state = State.QuestionMark;
-                    },
                     '<' => {
                         state = State.AngleBracketLeft;
                     },
@@ -496,18 +498,6 @@ pub const Tokenizer = struct {
                     },
                 },
 
-                State.QuestionMark => switch (c) {
-                    '?' => {
-                        result.id = Token.Id.QuestionMarkQuestionMark;
-                        self.index += 1;
-                        break;
-                    },
-                    else => {
-                        result.id = Token.Id.QuestionMark;
-                        break;
-                    },
-                },
-
                 State.Percent => switch (c) {
                     '=' => {
                         result.id = Token.Id.PercentEqual;
@@ -1084,9 +1074,6 @@ pub const Tokenizer = struct {
                 State.Plus => {
                     result.id = Token.Id.Plus;
                 },
-                State.QuestionMark => {
-                    result.id = Token.Id.QuestionMark;
-                },
                 State.Percent => {
                     result.id = Token.Id.Percent;
                 },

Original file line number	Diff line number	Diff line change
`@@ -3248,7 +3248,7 @@ fn tokenIdToAssignment(id: *const Token.Id) ?ast.Node.InfixOp.Op {`
`3248`	`3248`	`fn tokenIdToUnwrapExpr(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {`
`3249`	`3249`	`return switch (id) {`
`3250`	`3250`	`Token.Id.Keyword_catch => ast.Node.InfixOp.Op{ .Catch = null },`
`3251`		`- Token.Id.QuestionMarkQuestionMark => ast.Node.InfixOp.Op{ .UnwrapOptional = void{} },`
	`3251`	`+ Token.Id.Keyword_orelse => ast.Node.InfixOp.Op{ .UnwrapOptional = void{} },`
`3252`	`3252`	`else => null,`
`3253`	`3253`	`};`
`3254`	`3254`	`}`