Commit ec1b6f66737f8c3cbc0420715c2c502c7e710081 | zig

build.zig+1-1

...	@@ -75,7 +75,7 @@ pub fn build(b: *Builder) !void {	...	@@ -75,7 +75,7 @@ pub fn build(b: *Builder) !void {
75	cxx_compiler,	75	cxx_compiler,
76	"-print-file-name=libstdc++.a",	76	"-print-file-name=libstdc++.a",
77	});	77	});
78	const libstdcxx_path = ??mem.split(libstdcxx_path_padded, "\r\n").next();	78	const libstdcxx_path = mem.split(libstdcxx_path_padded, "\r\n").next().?;
79	if (mem.eql(u8, libstdcxx_path, "libstdc++.a")) {	79	if (mem.eql(u8, libstdcxx_path, "libstdc++.a")) {
80	warn(	80	warn(
81	\\Unable to determine path to libstdc++.a	81	\\Unable to determine path to libstdc++.a

doc/codegen.md+4-4

...	@@ -6,7 +6,7 @@ Every type has a "handle". If a type is a simple primitive type such as i32 or	...	@@ -6,7 +6,7 @@ Every type has a "handle". If a type is a simple primitive type such as i32 or
6	f64, the handle is "by value", meaning that we pass around the value itself when	6	f64, the handle is "by value", meaning that we pass around the value itself when
7	we refer to a value of that type.	7	we refer to a value of that type.
8		8
9	If a type is a container, error union, maybe type, slice, or array, then its	9	If a type is a container, error union, optional type, slice, or array, then its
10	handle is a pointer, and everywhere we refer to a value of this type we refer to	10	handle is a pointer, and everywhere we refer to a value of this type we refer to
11	a pointer.	11	a pointer.
12		12
...	@@ -19,7 +19,7 @@ Error union types are represented as:	...	@@ -19,7 +19,7 @@ Error union types are represented as:
19	payload: T,	19	payload: T,
20	}	20	}
21		21
22	Maybe types are represented as:	22	Optional types are represented as:
23		23
24	struct {	24	struct {
25	payload: T,	25	payload: T,
...	@@ -28,6 +28,6 @@ Maybe types are represented as:	...	@@ -28,6 +28,6 @@ Maybe types are represented as:
28		28
29	## Data Optimizations	29	## Data Optimizations
30		30
31	Maybe pointer types are special: the 0x0 pointer value is used to represent a	31	Optional pointer types are special: the 0x0 pointer value is used to represent a
32	null pointer. Thus, instead of the struct above, maybe pointer types are	32	null pointer. Thus, instead of the struct above, optional pointer types are
33	represented as a `usize` in codegen and the handle is by value.	33	represented as a `usize` in codegen and the handle is by value.

doc/langref.html.in+60-62

 @@ -156,18 +156,18 @@ pub fn main() void {
         true or false,
         !true);
-    // nullable
+    // optional
-    var nullable_value: ?[]const u8 = null;
+    var optional_value: ?[]const u8 = null;
-    assert(nullable_value == null);
+    assert(optional_value == null);
-    warn("\nnullable 1\ntype: {}\nvalue: {}\n",
+    warn("\noptional 1\ntype: {}\nvalue: {}\n",
-        @typeName(@typeOf(nullable_value)), nullable_value);
+        @typeName(@typeOf(optional_value)), optional_value);
-    nullable_value = "hi";
+    optional_value = "hi";
-    assert(nullable_value != null);
+    assert(optional_value != null);
-    warn("\nnullable 2\ntype: {}\nvalue: {}\n",
+    warn("\noptional 2\ntype: {}\nvalue: {}\n",
-        @typeName(@typeOf(nullable_value)), nullable_value);
+        @typeName(@typeOf(optional_value)), optional_value);
     // error union
     var number_or_error: error!i32 = error.ArgNotFound;
 @@ -428,7 +428,7 @@ pub fn main() void {
         </tr>
         <tr>
           <td><code>null</code></td>
-          <td>used to set a nullable type to <code>null</code></td>
+          <td>used to set an optional type to <code>null</code></td>
         </tr>
         <tr>
           <td><code>undefined</code></td>
 @@ -440,7 +440,7 @@ pub fn main() void {
         </tr>
       </table>
       </div>
-      {#see_also|Nullables|this#}
+      {#see_also|Optionals|this#}
       {#header_close#}
       {#header_open|String Literals#}
       {#code_begin|test#}
 @@ -988,7 +988,7 @@ a ^= b</code></pre></td>
           <td><pre><code class="zig">a ?? b</code></pre></td>
           <td>
             <ul>
-              <li>{#link|Nullables#}</li>
+              <li>{#link|Optionals#}</li>
             </ul>
           </td>
           <td>If <code>a</code> is <code>null</code>,
 @@ -1003,10 +1003,10 @@ unwrapped == 1234</code></pre>
           </td>
         </tr>
         <tr>
-          <td><pre><code class="zig">??a</code></pre></td>
+          <td><pre><code class="zig">a.?</code></pre></td>
           <td>
             <ul>
-              <li>{#link|Nullables#}</li>
+              <li>{#link|Optionals#}</li>
             </ul>
           </td>
           <td>
 @@ -1015,7 +1015,7 @@ unwrapped == 1234</code></pre>
           </td>
           <td>
             <pre><code class="zig">const value: ?u32 = 5678;
-??value == 5678</code></pre>
+value.? == 5678</code></pre>
           </td>
         </tr>
         <tr>
 @@ -1103,7 +1103,7 @@ unwrapped == 1234</code></pre>
           <td><pre><code class="zig">a == null<code></pre></td>
           <td>
             <ul>
-              <li>{#link|Nullables#}</li>
+              <li>{#link|Optionals#}</li>
             </ul>
           </td>
           <td>
 @@ -1267,8 +1267,8 @@ x.* == 1234</code></pre>
       {#header_open|Precedence#}
       <pre><code>x() x[] x.y
 a!b
-!x -x -%x ~x &amp;x ?x ??x
+!x -x -%x ~x &amp;x ?x
-x{} x.*
+x{} x.* x.?
 ! * / % ** *%
 + - ++ +% -%
 &lt;&lt; &gt;&gt;
 @@ -1483,17 +1483,17 @@ test "volatile" {
     assert(@typeOf(mmio_ptr) == *volatile u8);
 }
-test "nullable pointers" {
+test "optional pointers" {
-    // Pointers cannot be null. If you want a null pointer, use the nullable
+    // Pointers cannot be null. If you want a null pointer, use the optional
-    // prefix `?` to make the pointer type nullable.
+    // prefix `?` to make the pointer type optional.
     var ptr: ?*i32 = null;
     var x: i32 = 1;
     ptr = &x;
-    assert((??ptr).* == 1);
+    assert(ptr.?.* == 1);
-    // Nullable pointers are the same size as normal pointers, because pointer
+    // Optional pointers are the same size as normal pointers, because pointer
     // value 0 is used as the null value.
     assert(@sizeOf(?*i32) == @sizeOf(*i32));
 }
 @@ -1832,7 +1832,7 @@ test "linked list" {
         .last = &node,
         .len = 1,
     };
-    assert((??list2.first).data == 1234);
+    assert(list2.first.?.data == 1234);
 }
       {#code_end#}
       {#see_also|comptime|@fieldParentPtr#}
 @@ -2270,7 +2270,7 @@ fn rangeHasNumber(begin: usize, end: usize, number: usize) bool {
 }
 test "while null capture" {
-    // Just like if expressions, while loops can take a nullable as the
+    // Just like if expressions, while loops can take an optional as the
     // condition and capture the payload. When null is encountered the loop
     // exits.
     var sum1: u32 = 0;
 @@ -2280,7 +2280,7 @@ test "while null capture" {
     }
     assert(sum1 == 3);
-    // The else branch is allowed on nullable iteration. In this case, it will
+    // The else branch is allowed on optional iteration. In this case, it will
     // be executed on the first null value encountered.
     var sum2: u32 = 0;
     numbers_left = 3;
 @@ -2340,7 +2340,7 @@ fn typeNameLength(comptime T: type) usize {
     return @typeName(T).len;
 }
       {#code_end#}
-      {#see_also|if|Nullables|Errors|comptime|unreachable#}
+      {#see_also|if|Optionals|Errors|comptime|unreachable#}
       {#header_close#}
       {#header_open|for#}
       {#code_begin|test|for#}
 @@ -2400,7 +2400,7 @@ test "for else" {
         if (value == null) {
             break 9;
         } else {
-            sum += ??value;
+            sum += value.?;
         }
     } else blk: {
         assert(sum == 7);
 @@ -2461,7 +2461,7 @@ test "if boolean" {
     assert(result == 47);
 }
-test "if nullable" {
+test "if optional" {
     // If expressions test for null.
     const a: ?u32 = 0;
 @@ -2544,7 +2544,7 @@ test "if error union" {
     }
 }
       {#code_end#}
-      {#see_also|Nullables|Errors#}
+      {#see_also|Optionals|Errors#}
       {#header_close#}
       {#header_open|defer#}
       {#code_begin|test|defer#}
 @@ -3167,24 +3167,24 @@ test "inferred error set" {
       <p>TODO</p>
       {#header_close#}
       {#header_close#}
-      {#header_open|Nullables#}
+      {#header_open|Optionals#}
       <p>
       One area that Zig provides safety without compromising efficiency or
-      readability is with the nullable type.
+      readability is with the optional type.
       </p>
       <p>
-      The question mark symbolizes the nullable type. You can convert a type to a nullable
+      The question mark symbolizes the optional type. You can convert a type to an optional
       type by putting a question mark in front of it, like this:
       </p>
       {#code_begin|syntax#}
 // normal integer
 const normal_int: i32 = 1234;
-// nullable integer
+// optional integer
-const nullable_int: ?i32 = 5678;
+const optional_int: ?i32 = 5678;
       {#code_end#}
       <p>
-      Now the variable <code>nullable_int</code> could be an <code>i32</code>, or <code>null</code>.
+      Now the variable <code>optional_int</code> could be an <code>i32</code>, or <code>null</code>.
       </p>
       <p>
       Instead of integers, let's talk about pointers. Null references are the source of many runtime
 @@ -3193,8 +3193,8 @@ const nullable_int: ?i32 = 5678;
       </p>
       <p>Zig does not have them.</p>
       <p>
-      Instead, you can use a nullable pointer. This secretly compiles down to a normal pointer,
+      Instead, you can use an optional pointer. This secretly compiles down to a normal pointer,
-      since we know we can use 0 as the null value for the nullable type. But the compiler
+      since we know we can use 0 as the null value for the optional type. But the compiler
       can check your work and make sure you don't assign null to something that can't be null.
       </p>
       <p>
 @@ -3226,7 +3226,7 @@ fn doAThing() ?*Foo {
       <p>
         Here, Zig is at least as convenient, if not more, than C. And, the type of "ptr"
         is <code>*u8</code> <em>not</em> <code>?*u8</code>. The <code>??</code> operator
-        unwrapped the nullable type and therefore <code>ptr</code> is guaranteed to be non-null everywhere
+        unwrapped the optional type and therefore <code>ptr</code> is guaranteed to be non-null everywhere
         it is used in the function.
       </p>
       <p>
 @@ -3245,10 +3245,10 @@ fn doAThing() ?*Foo {
         In Zig you can accomplish the same thing:
       </p>
       {#code_begin|syntax#}
-fn doAThing(nullable_foo: ?*Foo) void {
+fn doAThing(optional_foo: ?*Foo) void {
     // do some stuff
-    if (nullable_foo) |foo| {
+    if (optional_foo) |foo| {
       doSomethingWithFoo(foo);
     }
 @@ -3257,7 +3257,7 @@ fn doAThing(nullable_foo: ?*Foo) void {
       {#code_end#}
       <p>
       Once again, the notable thing here is that inside the if block,
-      <code>foo</code> is no longer a nullable pointer, it is a pointer, which
+      <code>foo</code> is no longer an optional pointer, it is a pointer, which
       cannot be null.
       </p>
       <p>
 @@ -3267,20 +3267,20 @@ fn doAThing(nullable_foo: ?*Foo) void {
       The optimizer can sometimes make better decisions knowing that pointer arguments
       cannot be null.
       </p>
-      {#header_open|Nullable Type#}
+      {#header_open|Optional Type#}
-      <p>A nullable is created by putting <code>?</code> in front of a type. You can use compile-time
+      <p>An optional is created by putting <code>?</code> in front of a type. You can use compile-time
-      reflection to access the child type of a nullable:</p>
+      reflection to access the child type of an optional:</p>
       {#code_begin|test#}
 const assert = @import("std").debug.assert;
-test "nullable type" {
+test "optional type" {
-    // Declare a nullable and implicitly cast from null:
+    // Declare an optional and implicitly cast from null:
     var foo: ?i32 = null;
-    // Implicitly cast from child type of a nullable
+    // Implicitly cast from child type of an optional
     foo = 1234;
-    // Use compile-time reflection to access the child type of the nullable:
+    // Use compile-time reflection to access the child type of the optional:
     comptime assert(@typeOf(foo).Child == i32);
 }
       {#code_end#}
 @@ -4888,7 +4888,7 @@ pub const TypeId = enum {
     ComptimeInt,
     Undefined,
     Null,
-    Nullable,
+    Optional,
     ErrorUnion,
     Error,
     Enum,
 @@ -4922,7 +4922,7 @@ pub const TypeInfo = union(TypeId) {
     ComptimeInt: void,
     Undefined: void,
     Null: void,
-    Nullable: Nullable,
+    Optional: Optional,
     ErrorUnion: ErrorUnion,
     ErrorSet: ErrorSet,
     Enum: Enum,
 @@ -4975,7 +4975,7 @@ pub const TypeInfo = union(TypeId) {
         defs: []Definition,
     };
-    pub const Nullable = struct {
+    pub const Optional = struct {
         child: type,
     };
 @@ -5366,8 +5366,8 @@ comptime {
       <p>At compile-time:</p>
       {#code_begin|test_err|unable to unwrap null#}
 comptime {
-    const nullable_number: ?i32 = null;
+    const optional_number: ?i32 = null;
-    const number = ??nullable_number;
+    const number = optional_number.?;
 }
       {#code_end#}
       <p>At runtime crashes with the message <code>attempt to unwrap null</code> and a stack trace.</p>
 @@ -5376,9 +5376,9 @@ comptime {
       {#code_begin|exe|test#}
 const warn = @import("std").debug.warn;
 pub fn main() void {
-    const nullable_number: ?i32 = null;
+    const optional_number: ?i32 = null;
-    if (nullable_number) |number| {
+    if (optional_number) |number| {
         warn("got number: {}\n", number);
     } else {
         warn("it's null\n");
 @@ -5939,9 +5939,9 @@ AsmInputItem = "[" Symbol "]" String "(" Expression ")"
 AsmClobbers= ":" list(String, ",")
-UnwrapExpression = BoolOrExpression (UnwrapNullable | UnwrapError) | BoolOrExpression
+UnwrapExpression = BoolOrExpression (UnwrapOptional | UnwrapError) | BoolOrExpression
-UnwrapNullable = "??" Expression
+UnwrapOptional = "??" Expression
 UnwrapError = "catch" option("|" Symbol "|") Expression
 @@ -6015,12 +6015,10 @@ MultiplyOperator = "||" | "*" | "/" | "%" | "**" | "*%"
 PrefixOpExpression = PrefixOp TypeExpr | SuffixOpExpression
-SuffixOpExpression = ("async" option("&lt;" SuffixOpExpression "&gt;") SuffixOpExpression FnCallExpression) | PrimaryExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | SliceExpression | PtrDerefExpression)
+SuffixOpExpression = ("async" option("&lt;" SuffixOpExpression "&gt;") SuffixOpExpression FnCallExpression) | PrimaryExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | SliceExpression | ".*" | ".?")
 FieldAccessExpression = "." Symbol
-PtrDerefExpression = ".*"
 FnCallExpression = "(" list(Expression, ",") ")"
 ArrayAccessExpression = "[" Expression "]"
 @@ -6033,7 +6031,7 @@ ContainerInitBody = list(StructLiteralField, ",") | list(Expression, ",")
 StructLiteralField = "." Symbol "=" Expression
-PrefixOp = "!" | "-" | "~" | (("*" | "[*]") option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) | "?" | "??" | "-%" | "try" | "await"
+PrefixOp = "!" | "-" | "~" | (("*" | "[*]") option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) | "?" | "-%" | "try" | "await"
 PrimaryExpression = Integer | Float | String | CharLiteral | KeywordLiteral | GroupedExpression | BlockExpression(BlockOrExpression) | Symbol | ("@" Symbol FnCallExpression) | ArrayType | FnProto | AsmExpression | ContainerDecl | ("continue" option(":" Symbol)) | ErrorSetDecl | PromiseType

example/cat/main.zig+1-1

...	@@ -7,7 +7,7 @@ const allocator = std.debug.global_allocator;	...	@@ -7,7 +7,7 @@ const allocator = std.debug.global_allocator;
7		7
8	pub fn main() !void {	8	pub fn main() !void {
9	var args_it = os.args();	9	var args_it = os.args();
10	const exe = try unwrapArg(??args_it.next(allocator));	10	const exe = try unwrapArg(args_it.next(allocator).?);
11	var catted_anything = false;	11	var catted_anything = false;
12	var stdout_file = try io.getStdOut();	12	var stdout_file = try io.getStdOut();
13		13

src-self-hosted/arg.zig+5-5

src-self-hosted/llvm.zig+1-1

...	@@ -8,6 +8,6 @@ pub const ContextRef = removeNullability(c.LLVMContextRef);	...	@@ -8,6 +8,6 @@ pub const ContextRef = removeNullability(c.LLVMContextRef);
8	pub const BuilderRef = removeNullability(c.LLVMBuilderRef);	8	pub const BuilderRef = removeNullability(c.LLVMBuilderRef);
9		9
10	fn removeNullability(comptime T: type) type {	10	fn removeNullability(comptime T: type) type {
11	comptime assert(@typeId(T) == builtin.TypeId.Nullable);	11	comptime assert(@typeId(T) == builtin.TypeId.Optional);
12	return T.Child;	12	return T.Child;
13	}	13	}

src-self-hosted/main.zig+4-4

src/all_types.hpp+22-22

...	@@ -145,8 +145,8 @@ enum ConstPtrSpecial {	...	@@ -145,8 +145,8 @@ enum ConstPtrSpecial {
145	// emit a binary with a compile time known address.	145	// emit a binary with a compile time known address.
146	// In this case index is the numeric address value.	146	// In this case index is the numeric address value.
147	// We also use this for null pointer. We need the data layout for ConstCastOnly == true	147	// We also use this for null pointer. We need the data layout for ConstCastOnly == true
148	// types to be the same, so all nullables of pointer types use x_ptr	148	// types to be the same, so all optionals of pointer types use x_ptr
149	// instead of x_nullable	149	// instead of x_optional
150	ConstPtrSpecialHardCodedAddr,	150	ConstPtrSpecialHardCodedAddr,
151	// This means that the pointer represents memory of assigning to _.	151	// This means that the pointer represents memory of assigning to _.
152	// That is, storing discards the data, and loading is invalid.	152	// That is, storing discards the data, and loading is invalid.
...	@@ -222,10 +222,10 @@ enum RuntimeHintErrorUnion {	...	@@ -222,10 +222,10 @@ enum RuntimeHintErrorUnion {
222	RuntimeHintErrorUnionNonError,	222	RuntimeHintErrorUnionNonError,
223	};	223	};
224		224
225	enum RuntimeHintMaybe {	225	enum RuntimeHintOptional {
226	RuntimeHintMaybeUnknown,	226	RuntimeHintOptionalUnknown,
227	RuntimeHintMaybeNull, // TODO is this value even possible? if this is the case it might mean the const value is compile time known.	227	RuntimeHintOptionalNull, // TODO is this value even possible? if this is the case it might mean the const value is compile time known.
228	RuntimeHintMaybeNonNull,	228	RuntimeHintOptionalNonNull,
229	};	229	};
230		230
231	enum RuntimeHintPtr {	231	enum RuntimeHintPtr {
...	@@ -254,7 +254,7 @@ struct ConstExprValue {	...	@@ -254,7 +254,7 @@ struct ConstExprValue {
254	bool x_bool;	254	bool x_bool;
255	ConstBoundFnValue x_bound_fn;	255	ConstBoundFnValue x_bound_fn;
256	TypeTableEntry *x_type;	256	TypeTableEntry *x_type;
257	ConstExprValue *x_nullable;	257	ConstExprValue *x_optional;
258	ConstErrValue x_err_union;	258	ConstErrValue x_err_union;
259	ErrorTableEntry *x_err_set;	259	ErrorTableEntry *x_err_set;
260	BigInt x_enum_tag;	260	BigInt x_enum_tag;
...	@@ -268,7 +268,7 @@ struct ConstExprValue {	...	@@ -268,7 +268,7 @@ struct ConstExprValue {
268		268
269	// populated if special == ConstValSpecialRuntime	269	// populated if special == ConstValSpecialRuntime
270	RuntimeHintErrorUnion rh_error_union;	270	RuntimeHintErrorUnion rh_error_union;
271	RuntimeHintMaybe rh_maybe;	271	RuntimeHintOptional rh_maybe;
272	RuntimeHintPtr rh_ptr;	272	RuntimeHintPtr rh_ptr;
273	} data;	273	} data;
274	};	274	};
...	@@ -556,7 +556,7 @@ enum BinOpType {	...	@@ -556,7 +556,7 @@ enum BinOpType {
556	BinOpTypeMultWrap,	556	BinOpTypeMultWrap,
557	BinOpTypeDiv,	557	BinOpTypeDiv,
558	BinOpTypeMod,	558	BinOpTypeMod,
559	BinOpTypeUnwrapMaybe,	559	BinOpTypeUnwrapOptional,
560	BinOpTypeArrayCat,	560	BinOpTypeArrayCat,
561	BinOpTypeArrayMult,	561	BinOpTypeArrayMult,
562	BinOpTypeErrorUnion,	562	BinOpTypeErrorUnion,
...	@@ -623,8 +623,8 @@ enum PrefixOp {	...	@@ -623,8 +623,8 @@ enum PrefixOp {
623	PrefixOpBinNot,	623	PrefixOpBinNot,
624	PrefixOpNegation,	624	PrefixOpNegation,
625	PrefixOpNegationWrap,	625	PrefixOpNegationWrap,
626	PrefixOpMaybe,	626	PrefixOpOptional,
627	PrefixOpUnwrapMaybe,	627	PrefixOpUnwrapOptional,
628	PrefixOpAddrOf,	628	PrefixOpAddrOf,
629	};	629	};
630		630
...	@@ -1052,7 +1052,7 @@ struct TypeTableEntryStruct {	...	@@ -1052,7 +1052,7 @@ struct TypeTableEntryStruct {
1052	HashMap<Buf , TypeStructField , buf_hash, buf_eql_buf> fields_by_name;	1052	HashMap<Buf , TypeStructField , buf_hash, buf_eql_buf> fields_by_name;
1053	};	1053	};
1054		1054
1055	struct TypeTableEntryMaybe {	1055	struct TypeTableEntryOptional {
1056	TypeTableEntry *child_type;	1056	TypeTableEntry *child_type;
1057	};	1057	};
1058		1058
...	@@ -1175,7 +1175,7 @@ enum TypeTableEntryId {	...	@@ -1175,7 +1175,7 @@ enum TypeTableEntryId {
1175	TypeTableEntryIdComptimeInt,	1175	TypeTableEntryIdComptimeInt,
1176	TypeTableEntryIdUndefined,	1176	TypeTableEntryIdUndefined,
1177	TypeTableEntryIdNull,	1177	TypeTableEntryIdNull,
1178	TypeTableEntryIdMaybe,	1178	TypeTableEntryIdOptional,
1179	TypeTableEntryIdErrorUnion,	1179	TypeTableEntryIdErrorUnion,
1180	TypeTableEntryIdErrorSet,	1180	TypeTableEntryIdErrorSet,
1181	TypeTableEntryIdEnum,	1181	TypeTableEntryIdEnum,
...	@@ -1206,7 +1206,7 @@ struct TypeTableEntry {	...	@@ -1206,7 +1206,7 @@ struct TypeTableEntry {
1206	TypeTableEntryFloat floating;	1206	TypeTableEntryFloat floating;
1207	TypeTableEntryArray array;	1207	TypeTableEntryArray array;
1208	TypeTableEntryStruct structure;	1208	TypeTableEntryStruct structure;
1209	TypeTableEntryMaybe maybe;	1209	TypeTableEntryOptional maybe;
1210	TypeTableEntryErrorUnion error_union;	1210	TypeTableEntryErrorUnion error_union;
1211	TypeTableEntryErrorSet error_set;	1211	TypeTableEntryErrorSet error_set;
1212	TypeTableEntryEnum enumeration;	1212	TypeTableEntryEnum enumeration;
...	@@ -1402,7 +1402,7 @@ enum PanicMsgId {	...	@@ -1402,7 +1402,7 @@ enum PanicMsgId {
1402	PanicMsgIdRemainderDivisionByZero,	1402	PanicMsgIdRemainderDivisionByZero,
1403	PanicMsgIdExactDivisionRemainder,	1403	PanicMsgIdExactDivisionRemainder,
1404	PanicMsgIdSliceWidenRemainder,	1404	PanicMsgIdSliceWidenRemainder,
1405	PanicMsgIdUnwrapMaybeFail,	1405	PanicMsgIdUnwrapOptionalFail,
1406	PanicMsgIdInvalidErrorCode,	1406	PanicMsgIdInvalidErrorCode,
1407	PanicMsgIdIncorrectAlignment,	1407	PanicMsgIdIncorrectAlignment,
1408	PanicMsgIdBadUnionField,	1408	PanicMsgIdBadUnionField,
...	@@ -2016,8 +2016,8 @@ enum IrInstructionId {	...	@@ -2016,8 +2016,8 @@ enum IrInstructionId {
2016	IrInstructionIdAsm,	2016	IrInstructionIdAsm,
2017	IrInstructionIdSizeOf,	2017	IrInstructionIdSizeOf,
2018	IrInstructionIdTestNonNull,	2018	IrInstructionIdTestNonNull,
2019	IrInstructionIdUnwrapMaybe,	2019	IrInstructionIdUnwrapOptional,
2020	IrInstructionIdMaybeWrap,	2020	IrInstructionIdOptionalWrap,
2021	IrInstructionIdUnionTag,	2021	IrInstructionIdUnionTag,
2022	IrInstructionIdClz,	2022	IrInstructionIdClz,
2023	IrInstructionIdCtz,	2023	IrInstructionIdCtz,
...	@@ -2184,7 +2184,7 @@ enum IrUnOp {	...	@@ -2184,7 +2184,7 @@ enum IrUnOp {
2184	IrUnOpNegation,	2184	IrUnOpNegation,
2185	IrUnOpNegationWrap,	2185	IrUnOpNegationWrap,
2186	IrUnOpDereference,	2186	IrUnOpDereference,
2187	IrUnOpMaybe,	2187	IrUnOpOptional,
2188	};	2188	};
2189		2189
2190	struct IrInstructionUnOp {	2190	struct IrInstructionUnOp {
...	@@ -2487,7 +2487,7 @@ struct IrInstructionTestNonNull {	...	@@ -2487,7 +2487,7 @@ struct IrInstructionTestNonNull {
2487	IrInstruction *value;	2487	IrInstruction *value;
2488	};	2488	};
2489		2489
2490	struct IrInstructionUnwrapMaybe {	2490	struct IrInstructionUnwrapOptional {
2491	IrInstruction base;	2491	IrInstruction base;
2492		2492
2493	IrInstruction *value;	2493	IrInstruction *value;
...	@@ -2745,7 +2745,7 @@ struct IrInstructionUnwrapErrPayload {	...	@@ -2745,7 +2745,7 @@ struct IrInstructionUnwrapErrPayload {
2745	bool safety_check_on;	2745	bool safety_check_on;
2746	};	2746	};
2747		2747
2748	struct IrInstructionMaybeWrap {	2748	struct IrInstructionOptionalWrap {
2749	IrInstruction base;	2749	IrInstruction base;
2750		2750
2751	IrInstruction *value;	2751	IrInstruction *value;
...	@@ -2954,10 +2954,10 @@ struct IrInstructionExport {	...	@@ -2954,10 +2954,10 @@ struct IrInstructionExport {
2954	struct IrInstructionErrorReturnTrace {	2954	struct IrInstructionErrorReturnTrace {
2955	IrInstruction base;	2955	IrInstruction base;
2956		2956
2957	enum Nullable {	2957	enum Optional {
2958	Null,	2958	Null,
2959	NonNull,	2959	NonNull,
2960	} nullable;	2960	} optional;
2961	};	2961	};
2962		2962
2963	struct IrInstructionErrorUnion {	2963	struct IrInstructionErrorUnion {

src/analyze.cpp+35-35

...	@@ -236,7 +236,7 @@ bool type_is_complete(TypeTableEntry *type_entry) {	...	@@ -236,7 +236,7 @@ bool type_is_complete(TypeTableEntry *type_entry) {
236	case TypeTableEntryIdComptimeInt:	236	case TypeTableEntryIdComptimeInt:
237	case TypeTableEntryIdUndefined:	237	case TypeTableEntryIdUndefined:
238	case TypeTableEntryIdNull:	238	case TypeTableEntryIdNull:
239	case TypeTableEntryIdMaybe:	239	case TypeTableEntryIdOptional:
240	case TypeTableEntryIdErrorUnion:	240	case TypeTableEntryIdErrorUnion:
241	case TypeTableEntryIdErrorSet:	241	case TypeTableEntryIdErrorSet:
242	case TypeTableEntryIdFn:	242	case TypeTableEntryIdFn:
...	@@ -272,7 +272,7 @@ bool type_has_zero_bits_known(TypeTableEntry *type_entry) {	...	@@ -272,7 +272,7 @@ bool type_has_zero_bits_known(TypeTableEntry *type_entry) {
272	case TypeTableEntryIdComptimeInt:	272	case TypeTableEntryIdComptimeInt:
273	case TypeTableEntryIdUndefined:	273	case TypeTableEntryIdUndefined:
274	case TypeTableEntryIdNull:	274	case TypeTableEntryIdNull:
275	case TypeTableEntryIdMaybe:	275	case TypeTableEntryIdOptional:
276	case TypeTableEntryIdErrorUnion:	276	case TypeTableEntryIdErrorUnion:
277	case TypeTableEntryIdErrorSet:	277	case TypeTableEntryIdErrorSet:
278	case TypeTableEntryIdFn:	278	case TypeTableEntryIdFn:
...	@@ -520,7 +520,7 @@ TypeTableEntry get_maybe_type(CodeGen g, TypeTableEntry *child_type) {	...	@@ -520,7 +520,7 @@ TypeTableEntry get_maybe_type(CodeGen g, TypeTableEntry *child_type) {
520	} else {	520	} else {
521	ensure_complete_type(g, child_type);	521	ensure_complete_type(g, child_type);
522		522
523	TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdMaybe);	523	TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdOptional);
524	assert(child_type->type_ref \|\| child_type->zero_bits);	524	assert(child_type->type_ref \|\| child_type->zero_bits);
525	assert(child_type->di_type);	525	assert(child_type->di_type);
526	entry->is_copyable = type_is_copyable(g, child_type);	526	entry->is_copyable = type_is_copyable(g, child_type);
...	@@ -1361,7 +1361,7 @@ static bool type_allowed_in_packed_struct(TypeTableEntry *type_entry) {	...	@@ -1361,7 +1361,7 @@ static bool type_allowed_in_packed_struct(TypeTableEntry *type_entry) {
1361	return type_entry->data.structure.layout == ContainerLayoutPacked;	1361	return type_entry->data.structure.layout == ContainerLayoutPacked;
1362	case TypeTableEntryIdUnion:	1362	case TypeTableEntryIdUnion:
1363	return type_entry->data.unionation.layout == ContainerLayoutPacked;	1363	return type_entry->data.unionation.layout == ContainerLayoutPacked;
1364	case TypeTableEntryIdMaybe:	1364	case TypeTableEntryIdOptional:
1365	{	1365	{
1366	TypeTableEntry *child_type = type_entry->data.maybe.child_type;	1366	TypeTableEntry *child_type = type_entry->data.maybe.child_type;
1367	return type_is_codegen_pointer(child_type);	1367	return type_is_codegen_pointer(child_type);
...	@@ -1415,7 +1415,7 @@ static bool type_allowed_in_extern(CodeGen g, TypeTableEntry type_entry) {	...	@@ -1415,7 +1415,7 @@ static bool type_allowed_in_extern(CodeGen g, TypeTableEntry type_entry) {
1415	return type_allowed_in_extern(g, type_entry->data.pointer.child_type);	1415	return type_allowed_in_extern(g, type_entry->data.pointer.child_type);
1416	case TypeTableEntryIdStruct:	1416	case TypeTableEntryIdStruct:
1417	return type_entry->data.structure.layout == ContainerLayoutExtern \|\| type_entry->data.structure.layout == ContainerLayoutPacked;	1417	return type_entry->data.structure.layout == ContainerLayoutExtern \|\| type_entry->data.structure.layout == ContainerLayoutPacked;
1418	case TypeTableEntryIdMaybe:	1418	case TypeTableEntryIdOptional:
1419	{	1419	{
1420	TypeTableEntry *child_type = type_entry->data.maybe.child_type;	1420	TypeTableEntry *child_type = type_entry->data.maybe.child_type;
1421	return child_type->id == TypeTableEntryIdPointer \|\| child_type->id == TypeTableEntryIdFn;	1421	return child_type->id == TypeTableEntryIdPointer \|\| child_type->id == TypeTableEntryIdFn;
...	@@ -1538,7 +1538,7 @@ static TypeTableEntry analyze_fn_type(CodeGen g, AstNode proto_node, Scope c	...	@@ -1538,7 +1538,7 @@ static TypeTableEntry analyze_fn_type(CodeGen g, AstNode proto_node, Scope c
1538	case TypeTableEntryIdPointer:	1538	case TypeTableEntryIdPointer:
1539	case TypeTableEntryIdArray:	1539	case TypeTableEntryIdArray:
1540	case TypeTableEntryIdStruct:	1540	case TypeTableEntryIdStruct:
1541	case TypeTableEntryIdMaybe:	1541	case TypeTableEntryIdOptional:
1542	case TypeTableEntryIdErrorUnion:	1542	case TypeTableEntryIdErrorUnion:
1543	case TypeTableEntryIdErrorSet:	1543	case TypeTableEntryIdErrorSet:
1544	case TypeTableEntryIdEnum:	1544	case TypeTableEntryIdEnum:
...	@@ -1632,7 +1632,7 @@ static TypeTableEntry analyze_fn_type(CodeGen g, AstNode proto_node, Scope c	...	@@ -1632,7 +1632,7 @@ static TypeTableEntry analyze_fn_type(CodeGen g, AstNode proto_node, Scope c
1632	case TypeTableEntryIdPointer:	1632	case TypeTableEntryIdPointer:
1633	case TypeTableEntryIdArray:	1633	case TypeTableEntryIdArray:
1634	case TypeTableEntryIdStruct:	1634	case TypeTableEntryIdStruct:
1635	case TypeTableEntryIdMaybe:	1635	case TypeTableEntryIdOptional:
1636	case TypeTableEntryIdErrorUnion:	1636	case TypeTableEntryIdErrorUnion:
1637	case TypeTableEntryIdErrorSet:	1637	case TypeTableEntryIdErrorSet:
1638	case TypeTableEntryIdEnum:	1638	case TypeTableEntryIdEnum:
...	@@ -2985,8 +2985,8 @@ static void typecheck_panic_fn(CodeGen g, FnTableEntry panic_fn) {	...	@@ -2985,8 +2985,8 @@ static void typecheck_panic_fn(CodeGen g, FnTableEntry panic_fn) {
2985	return wrong_panic_prototype(g, proto_node, fn_type);	2985	return wrong_panic_prototype(g, proto_node, fn_type);
2986	}	2986	}
2987		2987
2988	TypeTableEntry *nullable_ptr_to_stack_trace_type = get_maybe_type(g, get_ptr_to_stack_trace_type(g));	2988	TypeTableEntry *optional_ptr_to_stack_trace_type = get_maybe_type(g, get_ptr_to_stack_trace_type(g));
2989	if (fn_type_id->param_info[1].type != nullable_ptr_to_stack_trace_type) {	2989	if (fn_type_id->param_info[1].type != optional_ptr_to_stack_trace_type) {
2990	return wrong_panic_prototype(g, proto_node, fn_type);	2990	return wrong_panic_prototype(g, proto_node, fn_type);
2991	}	2991	}
2992		2992
...	@@ -3368,7 +3368,7 @@ TypeTableEntry validate_var_type(CodeGen g, AstNode *source_node, TypeTableEnt	...	@@ -3368,7 +3368,7 @@ TypeTableEntry validate_var_type(CodeGen g, AstNode *source_node, TypeTableEnt
3368	case TypeTableEntryIdPointer:	3368	case TypeTableEntryIdPointer:
3369	case TypeTableEntryIdArray:	3369	case TypeTableEntryIdArray:
3370	case TypeTableEntryIdStruct:	3370	case TypeTableEntryIdStruct:
3371	case TypeTableEntryIdMaybe:	3371	case TypeTableEntryIdOptional:
3372	case TypeTableEntryIdErrorUnion:	3372	case TypeTableEntryIdErrorUnion:
3373	case TypeTableEntryIdErrorSet:	3373	case TypeTableEntryIdErrorSet:
3374	case TypeTableEntryIdEnum:	3374	case TypeTableEntryIdEnum:
...	@@ -3746,7 +3746,7 @@ static bool is_container(TypeTableEntry *type_entry) {	...	@@ -3746,7 +3746,7 @@ static bool is_container(TypeTableEntry *type_entry) {
3746	case TypeTableEntryIdComptimeInt:	3746	case TypeTableEntryIdComptimeInt:
3747	case TypeTableEntryIdUndefined:	3747	case TypeTableEntryIdUndefined:
3748	case TypeTableEntryIdNull:	3748	case TypeTableEntryIdNull:
3749	case TypeTableEntryIdMaybe:	3749	case TypeTableEntryIdOptional:
3750	case TypeTableEntryIdErrorUnion:	3750	case TypeTableEntryIdErrorUnion:
3751	case TypeTableEntryIdErrorSet:	3751	case TypeTableEntryIdErrorSet:
3752	case TypeTableEntryIdFn:	3752	case TypeTableEntryIdFn:
...	@@ -3805,7 +3805,7 @@ void resolve_container_type(CodeGen g, TypeTableEntry type_entry) {	...	@@ -3805,7 +3805,7 @@ void resolve_container_type(CodeGen g, TypeTableEntry type_entry) {
3805	case TypeTableEntryIdComptimeInt:	3805	case TypeTableEntryIdComptimeInt:
3806	case TypeTableEntryIdUndefined:	3806	case TypeTableEntryIdUndefined:
3807	case TypeTableEntryIdNull:	3807	case TypeTableEntryIdNull:
3808	case TypeTableEntryIdMaybe:	3808	case TypeTableEntryIdOptional:
3809	case TypeTableEntryIdErrorUnion:	3809	case TypeTableEntryIdErrorUnion:
3810	case TypeTableEntryIdErrorSet:	3810	case TypeTableEntryIdErrorSet:
3811	case TypeTableEntryIdFn:	3811	case TypeTableEntryIdFn:
...	@@ -3824,7 +3824,7 @@ TypeTableEntry get_codegen_ptr_type(TypeTableEntry type) {	...	@@ -3824,7 +3824,7 @@ TypeTableEntry get_codegen_ptr_type(TypeTableEntry type) {
3824	if (type->id == TypeTableEntryIdPointer) return type;	3824	if (type->id == TypeTableEntryIdPointer) return type;
3825	if (type->id == TypeTableEntryIdFn) return type;	3825	if (type->id == TypeTableEntryIdFn) return type;
3826	if (type->id == TypeTableEntryIdPromise) return type;	3826	if (type->id == TypeTableEntryIdPromise) return type;
3827	if (type->id == TypeTableEntryIdMaybe) {	3827	if (type->id == TypeTableEntryIdOptional) {
3828	if (type->data.maybe.child_type->id == TypeTableEntryIdPointer) return type->data.maybe.child_type;	3828	if (type->data.maybe.child_type->id == TypeTableEntryIdPointer) return type->data.maybe.child_type;
3829	if (type->data.maybe.child_type->id == TypeTableEntryIdFn) return type->data.maybe.child_type;	3829	if (type->data.maybe.child_type->id == TypeTableEntryIdFn) return type->data.maybe.child_type;
3830	if (type->data.maybe.child_type->id == TypeTableEntryIdPromise) return type->data.maybe.child_type;	3830	if (type->data.maybe.child_type->id == TypeTableEntryIdPromise) return type->data.maybe.child_type;
...	@@ -4331,7 +4331,7 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {	...	@@ -4331,7 +4331,7 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {
4331	return type_has_bits(type_entry);	4331	return type_has_bits(type_entry);
4332	case TypeTableEntryIdErrorUnion:	4332	case TypeTableEntryIdErrorUnion:
4333	return type_has_bits(type_entry->data.error_union.payload_type);	4333	return type_has_bits(type_entry->data.error_union.payload_type);
4334	case TypeTableEntryIdMaybe:	4334	case TypeTableEntryIdOptional:
4335	return type_has_bits(type_entry->data.maybe.child_type) &&	4335	return type_has_bits(type_entry->data.maybe.child_type) &&
4336	!type_is_codegen_pointer(type_entry->data.maybe.child_type);	4336	!type_is_codegen_pointer(type_entry->data.maybe.child_type);
4337	case TypeTableEntryIdUnion:	4337	case TypeTableEntryIdUnion:
...	@@ -4709,12 +4709,12 @@ static uint32_t hash_const_val(ConstExprValue *const_val) {	...	@@ -4709,12 +4709,12 @@ static uint32_t hash_const_val(ConstExprValue *const_val) {
4709	case TypeTableEntryIdUnion:	4709	case TypeTableEntryIdUnion:
4710	// TODO better hashing algorithm	4710	// TODO better hashing algorithm
4711	return 2709806591;	4711	return 2709806591;
4712	case TypeTableEntryIdMaybe:	4712	case TypeTableEntryIdOptional:
4713	if (get_codegen_ptr_type(const_val->type) != nullptr) {	4713	if (get_codegen_ptr_type(const_val->type) != nullptr) {
4714	return hash_const_val(const_val) * 1992916303;	4714	return hash_const_val(const_val) * 1992916303;
4715	} else {	4715	} else {
4716	if (const_val->data.x_nullable) {	4716	if (const_val->data.x_optional) {
4717	return hash_const_val(const_val->data.x_nullable) * 1992916303;	4717	return hash_const_val(const_val->data.x_optional) * 1992916303;
4718	} else {	4718	} else {
4719	return 4016830364;	4719	return 4016830364;
4720	}	4720	}
...	@@ -4817,12 +4817,12 @@ static bool can_mutate_comptime_var_state(ConstExprValue *value) {	...	@@ -4817,12 +4817,12 @@ static bool can_mutate_comptime_var_state(ConstExprValue *value) {
4817	}	4817	}
4818	return false;	4818	return false;
4819		4819
4820	case TypeTableEntryIdMaybe:	4820	case TypeTableEntryIdOptional:
4821	if (get_codegen_ptr_type(value->type) != nullptr)	4821	if (get_codegen_ptr_type(value->type) != nullptr)
4822	return value->data.x_ptr.mut == ConstPtrMutComptimeVar;	4822	return value->data.x_ptr.mut == ConstPtrMutComptimeVar;
4823	if (value->data.x_nullable == nullptr)	4823	if (value->data.x_optional == nullptr)
4824	return false;	4824	return false;
4825	return can_mutate_comptime_var_state(value->data.x_nullable);	4825	return can_mutate_comptime_var_state(value->data.x_optional);
4826		4826
4827	case TypeTableEntryIdErrorUnion:	4827	case TypeTableEntryIdErrorUnion:
4828	if (value->data.x_err_union.err != nullptr)	4828	if (value->data.x_err_union.err != nullptr)
...	@@ -4869,7 +4869,7 @@ static bool return_type_is_cacheable(TypeTableEntry *return_type) {	...	@@ -4869,7 +4869,7 @@ static bool return_type_is_cacheable(TypeTableEntry *return_type) {
4869	case TypeTableEntryIdUnion:	4869	case TypeTableEntryIdUnion:
4870	return false;	4870	return false;
4871		4871
4872	case TypeTableEntryIdMaybe:	4872	case TypeTableEntryIdOptional:
4873	return return_type_is_cacheable(return_type->data.maybe.child_type);	4873	return return_type_is_cacheable(return_type->data.maybe.child_type);
4874		4874
4875	case TypeTableEntryIdErrorUnion:	4875	case TypeTableEntryIdErrorUnion:
...	@@ -4978,7 +4978,7 @@ bool type_requires_comptime(TypeTableEntry *type_entry) {	...	@@ -4978,7 +4978,7 @@ bool type_requires_comptime(TypeTableEntry *type_entry) {
4978	case TypeTableEntryIdUnion:	4978	case TypeTableEntryIdUnion:
4979	assert(type_has_zero_bits_known(type_entry));	4979	assert(type_has_zero_bits_known(type_entry));
4980	return type_entry->data.unionation.requires_comptime;	4980	return type_entry->data.unionation.requires_comptime;
4981	case TypeTableEntryIdMaybe:	4981	case TypeTableEntryIdOptional:
4982	return type_requires_comptime(type_entry->data.maybe.child_type);	4982	return type_requires_comptime(type_entry->data.maybe.child_type);
4983	case TypeTableEntryIdErrorUnion:	4983	case TypeTableEntryIdErrorUnion:
4984	return type_requires_comptime(type_entry->data.error_union.payload_type);	4984	return type_requires_comptime(type_entry->data.error_union.payload_type);
...	@@ -5460,13 +5460,13 @@ bool const_values_equal(ConstExprValue a, ConstExprValue b) {	...	@@ -5460,13 +5460,13 @@ bool const_values_equal(ConstExprValue a, ConstExprValue b) {
5460	zig_panic("TODO");	5460	zig_panic("TODO");
5461	case TypeTableEntryIdNull:	5461	case TypeTableEntryIdNull:
5462	zig_panic("TODO");	5462	zig_panic("TODO");
5463	case TypeTableEntryIdMaybe:	5463	case TypeTableEntryIdOptional:
5464	if (get_codegen_ptr_type(a->type) != nullptr)	5464	if (get_codegen_ptr_type(a->type) != nullptr)
5465	return const_values_equal_ptr(a, b);	5465	return const_values_equal_ptr(a, b);
5466	if (a->data.x_nullable == nullptr \|\| b->data.x_nullable == nullptr) {	5466	if (a->data.x_optional == nullptr \|\| b->data.x_optional == nullptr) {
5467	return (a->data.x_nullable == nullptr && b->data.x_nullable == nullptr);	5467	return (a->data.x_optional == nullptr && b->data.x_optional == nullptr);
5468	} else {	5468	} else {
5469	return const_values_equal(a->data.x_nullable, b->data.x_nullable);	5469	return const_values_equal(a->data.x_optional, b->data.x_optional);
5470	}	5470	}
5471	case TypeTableEntryIdErrorUnion:	5471	case TypeTableEntryIdErrorUnion:
5472	zig_panic("TODO");	5472	zig_panic("TODO");
...	@@ -5708,12 +5708,12 @@ void render_const_value(CodeGen g, Buf buf, ConstExprValue *const_val) {	...	@@ -5708,12 +5708,12 @@ void render_const_value(CodeGen g, Buf buf, ConstExprValue *const_val) {
5708	buf_appendf(buf, "undefined");	5708	buf_appendf(buf, "undefined");
5709	return;	5709	return;
5710	}	5710	}
5711	case TypeTableEntryIdMaybe:	5711	case TypeTableEntryIdOptional:
5712	{	5712	{
5713	if (get_codegen_ptr_type(const_val->type) != nullptr)	5713	if (get_codegen_ptr_type(const_val->type) != nullptr)
5714	return render_const_val_ptr(g, buf, const_val, type_entry->data.maybe.child_type);	5714	return render_const_val_ptr(g, buf, const_val, type_entry->data.maybe.child_type);
5715	if (const_val->data.x_nullable) {	5715	if (const_val->data.x_optional) {
5716	render_const_value(g, buf, const_val->data.x_nullable);	5716	render_const_value(g, buf, const_val->data.x_optional);
5717	} else {	5717	} else {
5718	buf_appendf(buf, "null");	5718	buf_appendf(buf, "null");
5719	}	5719	}
...	@@ -5819,7 +5819,7 @@ uint32_t type_id_hash(TypeId x) {	...	@@ -5819,7 +5819,7 @@ uint32_t type_id_hash(TypeId x) {
5819	case TypeTableEntryIdComptimeInt:	5819	case TypeTableEntryIdComptimeInt:
5820	case TypeTableEntryIdUndefined:	5820	case TypeTableEntryIdUndefined:
5821	case TypeTableEntryIdNull:	5821	case TypeTableEntryIdNull:
5822	case TypeTableEntryIdMaybe:	5822	case TypeTableEntryIdOptional:
5823	case TypeTableEntryIdErrorSet:	5823	case TypeTableEntryIdErrorSet:
5824	case TypeTableEntryIdEnum:	5824	case TypeTableEntryIdEnum:
5825	case TypeTableEntryIdUnion:	5825	case TypeTableEntryIdUnion:
...	@@ -5865,7 +5865,7 @@ bool type_id_eql(TypeId a, TypeId b) {	...	@@ -5865,7 +5865,7 @@ bool type_id_eql(TypeId a, TypeId b) {
5865	case TypeTableEntryIdComptimeInt:	5865	case TypeTableEntryIdComptimeInt:
5866	case TypeTableEntryIdUndefined:	5866	case TypeTableEntryIdUndefined:
5867	case TypeTableEntryIdNull:	5867	case TypeTableEntryIdNull:
5868	case TypeTableEntryIdMaybe:	5868	case TypeTableEntryIdOptional:
5869	case TypeTableEntryIdPromise:	5869	case TypeTableEntryIdPromise:
5870	case TypeTableEntryIdErrorSet:	5870	case TypeTableEntryIdErrorSet:
5871	case TypeTableEntryIdEnum:	5871	case TypeTableEntryIdEnum:
...	@@ -5987,7 +5987,7 @@ static const TypeTableEntryId all_type_ids[] = {	...	@@ -5987,7 +5987,7 @@ static const TypeTableEntryId all_type_ids[] = {
5987	TypeTableEntryIdComptimeInt,	5987	TypeTableEntryIdComptimeInt,
5988	TypeTableEntryIdUndefined,	5988	TypeTableEntryIdUndefined,
5989	TypeTableEntryIdNull,	5989	TypeTableEntryIdNull,
5990	TypeTableEntryIdMaybe,	5990	TypeTableEntryIdOptional,
5991	TypeTableEntryIdErrorUnion,	5991	TypeTableEntryIdErrorUnion,
5992	TypeTableEntryIdErrorSet,	5992	TypeTableEntryIdErrorSet,
5993	TypeTableEntryIdEnum,	5993	TypeTableEntryIdEnum,
...	@@ -6042,7 +6042,7 @@ size_t type_id_index(TypeTableEntry *entry) {	...	@@ -6042,7 +6042,7 @@ size_t type_id_index(TypeTableEntry *entry) {
6042	return 11;	6042	return 11;
6043	case TypeTableEntryIdNull:	6043	case TypeTableEntryIdNull:
6044	return 12;	6044	return 12;
6045	case TypeTableEntryIdMaybe:	6045	case TypeTableEntryIdOptional:
6046	return 13;	6046	return 13;
6047	case TypeTableEntryIdErrorUnion:	6047	case TypeTableEntryIdErrorUnion:
6048	return 14;	6048	return 14;
...	@@ -6100,8 +6100,8 @@ const char *type_id_name(TypeTableEntryId id) {	...	@@ -6100,8 +6100,8 @@ const char *type_id_name(TypeTableEntryId id) {
6100	return "Undefined";	6100	return "Undefined";
6101	case TypeTableEntryIdNull:	6101	case TypeTableEntryIdNull:
6102	return "Null";	6102	return "Null";
6103	case TypeTableEntryIdMaybe:	6103	case TypeTableEntryIdOptional:
6104	return "Nullable";	6104	return "Optional";
6105	case TypeTableEntryIdErrorUnion:	6105	case TypeTableEntryIdErrorUnion:
6106	return "ErrorUnion";	6106	return "ErrorUnion";
6107	case TypeTableEntryIdErrorSet:	6107	case TypeTableEntryIdErrorSet:

src/ast_render.cpp+3-3

src/codegen.cpp+30-30

src/ir.cpp+99-99

src/ir_print.cpp+8-8

...	@@ -148,7 +148,7 @@ static const char *ir_un_op_id_str(IrUnOp op_id) {	...	@@ -148,7 +148,7 @@ static const char *ir_un_op_id_str(IrUnOp op_id) {
148	return "-%";	148	return "-%";
149	case IrUnOpDereference:	149	case IrUnOpDereference:
150	return "*";	150	return "*";
151	case IrUnOpMaybe:	151	case IrUnOpOptional:
152	return "?";	152	return "?";
153	}	153	}
154	zig_unreachable();	154	zig_unreachable();
...	@@ -481,7 +481,7 @@ static void ir_print_test_null(IrPrint irp, IrInstructionTestNonNull instructi	...	@@ -481,7 +481,7 @@ static void ir_print_test_null(IrPrint irp, IrInstructionTestNonNull instructi
481	fprintf(irp->f, " != null");	481	fprintf(irp->f, " != null");
482	}	482	}
483		483
484	static void ir_print_unwrap_maybe(IrPrint irp, IrInstructionUnwrapMaybe instruction) {	484	static void ir_print_unwrap_maybe(IrPrint irp, IrInstructionUnwrapOptional instruction) {
485	fprintf(irp->f, "&??*");	485	fprintf(irp->f, "&??*");
486	ir_print_other_instruction(irp, instruction->value);	486	ir_print_other_instruction(irp, instruction->value);
487	if (!instruction->safety_check_on) {	487	if (!instruction->safety_check_on) {
...	@@ -777,7 +777,7 @@ static void ir_print_unwrap_err_payload(IrPrint *irp, IrInstructionUnwrapErrPayl	...	@@ -777,7 +777,7 @@ static void ir_print_unwrap_err_payload(IrPrint *irp, IrInstructionUnwrapErrPayl
777	}	777	}
778	}	778	}
779		779
780	static void ir_print_maybe_wrap(IrPrint irp, IrInstructionMaybeWrap instruction) {	780	static void ir_print_maybe_wrap(IrPrint irp, IrInstructionOptionalWrap instruction) {
781	fprintf(irp->f, "@maybeWrap(");	781	fprintf(irp->f, "@maybeWrap(");
782	ir_print_other_instruction(irp, instruction->value);	782	ir_print_other_instruction(irp, instruction->value);
783	fprintf(irp->f, ")");	783	fprintf(irp->f, ")");
...	@@ -1032,7 +1032,7 @@ static void ir_print_export(IrPrint irp, IrInstructionExport instruction) {	...	@@ -1032,7 +1032,7 @@ static void ir_print_export(IrPrint irp, IrInstructionExport instruction) {
1032		1032
1033	static void ir_print_error_return_trace(IrPrint irp, IrInstructionErrorReturnTrace instruction) {	1033	static void ir_print_error_return_trace(IrPrint irp, IrInstructionErrorReturnTrace instruction) {
1034	fprintf(irp->f, "@errorReturnTrace(");	1034	fprintf(irp->f, "@errorReturnTrace(");
1035	switch (instruction->nullable) {	1035	switch (instruction->optional) {
1036	case IrInstructionErrorReturnTrace::Null:	1036	case IrInstructionErrorReturnTrace::Null:
1037	fprintf(irp->f, "Null");	1037	fprintf(irp->f, "Null");
1038	break;	1038	break;
...	@@ -1348,8 +1348,8 @@ static void ir_print_instruction(IrPrint irp, IrInstruction instruction) {	...	@@ -1348,8 +1348,8 @@ static void ir_print_instruction(IrPrint irp, IrInstruction instruction) {
1348	case IrInstructionIdTestNonNull:	1348	case IrInstructionIdTestNonNull:
1349	ir_print_test_null(irp, (IrInstructionTestNonNull *)instruction);	1349	ir_print_test_null(irp, (IrInstructionTestNonNull *)instruction);
1350	break;	1350	break;
1351	case IrInstructionIdUnwrapMaybe:	1351	case IrInstructionIdUnwrapOptional:
1352	ir_print_unwrap_maybe(irp, (IrInstructionUnwrapMaybe *)instruction);	1352	ir_print_unwrap_maybe(irp, (IrInstructionUnwrapOptional *)instruction);
1353	break;	1353	break;
1354	case IrInstructionIdCtz:	1354	case IrInstructionIdCtz:
1355	ir_print_ctz(irp, (IrInstructionCtz *)instruction);	1355	ir_print_ctz(irp, (IrInstructionCtz *)instruction);
...	@@ -1465,8 +1465,8 @@ static void ir_print_instruction(IrPrint irp, IrInstruction instruction) {	...	@@ -1465,8 +1465,8 @@ static void ir_print_instruction(IrPrint irp, IrInstruction instruction) {
1465	case IrInstructionIdUnwrapErrPayload:	1465	case IrInstructionIdUnwrapErrPayload:
1466	ir_print_unwrap_err_payload(irp, (IrInstructionUnwrapErrPayload *)instruction);	1466	ir_print_unwrap_err_payload(irp, (IrInstructionUnwrapErrPayload *)instruction);
1467	break;	1467	break;
1468	case IrInstructionIdMaybeWrap:	1468	case IrInstructionIdOptionalWrap:
1469	ir_print_maybe_wrap(irp, (IrInstructionMaybeWrap *)instruction);	1469	ir_print_maybe_wrap(irp, (IrInstructionOptionalWrap *)instruction);
1470	break;	1470	break;
1471	case IrInstructionIdErrWrapCode:	1471	case IrInstructionIdErrWrapCode:
1472	ir_print_err_wrap_code(irp, (IrInstructionErrWrapCode *)instruction);	1472	ir_print_err_wrap_code(irp, (IrInstructionErrWrapCode *)instruction);

src/parser.cpp+14-7

 @@ -1046,12 +1046,11 @@ static AstNode *ast_parse_fn_proto_partial(ParseContext *pc, size_t *token_index
 }
 /*
-SuffixOpExpression = ("async" option("<" SuffixOpExpression ">") SuffixOpExpression FnCallExpression) | PrimaryExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | PtrDerefExpression | SliceExpression)
+SuffixOpExpression = ("async" option("&lt;" SuffixOpExpression "&gt;") SuffixOpExpression FnCallExpression) | PrimaryExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | SliceExpression | ".*" | ".?")
 FnCallExpression : token(LParen) list(Expression, token(Comma)) token(RParen)
 ArrayAccessExpression : token(LBracket) Expression token(RBracket)
 SliceExpression = "[" Expression ".." option(Expression) "]"
 FieldAccessExpression : token(Dot) token(Symbol)
-PtrDerefExpression = ".*"
 StructLiteralField : token(Dot) token(Symbol) token(Eq) Expression
 */
 static AstNode *ast_parse_suffix_op_expr(ParseContext *pc, size_t *token_index, bool mandatory) {
 @@ -1148,6 +1147,14 @@ static AstNode *ast_parse_suffix_op_expr(ParseContext *pc, size_t *token_index,
                 AstNode *node = ast_create_node(pc, NodeTypePtrDeref, first_token);
                 node->data.ptr_deref_expr.target = primary_expr;
+                primary_expr = node;
+            } else if (token->id == TokenIdQuestion) {
+                *token_index += 1;
+                AstNode *node = ast_create_node(pc, NodeTypePrefixOpExpr, first_token);
+                node->data.prefix_op_expr.prefix_op = PrefixOpUnwrapOptional;
+                node->data.prefix_op_expr.primary_expr = primary_expr;
                 primary_expr = node;
             } else {
                 ast_invalid_token_error(pc, token);
 @@ -1165,8 +1172,8 @@ static PrefixOp tok_to_prefix_op(Token *token) {
         case TokenIdDash: return PrefixOpNegation;
         case TokenIdMinusPercent: return PrefixOpNegationWrap;
         case TokenIdTilde: return PrefixOpBinNot;
-        case TokenIdMaybe: return PrefixOpMaybe;
+        case TokenIdQuestion: return PrefixOpOptional;
-        case TokenIdDoubleQuestion: return PrefixOpUnwrapMaybe;
+        case TokenIdDoubleQuestion: return PrefixOpUnwrapOptional;
         case TokenIdAmpersand: return PrefixOpAddrOf;
         default: return PrefixOpInvalid;
     }
 @@ -2304,8 +2311,8 @@ static BinOpType ast_parse_ass_op(ParseContext *pc, size_t *token_index, bool ma
 }
 /*
-UnwrapExpression : BoolOrExpression (UnwrapMaybe | UnwrapError) | BoolOrExpression
+UnwrapExpression : BoolOrExpression (UnwrapOptional | UnwrapError) | BoolOrExpression
-UnwrapMaybe : "??" BoolOrExpression
+UnwrapOptional : "??" BoolOrExpression
 UnwrapError = "catch" option("|" Symbol "|") Expression
 */
 static AstNode *ast_parse_unwrap_expr(ParseContext *pc, size_t *token_index, bool mandatory) {
 @@ -2322,7 +2329,7 @@ static AstNode *ast_parse_unwrap_expr(ParseContext *pc, size_t *token_index, boo
         AstNode *node = ast_create_node(pc, NodeTypeBinOpExpr, token);
         node->data.bin_op_expr.op1 = lhs;
-        node->data.bin_op_expr.bin_op = BinOpTypeUnwrapMaybe;
+        node->data.bin_op_expr.bin_op = BinOpTypeUnwrapOptional;
         node->data.bin_op_expr.op2 = rhs;
         return node;

src/tokenizer.cpp+2-8

...	@@ -625,7 +625,7 @@ void tokenize(Buf buf, Tokenization out) {	...	@@ -625,7 +625,7 @@ void tokenize(Buf buf, Tokenization out) {
625	t.state = TokenizeStateSawDot;	625	t.state = TokenizeStateSawDot;
626	break;	626	break;
627	case '?':	627	case '?':
628	begin_token(&t, TokenIdMaybe);	628	begin_token(&t, TokenIdQuestion);
629	t.state = TokenizeStateSawQuestionMark;	629	t.state = TokenizeStateSawQuestionMark;
630	break;	630	break;
631	default:	631	default:
...	@@ -639,11 +639,6 @@ void tokenize(Buf buf, Tokenization out) {	...	@@ -639,11 +639,6 @@ void tokenize(Buf buf, Tokenization out) {
639	end_token(&t);	639	end_token(&t);
640	t.state = TokenizeStateStart;	640	t.state = TokenizeStateStart;
641	break;	641	break;
642	case '=':
643	set_token_id(&t, t.cur_tok, TokenIdMaybeAssign);
644	end_token(&t);
645	t.state = TokenizeStateStart;
646	break;
647	default:	642	default:
648	t.pos -= 1;	643	t.pos -= 1;
649	end_token(&t);	644	end_token(&t);
...	@@ -1609,8 +1604,7 @@ const char * token_name(TokenId id) {	...	@@ -1609,8 +1604,7 @@ const char * token_name(TokenId id) {
1609	case TokenIdLBrace: return "{";	1604	case TokenIdLBrace: return "{";
1610	case TokenIdLBracket: return "[";	1605	case TokenIdLBracket: return "[";
1611	case TokenIdLParen: return "(";	1606	case TokenIdLParen: return "(";
1612	case TokenIdMaybe: return "?";	1607	case TokenIdQuestion: return "?";
1613	case TokenIdMaybeAssign: return "?=";
1614	case TokenIdMinusEq: return "-=";	1608	case TokenIdMinusEq: return "-=";
1615	case TokenIdMinusPercent: return "-%";	1609	case TokenIdMinusPercent: return "-%";
1616	case TokenIdMinusPercentEq: return "-%=";	1610	case TokenIdMinusPercentEq: return "-%=";

src/tokenizer.hpp+1-2

...	@@ -100,8 +100,7 @@ enum TokenId {	...	@@ -100,8 +100,7 @@ enum TokenId {
100	TokenIdLBrace,	100	TokenIdLBrace,
101	TokenIdLBracket,	101	TokenIdLBracket,
102	TokenIdLParen,	102	TokenIdLParen,
103	TokenIdMaybe,	103	TokenIdQuestion,
104	TokenIdMaybeAssign,
105	TokenIdMinusEq,	104	TokenIdMinusEq,
106	TokenIdMinusPercent,	105	TokenIdMinusPercent,
107	TokenIdMinusPercentEq,	106	TokenIdMinusPercentEq,

src/translate_c.cpp+7-7

std/array_list.zig+1-1

...	@@ -258,7 +258,7 @@ test "iterator ArrayList test" {	...	@@ -258,7 +258,7 @@ test "iterator ArrayList test" {
258	}	258	}
259		259
260	it.reset();	260	it.reset();
261	assert(??it.next() == 1);	261	assert(it.next().? == 1);
262	}	262	}
263		263
264	test "insert ArrayList test" {	264	test "insert ArrayList test" {

std/buf_map.zig+3-3

...	@@ -72,15 +72,15 @@ test "BufMap" {	...	@@ -72,15 +72,15 @@ test "BufMap" {
72	defer bufmap.deinit();	72	defer bufmap.deinit();
73		73
74	try bufmap.set("x", "1");	74	try bufmap.set("x", "1");
75	assert(mem.eql(u8, ??bufmap.get("x"), "1"));	75	assert(mem.eql(u8, bufmap.get("x").?, "1"));
76	assert(1 == bufmap.count());	76	assert(1 == bufmap.count());
77		77
78	try bufmap.set("x", "2");	78	try bufmap.set("x", "2");
79	assert(mem.eql(u8, ??bufmap.get("x"), "2"));	79	assert(mem.eql(u8, bufmap.get("x").?, "2"));
80	assert(1 == bufmap.count());	80	assert(1 == bufmap.count());
81		81
82	try bufmap.set("x", "3");	82	try bufmap.set("x", "3");
83	assert(mem.eql(u8, ??bufmap.get("x"), "3"));	83	assert(mem.eql(u8, bufmap.get("x").?, "3"));
84	assert(1 == bufmap.count());	84	assert(1 == bufmap.count());
85		85
86	bufmap.delete("x");	86	bufmap.delete("x");

std/event.zig+2-2

...	@@ -40,9 +40,9 @@ pub const TcpServer = struct {	...	@@ -40,9 +40,9 @@ pub const TcpServer = struct {
40	self.listen_address = std.net.Address.initPosix(try std.os.posixGetSockName(self.sockfd));	40	self.listen_address = std.net.Address.initPosix(try std.os.posixGetSockName(self.sockfd));
41		41
42	self.accept_coro = try async<self.loop.allocator> TcpServer.handler(self);	42	self.accept_coro = try async<self.loop.allocator> TcpServer.handler(self);
43	errdefer cancel ??self.accept_coro;	43	errdefer cancel self.accept_coro.?;
44		44
45	try self.loop.addFd(self.sockfd, ??self.accept_coro);	45	try self.loop.addFd(self.sockfd, self.accept_coro.?);
46	errdefer self.loop.removeFd(self.sockfd);	46	errdefer self.loop.removeFd(self.sockfd);
47	}	47	}
48		48

std/fmt/index.zig+3-3

...	@@ -111,7 +111,7 @@ pub fn formatType(	...	@@ -111,7 +111,7 @@ pub fn formatType(
111	builtin.TypeId.Bool => {	111	builtin.TypeId.Bool => {
112	return output(context, if (value) "true" else "false");	112	return output(context, if (value) "true" else "false");
113	},	113	},
114	builtin.TypeId.Nullable => {	114	builtin.TypeId.Optional => {
115	if (value) \|payload\| {	115	if (value) \|payload\| {
116	return formatType(payload, fmt, context, Errors, output);	116	return formatType(payload, fmt, context, Errors, output);
117	} else {	117	} else {
...	@@ -819,11 +819,11 @@ test "parse unsigned comptime" {	...	@@ -819,11 +819,11 @@ test "parse unsigned comptime" {
819	test "fmt.format" {	819	test "fmt.format" {
820	{	820	{
821	const value: ?i32 = 1234;	821	const value: ?i32 = 1234;
822	try testFmt("nullable: 1234\n", "nullable: {}\n", value);	822	try testFmt("optional: 1234\n", "optional: {}\n", value);
823	}	823	}
824	{	824	{
825	const value: ?i32 = null;	825	const value: ?i32 = null;
826	try testFmt("nullable: null\n", "nullable: {}\n", value);	826	try testFmt("optional: null\n", "optional: {}\n", value);
827	}	827	}
828	{	828	{
829	const value: error!i32 = 1234;	829	const value: error!i32 = 1234;

std/hash_map.zig+4-4

...	@@ -265,11 +265,11 @@ test "basic hash map usage" {	...	@@ -265,11 +265,11 @@ test "basic hash map usage" {
265	assert((map.put(4, 44) catch unreachable) == null);	265	assert((map.put(4, 44) catch unreachable) == null);
266	assert((map.put(5, 55) catch unreachable) == null);	266	assert((map.put(5, 55) catch unreachable) == null);
267		267
268	assert(??(map.put(5, 66) catch unreachable) == 55);	268	assert((map.put(5, 66) catch unreachable).? == 55);
269	assert(??(map.put(5, 55) catch unreachable) == 66);	269	assert((map.put(5, 55) catch unreachable).? == 66);
270		270
271	assert(map.contains(2));	271	assert(map.contains(2));
272	assert((??map.get(2)).value == 22);	272	assert(map.get(2).?.value == 22);
273	_ = map.remove(2);	273	_ = map.remove(2);
274	assert(map.remove(2) == null);	274	assert(map.remove(2) == null);
275	assert(map.get(2) == null);	275	assert(map.get(2) == null);
...	@@ -317,7 +317,7 @@ test "iterator hash map" {	...	@@ -317,7 +317,7 @@ test "iterator hash map" {
317	}	317	}
318		318
319	it.reset();	319	it.reset();
320	var entry = ??it.next();	320	var entry = it.next().?;
321	assert(entry.key == keys[0]);	321	assert(entry.key == keys[0]);
322	assert(entry.value == values[0]);	322	assert(entry.value == values[0]);
323	}	323	}

std/heap.zig+2-2

...	@@ -142,7 +142,7 @@ pub const DirectAllocator = struct {	...	@@ -142,7 +142,7 @@ pub const DirectAllocator = struct {
142	const root_addr = @intToPtr(align(1) usize, old_record_addr).;	142	const root_addr = @intToPtr(align(1) usize, old_record_addr).;
143	const old_ptr = @intToPtr(*c_void, root_addr);	143	const old_ptr = @intToPtr(*c_void, root_addr);
144	const amt = new_size + alignment + @sizeOf(usize);	144	const amt = new_size + alignment + @sizeOf(usize);
145	const new_ptr = os.windows.HeapReAlloc(??self.heap_handle, 0, old_ptr, amt) ?? blk: {	145	const new_ptr = os.windows.HeapReAlloc(self.heap_handle.?, 0, old_ptr, amt) ?? blk: {
146	if (new_size > old_mem.len) return error.OutOfMemory;	146	if (new_size > old_mem.len) return error.OutOfMemory;
147	const new_record_addr = old_record_addr - new_size + old_mem.len;	147	const new_record_addr = old_record_addr - new_size + old_mem.len;
148	@intToPtr(align(1) usize, new_record_addr). = root_addr;	148	@intToPtr(align(1) usize, new_record_addr). = root_addr;
...	@@ -171,7 +171,7 @@ pub const DirectAllocator = struct {	...	@@ -171,7 +171,7 @@ pub const DirectAllocator = struct {
171	const record_addr = @ptrToInt(bytes.ptr) + bytes.len;	171	const record_addr = @ptrToInt(bytes.ptr) + bytes.len;
172	const root_addr = @intToPtr(align(1) usize, record_addr).;	172	const root_addr = @intToPtr(align(1) usize, record_addr).;
173	const ptr = @intToPtr(*c_void, root_addr);	173	const ptr = @intToPtr(*c_void, root_addr);
174	_ = os.windows.HeapFree(??self.heap_handle, 0, ptr);	174	_ = os.windows.HeapFree(self.heap_handle.?, 0, ptr);
175	},	175	},
176	else => @compileError("Unsupported OS"),	176	else => @compileError("Unsupported OS"),
177	}	177	}

std/json.zig+6-6

...	@@ -908,7 +908,7 @@ pub const TokenStream = struct {	...	@@ -908,7 +908,7 @@ pub const TokenStream = struct {
908	};	908	};
909		909
910	fn checkNext(p: *TokenStream, id: Token.Id) void {	910	fn checkNext(p: *TokenStream, id: Token.Id) void {
911	const token = ??(p.next() catch unreachable);	911	const token = (p.next() catch unreachable).?;
912	debug.assert(token.id == id);	912	debug.assert(token.id == id);
913	}	913	}
914		914
...	@@ -1376,17 +1376,17 @@ test "json parser dynamic" {	...	@@ -1376,17 +1376,17 @@ test "json parser dynamic" {
1376		1376
1377	var root = tree.root;	1377	var root = tree.root;
1378		1378
1379	var image = (??root.Object.get("Image")).value;	1379	var image = root.Object.get("Image").?.value;
1380		1380
1381	const width = (??image.Object.get("Width")).value;	1381	const width = image.Object.get("Width").?.value;
1382	debug.assert(width.Integer == 800);	1382	debug.assert(width.Integer == 800);
1383		1383
1384	const height = (??image.Object.get("Height")).value;	1384	const height = image.Object.get("Height").?.value;
1385	debug.assert(height.Integer == 600);	1385	debug.assert(height.Integer == 600);
1386		1386
1387	const title = (??image.Object.get("Title")).value;	1387	const title = image.Object.get("Title").?.value;
1388	debug.assert(mem.eql(u8, title.String, "View from 15th Floor"));	1388	debug.assert(mem.eql(u8, title.String, "View from 15th Floor"));
1389		1389
1390	const animated = (??image.Object.get("Animated")).value;	1390	const animated = image.Object.get("Animated").?.value;
1391	debug.assert(animated.Bool == false);	1391	debug.assert(animated.Bool == false);
1392	}	1392	}

std/linked_list.zig+4-4

...	@@ -270,8 +270,8 @@ test "basic linked list test" {	...	@@ -270,8 +270,8 @@ test "basic linked list test" {
270	var last = list.pop(); // {2, 3, 4}	270	var last = list.pop(); // {2, 3, 4}
271	list.remove(three); // {2, 4}	271	list.remove(three); // {2, 4}
272		272
273	assert((??list.first).data == 2);	273	assert(list.first.?.data == 2);
274	assert((??list.last).data == 4);	274	assert(list.last.?.data == 4);
275	assert(list.len == 2);	275	assert(list.len == 2);
276	}	276	}
277		277
...	@@ -336,7 +336,7 @@ test "basic intrusive linked list test" {	...	@@ -336,7 +336,7 @@ test "basic intrusive linked list test" {
336	var last = list.pop(); // {2, 3, 4}	336	var last = list.pop(); // {2, 3, 4}
337	list.remove(&three.link); // {2, 4}	337	list.remove(&three.link); // {2, 4}
338		338
339	assert((??list.first).toData().value == 2);	339	assert(list.first.?.toData().value == 2);
340	assert((??list.last).toData().value == 4);	340	assert(list.last.?.toData().value == 4);
341	assert(list.len == 2);	341	assert(list.len == 2);
342	}	342	}

std/macho.zig+1-1

...	@@ -130,7 +130,7 @@ pub fn loadSymbols(allocator: mem.Allocator, in: io.FileInStream) !SymbolTable	...	@@ -130,7 +130,7 @@ pub fn loadSymbols(allocator: mem.Allocator, in: io.FileInStream) !SymbolTable
130	for (syms) \|sym\| {	130	for (syms) \|sym\| {
131	if (!isSymbol(sym)) continue;	131	if (!isSymbol(sym)) continue;
132	const start = sym.n_strx;	132	const start = sym.n_strx;
133	const end = ??mem.indexOfScalarPos(u8, strings, start, 0);	133	const end = mem.indexOfScalarPos(u8, strings, start, 0).?;
134	const name = strings[start..end];	134	const name = strings[start..end];
135	const address = sym.n_value;	135	const address = sym.n_value;
136	symbols[nsym] = Symbol{ .name = name, .address = address };	136	symbols[nsym] = Symbol{ .name = name, .address = address };

std/mem.zig+11-11

...	@@ -304,20 +304,20 @@ pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, nee	...	@@ -304,20 +304,20 @@ pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, nee
304	}	304	}
305		305
306	test "mem.indexOf" {	306	test "mem.indexOf" {
307	assert(??indexOf(u8, "one two three four", "four") == 14);	307	assert(indexOf(u8, "one two three four", "four").? == 14);
308	assert(??lastIndexOf(u8, "one two three two four", "two") == 14);	308	assert(lastIndexOf(u8, "one two three two four", "two").? == 14);
309	assert(indexOf(u8, "one two three four", "gour") == null);	309	assert(indexOf(u8, "one two three four", "gour") == null);
310	assert(lastIndexOf(u8, "one two three four", "gour") == null);	310	assert(lastIndexOf(u8, "one two three four", "gour") == null);
311	assert(??indexOf(u8, "foo", "foo") == 0);	311	assert(indexOf(u8, "foo", "foo").? == 0);
312	assert(??lastIndexOf(u8, "foo", "foo") == 0);	312	assert(lastIndexOf(u8, "foo", "foo").? == 0);
313	assert(indexOf(u8, "foo", "fool") == null);	313	assert(indexOf(u8, "foo", "fool") == null);
314	assert(lastIndexOf(u8, "foo", "lfoo") == null);	314	assert(lastIndexOf(u8, "foo", "lfoo") == null);
315	assert(lastIndexOf(u8, "foo", "fool") == null);	315	assert(lastIndexOf(u8, "foo", "fool") == null);
316		316
317	assert(??indexOf(u8, "foo foo", "foo") == 0);	317	assert(indexOf(u8, "foo foo", "foo").? == 0);
318	assert(??lastIndexOf(u8, "foo foo", "foo") == 4);	318	assert(lastIndexOf(u8, "foo foo", "foo").? == 4);
319	assert(??lastIndexOfAny(u8, "boo, cat", "abo") == 6);	319	assert(lastIndexOfAny(u8, "boo, cat", "abo").? == 6);
320	assert(??lastIndexOfScalar(u8, "boo", 'o') == 2);	320	assert(lastIndexOfScalar(u8, "boo", 'o').? == 2);
321	}	321	}
322		322
323	/// Reads an integer from memory with size equal to bytes.len.	323	/// Reads an integer from memory with size equal to bytes.len.
...	@@ -432,9 +432,9 @@ pub fn split(buffer: []const u8, split_bytes: []const u8) SplitIterator {	...	@@ -432,9 +432,9 @@ pub fn split(buffer: []const u8, split_bytes: []const u8) SplitIterator {
432		432
433	test "mem.split" {	433	test "mem.split" {
434	var it = split(" abc def ghi ", " ");	434	var it = split(" abc def ghi ", " ");
435	assert(eql(u8, ??it.next(), "abc"));	435	assert(eql(u8, it.next().?, "abc"));
436	assert(eql(u8, ??it.next(), "def"));	436	assert(eql(u8, it.next().?, "def"));
437	assert(eql(u8, ??it.next(), "ghi"));	437	assert(eql(u8, it.next().?, "ghi"));
438	assert(it.next() == null);	438	assert(it.next() == null);
439	}	439	}
440		440

std/os/child_process.zig+9-9

std/os/index.zig+2-2

...	@@ -422,7 +422,7 @@ pub fn posixExecve(argv: []const []const u8, env_map: *const BufMap, allocator:	...	@@ -422,7 +422,7 @@ pub fn posixExecve(argv: []const []const u8, env_map: *const BufMap, allocator:
422		422
423	const exe_path = argv[0];	423	const exe_path = argv[0];
424	if (mem.indexOfScalar(u8, exe_path, '/') != null) {	424	if (mem.indexOfScalar(u8, exe_path, '/') != null) {
425	return posixExecveErrnoToErr(posix.getErrno(posix.execve(??argv_buf[0], argv_buf.ptr, envp_buf.ptr)));	425	return posixExecveErrnoToErr(posix.getErrno(posix.execve(argv_buf[0].?, argv_buf.ptr, envp_buf.ptr)));
426	}	426	}
427		427
428	const PATH = getEnvPosix("PATH") ?? "/usr/local/bin:/bin/:/usr/bin";	428	const PATH = getEnvPosix("PATH") ?? "/usr/local/bin:/bin/:/usr/bin";
...	@@ -1729,7 +1729,7 @@ test "windows arg parsing" {	...	@@ -1729,7 +1729,7 @@ test "windows arg parsing" {
1729	fn testWindowsCmdLine(input_cmd_line: [*]const u8, expected_args: []const []const u8) void {	1729	fn testWindowsCmdLine(input_cmd_line: [*]const u8, expected_args: []const []const u8) void {
1730	var it = ArgIteratorWindows.initWithCmdLine(input_cmd_line);	1730	var it = ArgIteratorWindows.initWithCmdLine(input_cmd_line);
1731	for (expected_args) \|expected_arg\| {	1731	for (expected_args) \|expected_arg\| {
1732	const arg = ??it.next(debug.global_allocator) catch unreachable;	1732	const arg = it.next(debug.global_allocator).? catch unreachable;
1733	assert(mem.eql(u8, arg, expected_arg));	1733	assert(mem.eql(u8, arg, expected_arg));
1734	}	1734	}
1735	assert(it.next(debug.global_allocator) == null);	1735	assert(it.next(debug.global_allocator) == null);

std/os/linux/vdso.zig+1-1

...	@@ -67,7 +67,7 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {	...	@@ -67,7 +67,7 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
67	if (0 == syms[i].st_shndx) continue;	67	if (0 == syms[i].st_shndx) continue;
68	if (!mem.eql(u8, name, cstr.toSliceConst(strings + syms[i].st_name))) continue;	68	if (!mem.eql(u8, name, cstr.toSliceConst(strings + syms[i].st_name))) continue;
69	if (maybe_versym) \|versym\| {	69	if (maybe_versym) \|versym\| {
70	if (!checkver(??maybe_verdef, versym[i], vername, strings))	70	if (!checkver(maybe_verdef.?, versym[i], vername, strings))
71	continue;	71	continue;
72	}	72	}
73	return base + syms[i].st_value;	73	return base + syms[i].st_value;

std/os/path.zig+4-4

std/segmented_list.zig+4-4

...	@@ -364,7 +364,7 @@ fn testSegmentedList(comptime prealloc: usize, allocator: *Allocator) !void {	...	@@ -364,7 +364,7 @@ fn testSegmentedList(comptime prealloc: usize, allocator: *Allocator) !void {
364	assert(x == 0);	364	assert(x == 0);
365	}	365	}
366		366
367	assert(??list.pop() == 100);	367	assert(list.pop().? == 100);
368	assert(list.len == 99);	368	assert(list.len == 99);
369		369
370	try list.pushMany([]i32{	370	try list.pushMany([]i32{
...	@@ -373,9 +373,9 @@ fn testSegmentedList(comptime prealloc: usize, allocator: *Allocator) !void {	...	@@ -373,9 +373,9 @@ fn testSegmentedList(comptime prealloc: usize, allocator: *Allocator) !void {
373	3,	373	3,
374	});	374	});
375	assert(list.len == 102);	375	assert(list.len == 102);
376	assert(??list.pop() == 3);	376	assert(list.pop().? == 3);
377	assert(??list.pop() == 2);	377	assert(list.pop().? == 2);
378	assert(??list.pop() == 1);	378	assert(list.pop().? == 1);
379	assert(list.len == 99);	379	assert(list.len == 99);
380		380
381	try list.pushMany([]const i32{});	381	try list.pushMany([]const i32{});

std/special/bootstrap.zig+3-3

...	@@ -54,10 +54,10 @@ fn posixCallMainAndExit() noreturn {	...	@@ -54,10 +54,10 @@ fn posixCallMainAndExit() noreturn {
54	const argc = argc_ptr[0];	54	const argc = argc_ptr[0];
55	const argv = @ptrCast([][]u8, argc_ptr + 1);	55	const argv = @ptrCast([][]u8, argc_ptr + 1);
56		56
57	const envp_nullable = @ptrCast([]?[]u8, argv + argc + 1);	57	const envp_optional = @ptrCast([]?[]u8, argv + argc + 1);
58	var envp_count: usize = 0;	58	var envp_count: usize = 0;
59	while (envp_nullable[envp_count]) \|_\| : (envp_count += 1) {}	59	while (envp_optional[envp_count]) \|_\| : (envp_count += 1) {}
60	const envp = @ptrCast([][]u8, envp_nullable)[0..envp_count];	60	const envp = @ptrCast([][]u8, envp_optional)[0..envp_count];
61	if (builtin.os == builtin.Os.linux) {	61	if (builtin.os == builtin.Os.linux) {
62	const auxv = @ptrCast([*]usize, envp.ptr + envp_count + 1);	62	const auxv = @ptrCast([*]usize, envp.ptr + envp_count + 1);
63	var i: usize = 0;	63	var i: usize = 0;

std/special/builtin.zig+4-4

...	@@ -19,7 +19,7 @@ export fn memset(dest: ?[]u8, c: u8, n: usize) ?[]u8 {	...	@@ -19,7 +19,7 @@ export fn memset(dest: ?[]u8, c: u8, n: usize) ?[]u8 {
19		19
20	var index: usize = 0;	20	var index: usize = 0;
21	while (index != n) : (index += 1)	21	while (index != n) : (index += 1)
22	(??dest)[index] = c;	22	dest.?[index] = c;
23		23
24	return dest;	24	return dest;
25	}	25	}
...	@@ -29,7 +29,7 @@ export fn memcpy(noalias dest: ?[]u8, noalias src: ?[]const u8, n: usize) ?[*]	...	@@ -29,7 +29,7 @@ export fn memcpy(noalias dest: ?[]u8, noalias src: ?[]const u8, n: usize) ?[*]
29		29
30	var index: usize = 0;	30	var index: usize = 0;
31	while (index != n) : (index += 1)	31	while (index != n) : (index += 1)
32	(??dest)[index] = (??src)[index];	32	dest.?[index] = src.?[index];
33		33
34	return dest;	34	return dest;
35	}	35	}
...	@@ -40,13 +40,13 @@ export fn memmove(dest: ?[]u8, src: ?[]const u8, n: usize) ?[*]u8 {	...	@@ -40,13 +40,13 @@ export fn memmove(dest: ?[]u8, src: ?[]const u8, n: usize) ?[*]u8 {
40	if (@ptrToInt(dest) < @ptrToInt(src)) {	40	if (@ptrToInt(dest) < @ptrToInt(src)) {
41	var index: usize = 0;	41	var index: usize = 0;
42	while (index != n) : (index += 1) {	42	while (index != n) : (index += 1) {
43	(??dest)[index] = (??src)[index];	43	dest.?[index] = src.?[index];
44	}	44	}
45	} else {	45	} else {
46	var index = n;	46	var index = n;
47	while (index != 0) {	47	while (index != 0) {
48	index -= 1;	48	index -= 1;
49	(??dest)[index] = (??src)[index];	49	dest.?[index] = src.?[index];
50	}	50	}
51	}	51	}
52		52

std/unicode.zig+12-12

...	@@ -286,15 +286,15 @@ fn testUtf8IteratorOnAscii() void {	...	@@ -286,15 +286,15 @@ fn testUtf8IteratorOnAscii() void {
286	const s = Utf8View.initComptime("abc");	286	const s = Utf8View.initComptime("abc");
287		287
288	var it1 = s.iterator();	288	var it1 = s.iterator();
289	debug.assert(std.mem.eql(u8, "a", ??it1.nextCodepointSlice()));	289	debug.assert(std.mem.eql(u8, "a", it1.nextCodepointSlice().?));
290	debug.assert(std.mem.eql(u8, "b", ??it1.nextCodepointSlice()));	290	debug.assert(std.mem.eql(u8, "b", it1.nextCodepointSlice().?));
291	debug.assert(std.mem.eql(u8, "c", ??it1.nextCodepointSlice()));	291	debug.assert(std.mem.eql(u8, "c", it1.nextCodepointSlice().?));
292	debug.assert(it1.nextCodepointSlice() == null);	292	debug.assert(it1.nextCodepointSlice() == null);
293		293
294	var it2 = s.iterator();	294	var it2 = s.iterator();
295	debug.assert(??it2.nextCodepoint() == 'a');	295	debug.assert(it2.nextCodepoint().? == 'a');
296	debug.assert(??it2.nextCodepoint() == 'b');	296	debug.assert(it2.nextCodepoint().? == 'b');
297	debug.assert(??it2.nextCodepoint() == 'c');	297	debug.assert(it2.nextCodepoint().? == 'c');
298	debug.assert(it2.nextCodepoint() == null);	298	debug.assert(it2.nextCodepoint() == null);
299	}	299	}
300		300
...	@@ -321,15 +321,15 @@ fn testUtf8ViewOk() void {	...	@@ -321,15 +321,15 @@ fn testUtf8ViewOk() void {
321	const s = Utf8View.initComptime("東京市");	321	const s = Utf8View.initComptime("東京市");
322		322
323	var it1 = s.iterator();	323	var it1 = s.iterator();
324	debug.assert(std.mem.eql(u8, "東", ??it1.nextCodepointSlice()));	324	debug.assert(std.mem.eql(u8, "東", it1.nextCodepointSlice().?));
325	debug.assert(std.mem.eql(u8, "京", ??it1.nextCodepointSlice()));	325	debug.assert(std.mem.eql(u8, "京", it1.nextCodepointSlice().?));
326	debug.assert(std.mem.eql(u8, "市", ??it1.nextCodepointSlice()));	326	debug.assert(std.mem.eql(u8, "市", it1.nextCodepointSlice().?));
327	debug.assert(it1.nextCodepointSlice() == null);	327	debug.assert(it1.nextCodepointSlice() == null);
328		328
329	var it2 = s.iterator();	329	var it2 = s.iterator();
330	debug.assert(??it2.nextCodepoint() == 0x6771);	330	debug.assert(it2.nextCodepoint().? == 0x6771);
331	debug.assert(??it2.nextCodepoint() == 0x4eac);	331	debug.assert(it2.nextCodepoint().? == 0x4eac);
332	debug.assert(??it2.nextCodepoint() == 0x5e02);	332	debug.assert(it2.nextCodepoint().? == 0x5e02);
333	debug.assert(it2.nextCodepoint() == null);	333	debug.assert(it2.nextCodepoint() == null);
334	}	334	}
335		335

std/zig/ast.zig+6-6

 @@ -1417,7 +1417,7 @@ pub const Node = struct {
             Range,
             Sub,
             SubWrap,
-            UnwrapMaybe,
+            UnwrapOptional,
         };
         pub fn iterate(self: *InfixOp, index: usize) ?*Node {
 @@ -1475,7 +1475,7 @@ pub const Node = struct {
                 Op.Range,
                 Op.Sub,
                 Op.SubWrap,
-                Op.UnwrapMaybe,
+                Op.UnwrapOptional,
                 => {},
             }
 @@ -1507,14 +1507,13 @@ pub const Node = struct {
             BitNot,
             BoolNot,
             Cancel,
-            MaybeType,
+            OptionalType,
             Negation,
             NegationWrap,
             Resume,
             PtrType: PtrInfo,
             SliceType: PtrInfo,
             Try,
-            UnwrapMaybe,
         };
         pub const PtrInfo = struct {
 @@ -1557,12 +1556,12 @@ pub const Node = struct {
                 Op.BitNot,
                 Op.BoolNot,
                 Op.Cancel,
-                Op.MaybeType,
+                Op.OptionalType,
                 Op.Negation,
                 Op.NegationWrap,
                 Op.Try,
                 Op.Resume,
-                Op.UnwrapMaybe,
+                Op.UnwrapOptional,
                 Op.PointerType,
                 => {},
             }
 @@ -1619,6 +1618,7 @@ pub const Node = struct {
             ArrayInitializer: InitList,
             StructInitializer: InitList,
             Deref,
+            UnwrapOptional,
             pub const InitList = SegmentedList(*Node, 2);

std/zig/parse.zig+22-13

...	@@ -711,7 +711,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {	...	@@ -711,7 +711,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
711	else => {	711	else => {
712	// TODO: this is a special case. Remove this when #760 is fixed	712	// TODO: this is a special case. Remove this when #760 is fixed
713	if (token_ptr.id == Token.Id.Keyword_error) {	713	if (token_ptr.id == Token.Id.Keyword_error) {
714	if ((??tok_it.peek()).id == Token.Id.LBrace) {	714	if (tok_it.peek().?.id == Token.Id.LBrace) {
715	const error_type_node = try arena.construct(ast.Node.ErrorType{	715	const error_type_node = try arena.construct(ast.Node.ErrorType{
716	.base = ast.Node{ .id = ast.Node.Id.ErrorType },	716	.base = ast.Node{ .id = ast.Node.Id.ErrorType },
717	.token = token_index,	717	.token = token_index,
...	@@ -1434,8 +1434,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {	...	@@ -1434,8 +1434,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
1434	try stack.append(State{	1434	try stack.append(State{
1435	.ExpectTokenSave = ExpectTokenSave{	1435	.ExpectTokenSave = ExpectTokenSave{
1436	.id = Token.Id.AngleBracketRight,	1436	.id = Token.Id.AngleBracketRight,
1437	.ptr = &??async_node.rangle_bracket,	1437	.ptr = &async_node.rangle_bracket.? },
1438	},
1439	});	1438	});
1440	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .RequiredNull = &async_node.allocator_type } });	1439	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .RequiredNull = &async_node.allocator_type } });
1441	continue;	1440	continue;
...	@@ -1567,7 +1566,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {	...	@@ -1567,7 +1566,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
1567	.bit_range = null,	1566	.bit_range = null,
1568	};	1567	};
1569	// TODO https://github.com/ziglang/zig/issues/1022	1568	// TODO https://github.com/ziglang/zig/issues/1022
1570	const align_info = &??addr_of_info.align_info;	1569	const align_info = &addr_of_info.align_info.?;
1571		1570
1572	try stack.append(State{ .AlignBitRange = align_info });	1571	try stack.append(State{ .AlignBitRange = align_info });
1573	try stack.append(State{ .Expression = OptionalCtx{ .Required = &align_info.node } });	1572	try stack.append(State{ .Expression = OptionalCtx{ .Required = &align_info.node } });
...	@@ -1604,7 +1603,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {	...	@@ -1604,7 +1603,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
1604	switch (token.ptr.id) {	1603	switch (token.ptr.id) {
1605	Token.Id.Colon => {	1604	Token.Id.Colon => {
1606	align_info.bit_range = ast.Node.PrefixOp.PtrInfo.Align.BitRange(undefined);	1605	align_info.bit_range = ast.Node.PrefixOp.PtrInfo.Align.BitRange(undefined);
1607	const bit_range = &??align_info.bit_range;	1606	const bit_range = &align_info.bit_range.?;
1608		1607
1609	try stack.append(State{ .ExpectToken = Token.Id.RParen });	1608	try stack.append(State{ .ExpectToken = Token.Id.RParen });
1610	try stack.append(State{ .Expression = OptionalCtx{ .Required = &bit_range.end } });	1609	try stack.append(State{ .Expression = OptionalCtx{ .Required = &bit_range.end } });
...	@@ -2144,7 +2143,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {	...	@@ -2144,7 +2143,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
2144	State.CurlySuffixExpressionEnd => \|opt_ctx\| {	2143	State.CurlySuffixExpressionEnd => \|opt_ctx\| {
2145	const lhs = opt_ctx.get() ?? continue;	2144	const lhs = opt_ctx.get() ?? continue;
2146		2145
2147	if ((??tok_it.peek()).id == Token.Id.Period) {	2146	if (tok_it.peek().?.id == Token.Id.Period) {
2148	const node = try arena.construct(ast.Node.SuffixOp{	2147	const node = try arena.construct(ast.Node.SuffixOp{
2149	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },	2148	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },
2150	.lhs = lhs,	2149	.lhs = lhs,
...	@@ -2326,6 +2325,17 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {	...	@@ -2326,6 +2325,17 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
2326	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;	2325	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2327	continue;	2326	continue;
2328	}	2327	}
		2328	if (eatToken(&tok_it, &tree, Token.Id.QuestionMark)) \|question_token\| {
		2329	const node = try arena.construct(ast.Node.SuffixOp{
		2330	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },
		2331	.lhs = lhs,
		2332	.op = ast.Node.SuffixOp.Op.UnwrapOptional,
		2333	.rtoken = question_token,
		2334	});
		2335	opt_ctx.store(&node.base);
		2336	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
		2337	continue;
		2338	}
2329	const node = try arena.construct(ast.Node.InfixOp{	2339	const node = try arena.construct(ast.Node.InfixOp{
2330	.base = ast.Node{ .id = ast.Node.Id.InfixOp },	2340	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
2331	.lhs = lhs,	2341	.lhs = lhs,
...	@@ -2403,7 +2413,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {	...	@@ -2403,7 +2413,7 @@ pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
2403	.arrow_token = next_token_index,	2413	.arrow_token = next_token_index,
2404	.return_type = undefined,	2414	.return_type = undefined,
2405	};	2415	};
2406	const return_type_ptr = &((??node.result).return_type);	2416	const return_type_ptr = &node.result.?.return_type;
2407	try stack.append(State{ .Expression = OptionalCtx{ .Required = return_type_ptr } });	2417	try stack.append(State{ .Expression = OptionalCtx{ .Required = return_type_ptr } });
2408	continue;	2418	continue;
2409	},	2419	},
...	@@ -2875,7 +2885,7 @@ const OptionalCtx = union(enum) {	...	@@ -2875,7 +2885,7 @@ const OptionalCtx = union(enum) {
2875	pub fn get(self: const OptionalCtx) ?ast.Node {	2885	pub fn get(self: const OptionalCtx) ?ast.Node {
2876	switch (self.*) {	2886	switch (self.*) {
2877	OptionalCtx.Optional => \|ptr\| return ptr.*,	2887	OptionalCtx.Optional => \|ptr\| return ptr.*,
2878	OptionalCtx.RequiredNull => \|ptr\| return ??ptr.*,	2888	OptionalCtx.RequiredNull => \|ptr\| return ptr.*.?,
2879	OptionalCtx.Required => \|ptr\| return ptr.*,	2889	OptionalCtx.Required => \|ptr\| return ptr.*,
2880	}	2890	}
2881	}	2891	}
...	@@ -3237,7 +3247,7 @@ fn tokenIdToAssignment(id: *const Token.Id) ?ast.Node.InfixOp.Op {	...	@@ -3237,7 +3247,7 @@ fn tokenIdToAssignment(id: *const Token.Id) ?ast.Node.InfixOp.Op {
3237	fn tokenIdToUnwrapExpr(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {	3247	fn tokenIdToUnwrapExpr(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {
3238	return switch (id) {	3248	return switch (id) {
3239	Token.Id.Keyword_catch => ast.Node.InfixOp.Op{ .Catch = null },	3249	Token.Id.Keyword_catch => ast.Node.InfixOp.Op{ .Catch = null },
3240	Token.Id.QuestionMarkQuestionMark => ast.Node.InfixOp.Op{ .UnwrapMaybe = void{} },	3250	Token.Id.QuestionMarkQuestionMark => ast.Node.InfixOp.Op{ .UnwrapOptional = void{} },
3241	else => null,	3251	else => null,
3242	};	3252	};
3243	}	3253	}
...	@@ -3299,8 +3309,7 @@ fn tokenIdToPrefixOp(id: @TagType(Token.Id)) ?ast.Node.PrefixOp.Op {	...	@@ -3299,8 +3309,7 @@ fn tokenIdToPrefixOp(id: @TagType(Token.Id)) ?ast.Node.PrefixOp.Op {
3299	.volatile_token = null,	3309	.volatile_token = null,
3300	},	3310	},
3301	},	3311	},
3302	Token.Id.QuestionMark => ast.Node.PrefixOp.Op{ .MaybeType = void{} },	3312	Token.Id.QuestionMark => ast.Node.PrefixOp.Op{ .OptionalType = void{} },
3303	Token.Id.QuestionMarkQuestionMark => ast.Node.PrefixOp.Op{ .UnwrapMaybe = void{} },
3304	Token.Id.Keyword_await => ast.Node.PrefixOp.Op{ .Await = void{} },	3313	Token.Id.Keyword_await => ast.Node.PrefixOp.Op{ .Await = void{} },
3305	Token.Id.Keyword_try => ast.Node.PrefixOp.Op{ .Try = void{} },	3314	Token.Id.Keyword_try => ast.Node.PrefixOp.Op{ .Try = void{} },
3306	else => null,	3315	else => null,
...	@@ -3322,7 +3331,7 @@ fn createToCtxLiteral(arena: mem.Allocator, opt_ctx: const OptionalCtx, compti	...	@@ -3322,7 +3331,7 @@ fn createToCtxLiteral(arena: mem.Allocator, opt_ctx: const OptionalCtx, compti
3322	}	3331	}
3323		3332
3324	fn eatToken(tok_it: ast.Tree.TokenList.Iterator, tree: ast.Tree, id: @TagType(Token.Id)) ?TokenIndex {	3333	fn eatToken(tok_it: ast.Tree.TokenList.Iterator, tree: ast.Tree, id: @TagType(Token.Id)) ?TokenIndex {
3325	const token = ??tok_it.peek();	3334	const token = tok_it.peek().?;
3326		3335
3327	if (token.id == id) {	3336	if (token.id == id) {
3328	return nextToken(tok_it, tree).index;	3337	return nextToken(tok_it, tree).index;
...	@@ -3334,7 +3343,7 @@ fn eatToken(tok_it: ast.Tree.TokenList.Iterator, tree: ast.Tree, id: @TagType(	...	@@ -3334,7 +3343,7 @@ fn eatToken(tok_it: ast.Tree.TokenList.Iterator, tree: ast.Tree, id: @TagType(
3334	fn nextToken(tok_it: ast.Tree.TokenList.Iterator, tree: ast.Tree) AnnotatedToken {	3343	fn nextToken(tok_it: ast.Tree.TokenList.Iterator, tree: ast.Tree) AnnotatedToken {
3335	const result = AnnotatedToken{	3344	const result = AnnotatedToken{
3336	.index = tok_it.index,	3345	.index = tok_it.index,
3337	.ptr = ??tok_it.next(),	3346	.ptr = tok_it.next().?,
3338	};	3347	};
3339	assert(result.ptr.id != Token.Id.LineComment);	3348	assert(result.ptr.id != Token.Id.LineComment);
3340		3349

std/zig/parser_test.zig+3-2

...	@@ -650,9 +650,10 @@ test "zig fmt: statements with empty line between" {	...	@@ -650,9 +650,10 @@ test "zig fmt: statements with empty line between" {
650	);	650	);
651	}	651	}
652		652
653	test "zig fmt: ptr deref operator" {	653	test "zig fmt: ptr deref operator and unwrap optional operator" {
654	try testCanonical(	654	try testCanonical(
655	\\const a = b.*;	655	\\const a = b.*;
		656	\\const a = b.?;
656	\\	657	\\
657	);	658	);
658	}	659	}
...	@@ -1209,7 +1210,7 @@ test "zig fmt: precedence" {	...	@@ -1209,7 +1210,7 @@ test "zig fmt: precedence" {
1209	test "zig fmt: prefix operators" {	1210	test "zig fmt: prefix operators" {
1210	try testCanonical(	1211	try testCanonical(
1211	\\test "prefix operators" {	1212	\\test "prefix operators" {
1212	\\ try return --%~??!*&0;	1213	\\ try return --%~!*&0;
1213	\\}	1214	\\}
1214	\\	1215	\\
1215	);	1216	);

std/zig/render.zig+12-13

test/cases/bugs/656.zig+1-1

...	@@ -9,7 +9,7 @@ const Value = struct {	...	@@ -9,7 +9,7 @@ const Value = struct {
9	align_expr: ?u32,	9	align_expr: ?u32,
10	};	10	};
11		11
12	test "nullable if after an if in a switch prong of a switch with 2 prongs in an else" {	12	test "optional if after an if in a switch prong of a switch with 2 prongs in an else" {
13	foo(false, true);	13	foo(false, true);
14	}	14	}
15		15

test/cases/cast.zig+25-25

...	@@ -109,16 +109,16 @@ test "implicitly cast indirect pointer to maybe-indirect pointer" {	...	@@ -109,16 +109,16 @@ test "implicitly cast indirect pointer to maybe-indirect pointer" {
109	const Self = this;	109	const Self = this;
110	x: u8,	110	x: u8,
111	fn constConst(p: const const Self) u8 {	111	fn constConst(p: const const Self) u8 {
112	return (p.*).x;	112	return p.*.x;
113	}	113	}
114	fn maybeConstConst(p: ?const const Self) u8 {	114	fn maybeConstConst(p: ?const const Self) u8 {
115	return ((??p).*).x;	115	return p.?.*.x;
116	}	116	}
117	fn constConstConst(p: const const *const Self) u8 {	117	fn constConstConst(p: const const *const Self) u8 {
118	return (p..).x;	118	return p...x;
119	}	119	}
120	fn maybeConstConstConst(p: ?const const *const Self) u8 {	120	fn maybeConstConstConst(p: ?const const *const Self) u8 {
121	return ((??p)..).x;	121	return p.?...x;
122	}	122	}
123	};	123	};
124	const s = S{ .x = 42 };	124	const s = S{ .x = 42 };
...	@@ -177,56 +177,56 @@ test "string literal to &const []const u8" {	...	@@ -177,56 +177,56 @@ test "string literal to &const []const u8" {
177	}	177	}
178		178
179	test "implicitly cast from T to error!?T" {	179	test "implicitly cast from T to error!?T" {
180	castToMaybeTypeError(1);	180	castToOptionalTypeError(1);
181	comptime castToMaybeTypeError(1);	181	comptime castToOptionalTypeError(1);
182	}	182	}
183	const A = struct {	183	const A = struct {
184	a: i32,	184	a: i32,
185	};	185	};
186	fn castToMaybeTypeError(z: i32) void {	186	fn castToOptionalTypeError(z: i32) void {
187	const x = i32(1);	187	const x = i32(1);
188	const y: error!?i32 = x;	188	const y: error!?i32 = x;
189	assert(??(try y) == 1);	189	assert((try y).? == 1);
190		190
191	const f = z;	191	const f = z;
192	const g: error!?i32 = f;	192	const g: error!?i32 = f;
193		193
194	const a = A{ .a = z };	194	const a = A{ .a = z };
195	const b: error!?A = a;	195	const b: error!?A = a;
196	assert((??(b catch unreachable)).a == 1);	196	assert((b catch unreachable).?.a == 1);
197	}	197	}
198		198
199	test "implicitly cast from int to error!?T" {	199	test "implicitly cast from int to error!?T" {
200	implicitIntLitToMaybe();	200	implicitIntLitToOptional();
201	comptime implicitIntLitToMaybe();	201	comptime implicitIntLitToOptional();
202	}	202	}
203	fn implicitIntLitToMaybe() void {	203	fn implicitIntLitToOptional() void {
204	const f: ?i32 = 1;	204	const f: ?i32 = 1;
205	const g: error!?i32 = 1;	205	const g: error!?i32 = 1;
206	}	206	}
207		207
208	test "return null from fn() error!?&T" {	208	test "return null from fn() error!?&T" {
209	const a = returnNullFromMaybeTypeErrorRef();	209	const a = returnNullFromOptionalTypeErrorRef();
210	const b = returnNullLitFromMaybeTypeErrorRef();	210	const b = returnNullLitFromOptionalTypeErrorRef();
211	assert((try a) == null and (try b) == null);	211	assert((try a) == null and (try b) == null);
212	}	212	}
213	fn returnNullFromMaybeTypeErrorRef() error!?*A {	213	fn returnNullFromOptionalTypeErrorRef() error!?*A {
214	const a: ?*A = null;	214	const a: ?*A = null;
215	return a;	215	return a;
216	}	216	}
217	fn returnNullLitFromMaybeTypeErrorRef() error!?*A {	217	fn returnNullLitFromOptionalTypeErrorRef() error!?*A {
218	return null;	218	return null;
219	}	219	}
220		220
221	test "peer type resolution: ?T and T" {	221	test "peer type resolution: ?T and T" {
222	assert(??peerTypeTAndMaybeT(true, false) == 0);	222	assert(peerTypeTAndOptionalT(true, false).? == 0);
223	assert(??peerTypeTAndMaybeT(false, false) == 3);	223	assert(peerTypeTAndOptionalT(false, false).? == 3);
224	comptime {	224	comptime {
225	assert(??peerTypeTAndMaybeT(true, false) == 0);	225	assert(peerTypeTAndOptionalT(true, false).? == 0);
226	assert(??peerTypeTAndMaybeT(false, false) == 3);	226	assert(peerTypeTAndOptionalT(false, false).? == 3);
227	}	227	}
228	}	228	}
229	fn peerTypeTAndMaybeT(c: bool, b: bool) ?usize {	229	fn peerTypeTAndOptionalT(c: bool, b: bool) ?usize {
230	if (c) {	230	if (c) {
231	return if (b) null else usize(0);	231	return if (b) null else usize(0);
232	}	232	}
...	@@ -251,11 +251,11 @@ fn peerTypeEmptyArrayAndSlice(a: bool, slice: []const u8) []const u8 {	...	@@ -251,11 +251,11 @@ fn peerTypeEmptyArrayAndSlice(a: bool, slice: []const u8) []const u8 {
251	}	251	}
252		252
253	test "implicitly cast from [N]T to ?[]const T" {	253	test "implicitly cast from [N]T to ?[]const T" {
254	assert(mem.eql(u8, ??castToMaybeSlice(), "hi"));	254	assert(mem.eql(u8, castToOptionalSlice().?, "hi"));
255	comptime assert(mem.eql(u8, ??castToMaybeSlice(), "hi"));	255	comptime assert(mem.eql(u8, castToOptionalSlice().?, "hi"));
256	}	256	}
257		257
258	fn castToMaybeSlice() ?[]const u8 {	258	fn castToOptionalSlice() ?[]const u8 {
259	return "hi";	259	return "hi";
260	}	260	}
261		261
...	@@ -404,5 +404,5 @@ fn testCastPtrOfArrayToSliceAndPtr() void {	...	@@ -404,5 +404,5 @@ fn testCastPtrOfArrayToSliceAndPtr() void {
404	test "cast [1][]const u8 to []const ?[]const u8" {	404	test "cast [1][]const u8 to []const ?[]const u8" {
405	const window_name = [1][*]const u8{c"window name"};	405	const window_name = [1][*]const u8{c"window name"};
406	const x: []const ?[]const u8 = &window_name;	406	const x: []const ?[]const u8 = &window_name;
407	assert(mem.eql(u8, std.cstr.toSliceConst(??x[0]), "window name"));	407	assert(mem.eql(u8, std.cstr.toSliceConst(x[0].?), "window name"));
408	}	408	}

test/cases/error.zig+1-1

...	@@ -140,7 +140,7 @@ fn testComptimeTestErrorEmptySet(x: EmptyErrorSet!i32) void {	...	@@ -140,7 +140,7 @@ fn testComptimeTestErrorEmptySet(x: EmptyErrorSet!i32) void {
140	if (x) \|v\| assert(v == 1234) else \|err\| @compileError("bad");	140	if (x) \|v\| assert(v == 1234) else \|err\| @compileError("bad");
141	}	141	}
142		142
143	test "syntax: nullable operator in front of error union operator" {	143	test "syntax: optional operator in front of error union operator" {
144	comptime {	144	comptime {
145	assert(?error!i32 == ?(error!i32));	145	assert(?error!i32 == ?(error!i32));
146	}	146	}

test/cases/eval.zig+1-1

...	@@ -12,7 +12,7 @@ fn fibonacci(x: i32) i32 {	...	@@ -12,7 +12,7 @@ fn fibonacci(x: i32) i32 {
12	}	12	}
13		13
14	fn unwrapAndAddOne(blah: ?i32) i32 {	14	fn unwrapAndAddOne(blah: ?i32) i32 {
15	return ??blah + 1;	15	return blah.? + 1;
16	}	16	}
17	const should_be_1235 = unwrapAndAddOne(1234);	17	const should_be_1235 = unwrapAndAddOne(1234);
18	test "static add one" {	18	test "static add one" {

test/cases/generics.zig+1-1

...	@@ -127,7 +127,7 @@ test "generic fn with implicit cast" {	...	@@ -127,7 +127,7 @@ test "generic fn with implicit cast" {
127	}) == 0);	127	}) == 0);
128	}	128	}
129	fn getByte(ptr: ?*const u8) u8 {	129	fn getByte(ptr: ?*const u8) u8 {
130	return (??ptr).*;	130	return ptr.?.*;
131	}	131	}
132	fn getFirstByte(comptime T: type, mem: []const T) u8 {	132	fn getFirstByte(comptime T: type, mem: []const T) u8 {
133	return getByte(@ptrCast(*const u8, &mem[0]));	133	return getByte(@ptrCast(*const u8, &mem[0]));

test/cases/misc.zig+1-1

...	@@ -505,7 +505,7 @@ test "@typeId" {	...	@@ -505,7 +505,7 @@ test "@typeId" {
505	assert(@typeId(@typeOf(1.0)) == Tid.ComptimeFloat);	505	assert(@typeId(@typeOf(1.0)) == Tid.ComptimeFloat);
506	assert(@typeId(@typeOf(undefined)) == Tid.Undefined);	506	assert(@typeId(@typeOf(undefined)) == Tid.Undefined);
507	assert(@typeId(@typeOf(null)) == Tid.Null);	507	assert(@typeId(@typeOf(null)) == Tid.Null);
508	assert(@typeId(?i32) == Tid.Nullable);	508	assert(@typeId(?i32) == Tid.Optional);
509	assert(@typeId(error!i32) == Tid.ErrorUnion);	509	assert(@typeId(error!i32) == Tid.ErrorUnion);
510	assert(@typeId(error) == Tid.ErrorSet);	510	assert(@typeId(error) == Tid.ErrorSet);
511	assert(@typeId(AnEnum) == Tid.Enum);	511	assert(@typeId(AnEnum) == Tid.Enum);

test/cases/null.zig+15-15

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const assert = @import("std").debug.assert;	1	const assert = @import("std").debug.assert;
2		2
3	test "nullable type" {	3	test "optional type" {
4	const x: ?bool = true;	4	const x: ?bool = true;
5		5
6	if (x) \|y\| {	6	if (x) \|y\| {
...	@@ -33,7 +33,7 @@ test "test maybe object and get a pointer to the inner value" {	...	@@ -33,7 +33,7 @@ test "test maybe object and get a pointer to the inner value" {
33	b.* = false;	33	b.* = false;
34	}	34	}
35		35
36	assert(??maybe_bool == false);	36	assert(maybe_bool.? == false);
37	}	37	}
38		38
39	test "rhs maybe unwrap return" {	39	test "rhs maybe unwrap return" {
...	@@ -47,9 +47,9 @@ test "maybe return" {	...	@@ -47,9 +47,9 @@ test "maybe return" {
47	}	47	}
48		48
49	fn maybeReturnImpl() void {	49	fn maybeReturnImpl() void {
50	assert(??foo(1235));	50	assert(foo(1235).?);
51	if (foo(null) != null) unreachable;	51	if (foo(null) != null) unreachable;
52	assert(!??foo(1234));	52	assert(!foo(1234).?);
53	}	53	}
54		54
55	fn foo(x: ?i32) ?bool {	55	fn foo(x: ?i32) ?bool {
...	@@ -102,12 +102,12 @@ fn testTestNullRuntime(x: ?i32) void {	...	@@ -102,12 +102,12 @@ fn testTestNullRuntime(x: ?i32) void {
102	assert(!(x != null));	102	assert(!(x != null));
103	}	103	}
104		104
105	test "nullable void" {	105	test "optional void" {
106	nullableVoidImpl();	106	optionalVoidImpl();
107	comptime nullableVoidImpl();	107	comptime optionalVoidImpl();
108	}	108	}
109		109
110	fn nullableVoidImpl() void {	110	fn optionalVoidImpl() void {
111	assert(bar(null) == null);	111	assert(bar(null) == null);
112	assert(bar({}) != null);	112	assert(bar({}) != null);
113	}	113	}
...	@@ -120,19 +120,19 @@ fn bar(x: ?void) ?void {	...	@@ -120,19 +120,19 @@ fn bar(x: ?void) ?void {
120	}	120	}
121	}	121	}
122		122
123	const StructWithNullable = struct {	123	const StructWithOptional = struct {
124	field: ?i32,	124	field: ?i32,
125	};	125	};
126		126
127	var struct_with_nullable: StructWithNullable = undefined;	127	var struct_with_optional: StructWithOptional = undefined;
128		128
129	test "unwrap nullable which is field of global var" {	129	test "unwrap optional which is field of global var" {
130	struct_with_nullable.field = null;	130	struct_with_optional.field = null;
131	if (struct_with_nullable.field) \|payload\| {	131	if (struct_with_optional.field) \|payload\| {
132	unreachable;	132	unreachable;
133	}	133	}
134	struct_with_nullable.field = 1234;	134	struct_with_optional.field = 1234;
135	if (struct_with_nullable.field) \|payload\| {	135	if (struct_with_optional.field) \|payload\| {
136	assert(payload == 1234);	136	assert(payload == 1234);
137	} else {	137	} else {
138	unreachable;	138	unreachable;

test/cases/reflection.zig+1-1

...	@@ -2,7 +2,7 @@ const assert = @import("std").debug.assert;	...	@@ -2,7 +2,7 @@ const assert = @import("std").debug.assert;
2	const mem = @import("std").mem;	2	const mem = @import("std").mem;
3	const reflection = this;	3	const reflection = this;
4		4
5	test "reflection: array, pointer, nullable, error union type child" {	5	test "reflection: array, pointer, optional, error union type child" {
6	comptime {	6	comptime {
7	assert(([10]u8).Child == u8);	7	assert(([10]u8).Child == u8);
8	assert((*u8).Child == u8);	8	assert((*u8).Child == u8);

test/cases/type_info.zig+7-7

...	@@ -88,15 +88,15 @@ fn testArray() void {	...	@@ -88,15 +88,15 @@ fn testArray() void {
88	assert(arr_info.Array.child == bool);	88	assert(arr_info.Array.child == bool);
89	}	89	}
90		90
91	test "type info: nullable type info" {	91	test "type info: optional type info" {
92	testNullable();	92	testOptional();
93	comptime testNullable();	93	comptime testOptional();
94	}	94	}
95		95
96	fn testNullable() void {	96	fn testOptional() void {
97	const null_info = @typeInfo(?void);	97	const null_info = @typeInfo(?void);
98	assert(TypeId(null_info) == TypeId.Nullable);	98	assert(TypeId(null_info) == TypeId.Optional);
99	assert(null_info.Nullable.child == void);	99	assert(null_info.Optional.child == void);
100	}	100	}
101		101
102	test "type info: promise info" {	102	test "type info: promise info" {
...	@@ -168,7 +168,7 @@ fn testUnion() void {	...	@@ -168,7 +168,7 @@ fn testUnion() void {
168	assert(typeinfo_info.Union.tag_type == TypeId);	168	assert(typeinfo_info.Union.tag_type == TypeId);
169	assert(typeinfo_info.Union.fields.len == 25);	169	assert(typeinfo_info.Union.fields.len == 25);
170	assert(typeinfo_info.Union.fields[4].enum_field != null);	170	assert(typeinfo_info.Union.fields[4].enum_field != null);
171	assert((??typeinfo_info.Union.fields[4].enum_field).value == 4);	171	assert(typeinfo_info.Union.fields[4].enum_field.?.value == 4);
172	assert(typeinfo_info.Union.fields[4].field_type == @typeOf(@typeInfo(u8).Int));	172	assert(typeinfo_info.Union.fields[4].field_type == @typeOf(@typeInfo(u8).Int));
173	assert(typeinfo_info.Union.defs.len == 20);	173	assert(typeinfo_info.Union.defs.len == 20);
174		174

test/cases/while.zig+6-6

...	@@ -81,7 +81,7 @@ test "while with else" {	...	@@ -81,7 +81,7 @@ test "while with else" {
81	assert(got_else == 1);	81	assert(got_else == 1);
82	}	82	}
83		83
84	test "while with nullable as condition" {	84	test "while with optional as condition" {
85	numbers_left = 10;	85	numbers_left = 10;
86	var sum: i32 = 0;	86	var sum: i32 = 0;
87	while (getNumberOrNull()) \|value\| {	87	while (getNumberOrNull()) \|value\| {
...	@@ -90,7 +90,7 @@ test "while with nullable as condition" {	...	@@ -90,7 +90,7 @@ test "while with nullable as condition" {
90	assert(sum == 45);	90	assert(sum == 45);
91	}	91	}
92		92
93	test "while with nullable as condition with else" {	93	test "while with optional as condition with else" {
94	numbers_left = 10;	94	numbers_left = 10;
95	var sum: i32 = 0;	95	var sum: i32 = 0;
96	var got_else: i32 = 0;	96	var got_else: i32 = 0;
...	@@ -132,7 +132,7 @@ fn getNumberOrNull() ?i32 {	...	@@ -132,7 +132,7 @@ fn getNumberOrNull() ?i32 {
132	};	132	};
133	}	133	}
134		134
135	test "while on nullable with else result follow else prong" {	135	test "while on optional with else result follow else prong" {
136	const result = while (returnNull()) \|value\| {	136	const result = while (returnNull()) \|value\| {
137	break value;	137	break value;
138	} else	138	} else
...	@@ -140,8 +140,8 @@ test "while on nullable with else result follow else prong" {	...	@@ -140,8 +140,8 @@ test "while on nullable with else result follow else prong" {
140	assert(result == 2);	140	assert(result == 2);
141	}	141	}
142		142
143	test "while on nullable with else result follow break prong" {	143	test "while on optional with else result follow break prong" {
144	const result = while (returnMaybe(10)) \|value\| {	144	const result = while (returnOptional(10)) \|value\| {
145	break value;	145	break value;
146	} else	146	} else
147	i32(2);	147	i32(2);
...	@@ -210,7 +210,7 @@ fn testContinueOuter() void {	...	@@ -210,7 +210,7 @@ fn testContinueOuter() void {
210	fn returnNull() ?i32 {	210	fn returnNull() ?i32 {
211	return null;	211	return null;
212	}	212	}
213	fn returnMaybe(x: i32) ?i32 {	213	fn returnOptional(x: i32) ?i32 {
214	return x;	214	return x;
215	}	215	}
216	fn returnError() error!i32 {	216	fn returnError() error!i32 {

test/compile_errors.zig+8-8

...	@@ -1341,7 +1341,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {	...	@@ -1341,7 +1341,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
1341	\\ if (true) \|x\| { }	1341	\\ if (true) \|x\| { }
1342	\\}	1342	\\}
1343	,	1343	,
1344	".tmp_source.zig:2:9: error: expected nullable type, found 'bool'",	1344	".tmp_source.zig:2:9: error: expected optional type, found 'bool'",
1345	);	1345	);
1346		1346
1347	cases.add(	1347	cases.add(
...	@@ -1780,7 +1780,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {	...	@@ -1780,7 +1780,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
1780	);	1780	);
1781		1781
1782	cases.add(	1782	cases.add(
1783	"assign null to non-nullable pointer",	1783	"assign null to non-optional pointer",
1784	\\const a: *u8 = null;	1784	\\const a: *u8 = null;
1785	\\	1785	\\
1786	\\export fn entry() usize { return @sizeOf(@typeOf(a)); }	1786	\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
...	@@ -2817,7 +2817,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {	...	@@ -2817,7 +2817,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
2817	);	2817	);
2818		2818
2819	cases.add(	2819	cases.add(
2820	"while expected bool, got nullable",	2820	"while expected bool, got optional",
2821	\\export fn foo() void {	2821	\\export fn foo() void {
2822	\\ while (bar()) {}	2822	\\ while (bar()) {}
2823	\\}	2823	\\}
...	@@ -2837,23 +2837,23 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {	...	@@ -2837,23 +2837,23 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
2837	);	2837	);
2838		2838
2839	cases.add(	2839	cases.add(
2840	"while expected nullable, got bool",	2840	"while expected optional, got bool",
2841	\\export fn foo() void {	2841	\\export fn foo() void {
2842	\\ while (bar()) \|x\| {}	2842	\\ while (bar()) \|x\| {}
2843	\\}	2843	\\}
2844	\\fn bar() bool { return true; }	2844	\\fn bar() bool { return true; }
2845	,	2845	,
2846	".tmp_source.zig:2:15: error: expected nullable type, found 'bool'",	2846	".tmp_source.zig:2:15: error: expected optional type, found 'bool'",
2847	);	2847	);
2848		2848
2849	cases.add(	2849	cases.add(
2850	"while expected nullable, got error union",	2850	"while expected optional, got error union",
2851	\\export fn foo() void {	2851	\\export fn foo() void {
2852	\\ while (bar()) \|x\| {}	2852	\\ while (bar()) \|x\| {}
2853	\\}	2853	\\}
2854	\\fn bar() error!i32 { return 1; }	2854	\\fn bar() error!i32 { return 1; }
2855	,	2855	,
2856	".tmp_source.zig:2:15: error: expected nullable type, found 'error!i32'",	2856	".tmp_source.zig:2:15: error: expected optional type, found 'error!i32'",
2857	);	2857	);
2858		2858
2859	cases.add(	2859	cases.add(
...	@@ -2867,7 +2867,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {	...	@@ -2867,7 +2867,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
2867	);	2867	);
2868		2868
2869	cases.add(	2869	cases.add(
2870	"while expected error union, got nullable",	2870	"while expected error union, got optional",
2871	\\export fn foo() void {	2871	\\export fn foo() void {
2872	\\ while (bar()) \|x\| {} else \|err\| {}	2872	\\ while (bar()) \|x\| {} else \|err\| {}
2873	\\}	2873	\\}

test/tests.zig+6-6

author	Andrew Kelley <andrew@ziglang.org> 2018-06-09 23:42:14-04:00
committer	GitHub <noreply@github.com> 2018-06-09 23:42:14-04:00
log	ec1b6f66737f8c3cbc0420715c2c502c7e710081
tree	495aa343982b191149988291901dd6520e757699
parent	d464b2532200de3778ac7362e701791a11150d55
signature	Signed by PGP key 4AEE18F83AFDEB23

...	@@ -99,7 +99,7 @@ pub const Args = struct {	...	@@ -99,7 +99,7 @@ pub const Args = struct {
99	error.ArgumentNotInAllowedSet => {	99	error.ArgumentNotInAllowedSet => {
100	std.debug.warn("argument '{}' is invalid for flag '{}'\n", args[i], arg);	100	std.debug.warn("argument '{}' is invalid for flag '{}'\n", args[i], arg);
101	std.debug.warn("allowed options are ");	101	std.debug.warn("allowed options are ");
102	for (??flag.allowed_set) \|possible\| {	102	for (flag.allowed_set.?) \|possible\| {
103	std.debug.warn("'{}' ", possible);	103	std.debug.warn("'{}' ", possible);
104	}	104	}
105	std.debug.warn("\n");	105	std.debug.warn("\n");
...	@@ -276,14 +276,14 @@ test "parse arguments" {	...	@@ -276,14 +276,14 @@ test "parse arguments" {
276	debug.assert(!args.present("help2"));	276	debug.assert(!args.present("help2"));
277	debug.assert(!args.present("init"));	277	debug.assert(!args.present("init"));
278		278
279	debug.assert(mem.eql(u8, ??args.single("build-file"), "build.zig"));	279	debug.assert(mem.eql(u8, args.single("build-file").?, "build.zig"));
280	debug.assert(mem.eql(u8, ??args.single("color"), "on"));	280	debug.assert(mem.eql(u8, args.single("color").?, "on"));
281		281
282	const objects = ??args.many("object");	282	const objects = args.many("object").?;
283	debug.assert(mem.eql(u8, objects[0], "obj1"));	283	debug.assert(mem.eql(u8, objects[0], "obj1"));
284	debug.assert(mem.eql(u8, objects[1], "obj2"));	284	debug.assert(mem.eql(u8, objects[1], "obj2"));
285		285
286	debug.assert(mem.eql(u8, ??args.single("library"), "lib2"));	286	debug.assert(mem.eql(u8, args.single("library").?, "lib2"));
287		287
288	const pos = args.positionals.toSliceConst();	288	const pos = args.positionals.toSliceConst();
289	debug.assert(mem.eql(u8, pos[0], "build"));	289	debug.assert(mem.eql(u8, pos[0], "build"));

...	@@ -490,7 +490,7 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Mo	...	@@ -490,7 +490,7 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Mo
490	try stderr.print("encountered --pkg-end with no matching --pkg-begin\n");	490	try stderr.print("encountered --pkg-end with no matching --pkg-begin\n");
491	os.exit(1);	491	os.exit(1);
492	}	492	}
493	cur_pkg = ??cur_pkg.parent;	493	cur_pkg = cur_pkg.parent.?;
494	}	494	}
495	}	495	}
496		496
...	@@ -514,7 +514,7 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Mo	...	@@ -514,7 +514,7 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Mo
514	},	514	},
515	}	515	}
516		516
517	const basename = os.path.basename(??in_file);	517	const basename = os.path.basename(in_file.?);
518	var it = mem.split(basename, ".");	518	var it = mem.split(basename, ".");
519	const root_name = it.next() ?? {	519	const root_name = it.next() ?? {
520	try stderr.write("file name cannot be empty\n");	520	try stderr.write("file name cannot be empty\n");
...	@@ -523,12 +523,12 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Mo	...	@@ -523,12 +523,12 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Mo
523		523
524	const asm_a = flags.many("assembly");	524	const asm_a = flags.many("assembly");
525	const obj_a = flags.many("object");	525	const obj_a = flags.many("object");
526	if (in_file == null and (obj_a == null or (??obj_a).len == 0) and (asm_a == null or (??asm_a).len == 0)) {	526	if (in_file == null and (obj_a == null or obj_a.?.len == 0) and (asm_a == null or asm_a.?.len == 0)) {
527	try stderr.write("Expected source file argument or at least one --object or --assembly argument\n");	527	try stderr.write("Expected source file argument or at least one --object or --assembly argument\n");
528	os.exit(1);	528	os.exit(1);
529	}	529	}
530		530
531	if (out_type == Module.Kind.Obj and (obj_a != null and (??obj_a).len != 0)) {	531	if (out_type == Module.Kind.Obj and (obj_a != null and obj_a.?.len != 0)) {
532	try stderr.write("When building an object file, --object arguments are invalid\n");	532	try stderr.write("When building an object file, --object arguments are invalid\n");
533	os.exit(1);	533	os.exit(1);
534	}	534	}

...	@@ -50,7 +50,7 @@ static const char *bin_op_str(BinOpType bin_op) {	...	@@ -50,7 +50,7 @@ static const char *bin_op_str(BinOpType bin_op) {
50	case BinOpTypeAssignBitXor: return "^=";	50	case BinOpTypeAssignBitXor: return "^=";
51	case BinOpTypeAssignBitOr: return "\|=";	51	case BinOpTypeAssignBitOr: return "\|=";
52	case BinOpTypeAssignMergeErrorSets: return "\|\|=";	52	case BinOpTypeAssignMergeErrorSets: return "\|\|=";
53	case BinOpTypeUnwrapMaybe: return "??";	53	case BinOpTypeUnwrapOptional: return "??";
54	case BinOpTypeArrayCat: return "++";	54	case BinOpTypeArrayCat: return "++";
55	case BinOpTypeArrayMult: return "**";	55	case BinOpTypeArrayMult: return "**";
56	case BinOpTypeErrorUnion: return "!";	56	case BinOpTypeErrorUnion: return "!";
...	@@ -66,8 +66,8 @@ static const char *prefix_op_str(PrefixOp prefix_op) {	...	@@ -66,8 +66,8 @@ static const char *prefix_op_str(PrefixOp prefix_op) {
66	case PrefixOpNegationWrap: return "-%";	66	case PrefixOpNegationWrap: return "-%";
67	case PrefixOpBoolNot: return "!";	67	case PrefixOpBoolNot: return "!";
68	case PrefixOpBinNot: return "~";	68	case PrefixOpBinNot: return "~";
69	case PrefixOpMaybe: return "?";	69	case PrefixOpOptional: return "?";
70	case PrefixOpUnwrapMaybe: return "??";	70	case PrefixOpUnwrapOptional: return "??";
71	case PrefixOpAddrOf: return "&";	71	case PrefixOpAddrOf: return "&";
72	}	72	}
73	zig_unreachable();	73	zig_unreachable();

...	@@ -865,7 +865,7 @@ static Buf *panic_msg_buf(PanicMsgId msg_id) {	...	@@ -865,7 +865,7 @@ static Buf *panic_msg_buf(PanicMsgId msg_id) {
865	return buf_create_from_str("exact division produced remainder");	865	return buf_create_from_str("exact division produced remainder");
866	case PanicMsgIdSliceWidenRemainder:	866	case PanicMsgIdSliceWidenRemainder:
867	return buf_create_from_str("slice widening size mismatch");	867	return buf_create_from_str("slice widening size mismatch");
868	case PanicMsgIdUnwrapMaybeFail:	868	case PanicMsgIdUnwrapOptionalFail:
869	return buf_create_from_str("attempt to unwrap null");	869	return buf_create_from_str("attempt to unwrap null");
870	case PanicMsgIdUnreachable:	870	case PanicMsgIdUnreachable:
871	return buf_create_from_str("reached unreachable code");	871	return buf_create_from_str("reached unreachable code");
...	@@ -2734,7 +2734,7 @@ static LLVMValueRef ir_render_un_op(CodeGen g, IrExecutable executable, IrInst	...	@@ -2734,7 +2734,7 @@ static LLVMValueRef ir_render_un_op(CodeGen g, IrExecutable executable, IrInst
2734		2734
2735	switch (op_id) {	2735	switch (op_id) {
2736	case IrUnOpInvalid:	2736	case IrUnOpInvalid:
2737	case IrUnOpMaybe:	2737	case IrUnOpOptional:
2738	case IrUnOpDereference:	2738	case IrUnOpDereference:
2739	zig_unreachable();	2739	zig_unreachable();
2740	case IrUnOpNegation:	2740	case IrUnOpNegation:
...	@@ -3333,7 +3333,7 @@ static LLVMValueRef ir_render_asm(CodeGen g, IrExecutable executable, IrInstru	...	@@ -3333,7 +3333,7 @@ static LLVMValueRef ir_render_asm(CodeGen g, IrExecutable executable, IrInstru
3333	}	3333	}
3334		3334
3335	static LLVMValueRef gen_non_null_bit(CodeGen g, TypeTableEntry maybe_type, LLVMValueRef maybe_handle) {	3335	static LLVMValueRef gen_non_null_bit(CodeGen g, TypeTableEntry maybe_type, LLVMValueRef maybe_handle) {
3336	assert(maybe_type->id == TypeTableEntryIdMaybe);	3336	assert(maybe_type->id == TypeTableEntryIdOptional);
3337	TypeTableEntry *child_type = maybe_type->data.maybe.child_type;	3337	TypeTableEntry *child_type = maybe_type->data.maybe.child_type;
3338	if (child_type->zero_bits) {	3338	if (child_type->zero_bits) {
3339	return maybe_handle;	3339	return maybe_handle;
...	@@ -3355,23 +3355,23 @@ static LLVMValueRef ir_render_test_non_null(CodeGen g, IrExecutable executable	...	@@ -3355,23 +3355,23 @@ static LLVMValueRef ir_render_test_non_null(CodeGen g, IrExecutable executable
3355	}	3355	}
3356		3356
3357	static LLVMValueRef ir_render_unwrap_maybe(CodeGen g, IrExecutable executable,	3357	static LLVMValueRef ir_render_unwrap_maybe(CodeGen g, IrExecutable executable,
3358	IrInstructionUnwrapMaybe *instruction)	3358	IrInstructionUnwrapOptional *instruction)
3359	{	3359	{
3360	TypeTableEntry *ptr_type = instruction->value->value.type;	3360	TypeTableEntry *ptr_type = instruction->value->value.type;
3361	assert(ptr_type->id == TypeTableEntryIdPointer);	3361	assert(ptr_type->id == TypeTableEntryIdPointer);
3362	TypeTableEntry *maybe_type = ptr_type->data.pointer.child_type;	3362	TypeTableEntry *maybe_type = ptr_type->data.pointer.child_type;
3363	assert(maybe_type->id == TypeTableEntryIdMaybe);	3363	assert(maybe_type->id == TypeTableEntryIdOptional);
3364	TypeTableEntry *child_type = maybe_type->data.maybe.child_type;	3364	TypeTableEntry *child_type = maybe_type->data.maybe.child_type;
3365	LLVMValueRef maybe_ptr = ir_llvm_value(g, instruction->value);	3365	LLVMValueRef maybe_ptr = ir_llvm_value(g, instruction->value);
3366	LLVMValueRef maybe_handle = get_handle_value(g, maybe_ptr, maybe_type, ptr_type);	3366	LLVMValueRef maybe_handle = get_handle_value(g, maybe_ptr, maybe_type, ptr_type);
3367	if (ir_want_runtime_safety(g, &instruction->base) && instruction->safety_check_on) {	3367	if (ir_want_runtime_safety(g, &instruction->base) && instruction->safety_check_on) {
3368	LLVMValueRef non_null_bit = gen_non_null_bit(g, maybe_type, maybe_handle);	3368	LLVMValueRef non_null_bit = gen_non_null_bit(g, maybe_type, maybe_handle);
3369	LLVMBasicBlockRef ok_block = LLVMAppendBasicBlock(g->cur_fn_val, "UnwrapMaybeOk");	3369	LLVMBasicBlockRef ok_block = LLVMAppendBasicBlock(g->cur_fn_val, "UnwrapOptionalOk");
3370	LLVMBasicBlockRef fail_block = LLVMAppendBasicBlock(g->cur_fn_val, "UnwrapMaybeFail");	3370	LLVMBasicBlockRef fail_block = LLVMAppendBasicBlock(g->cur_fn_val, "UnwrapOptionalFail");
3371	LLVMBuildCondBr(g->builder, non_null_bit, ok_block, fail_block);	3371	LLVMBuildCondBr(g->builder, non_null_bit, ok_block, fail_block);
3372		3372
3373	LLVMPositionBuilderAtEnd(g->builder, fail_block);	3373	LLVMPositionBuilderAtEnd(g->builder, fail_block);
3374	gen_safety_crash(g, PanicMsgIdUnwrapMaybeFail);	3374	gen_safety_crash(g, PanicMsgIdUnwrapOptionalFail);
3375		3375
3376	LLVMPositionBuilderAtEnd(g->builder, ok_block);	3376	LLVMPositionBuilderAtEnd(g->builder, ok_block);
3377	}	3377	}
...	@@ -3593,17 +3593,17 @@ static LLVMValueRef ir_render_align_cast(CodeGen g, IrExecutable executable, I	...	@@ -3593,17 +3593,17 @@ static LLVMValueRef ir_render_align_cast(CodeGen g, IrExecutable executable, I
3593	} else if (target_type->id == TypeTableEntryIdFn) {	3593	} else if (target_type->id == TypeTableEntryIdFn) {
3594	align_bytes = target_type->data.fn.fn_type_id.alignment;	3594	align_bytes = target_type->data.fn.fn_type_id.alignment;
3595	ptr_val = target_val;	3595	ptr_val = target_val;
3596	} else if (target_type->id == TypeTableEntryIdMaybe &&	3596	} else if (target_type->id == TypeTableEntryIdOptional &&
3597	target_type->data.maybe.child_type->id == TypeTableEntryIdPointer)	3597	target_type->data.maybe.child_type->id == TypeTableEntryIdPointer)
3598	{	3598	{
3599	align_bytes = target_type->data.maybe.child_type->data.pointer.alignment;	3599	align_bytes = target_type->data.maybe.child_type->data.pointer.alignment;
3600	ptr_val = target_val;	3600	ptr_val = target_val;
3601	} else if (target_type->id == TypeTableEntryIdMaybe &&	3601	} else if (target_type->id == TypeTableEntryIdOptional &&
3602	target_type->data.maybe.child_type->id == TypeTableEntryIdFn)	3602	target_type->data.maybe.child_type->id == TypeTableEntryIdFn)
3603	{	3603	{
3604	align_bytes = target_type->data.maybe.child_type->data.fn.fn_type_id.alignment;	3604	align_bytes = target_type->data.maybe.child_type->data.fn.fn_type_id.alignment;
3605	ptr_val = target_val;	3605	ptr_val = target_val;
3606	} else if (target_type->id == TypeTableEntryIdMaybe &&	3606	} else if (target_type->id == TypeTableEntryIdOptional &&
3607	target_type->data.maybe.child_type->id == TypeTableEntryIdPromise)	3607	target_type->data.maybe.child_type->id == TypeTableEntryIdPromise)
3608	{	3608	{
3609	zig_panic("TODO audit this function");	3609	zig_panic("TODO audit this function");
...	@@ -3705,7 +3705,7 @@ static LLVMValueRef ir_render_cmpxchg(CodeGen g, IrExecutable executable, IrIn	...	@@ -3705,7 +3705,7 @@ static LLVMValueRef ir_render_cmpxchg(CodeGen g, IrExecutable executable, IrIn
3705	success_order, failure_order, instruction->is_weak);	3705	success_order, failure_order, instruction->is_weak);
3706		3706
3707	TypeTableEntry *maybe_type = instruction->base.value.type;	3707	TypeTableEntry *maybe_type = instruction->base.value.type;
3708	assert(maybe_type->id == TypeTableEntryIdMaybe);	3708	assert(maybe_type->id == TypeTableEntryIdOptional);
3709	TypeTableEntry *child_type = maybe_type->data.maybe.child_type;	3709	TypeTableEntry *child_type = maybe_type->data.maybe.child_type;
3710		3710
3711	if (type_is_codegen_pointer(child_type)) {	3711	if (type_is_codegen_pointer(child_type)) {
...	@@ -4115,10 +4115,10 @@ static LLVMValueRef ir_render_unwrap_err_payload(CodeGen g, IrExecutable execu	...	@@ -4115,10 +4115,10 @@ static LLVMValueRef ir_render_unwrap_err_payload(CodeGen g, IrExecutable execu
4115	}	4115	}
4116	}	4116	}
4117		4117
4118	static LLVMValueRef ir_render_maybe_wrap(CodeGen g, IrExecutable executable, IrInstructionMaybeWrap *instruction) {	4118	static LLVMValueRef ir_render_maybe_wrap(CodeGen g, IrExecutable executable, IrInstructionOptionalWrap *instruction) {
4119	TypeTableEntry *wanted_type = instruction->base.value.type;	4119	TypeTableEntry *wanted_type = instruction->base.value.type;
4120		4120
4121	assert(wanted_type->id == TypeTableEntryIdMaybe);	4121	assert(wanted_type->id == TypeTableEntryIdOptional);
4122		4122
4123	TypeTableEntry *child_type = wanted_type->data.maybe.child_type;	4123	TypeTableEntry *child_type = wanted_type->data.maybe.child_type;
4124		4124
...	@@ -4699,8 +4699,8 @@ static LLVMValueRef ir_render_instruction(CodeGen g, IrExecutable executable,	...	@@ -4699,8 +4699,8 @@ static LLVMValueRef ir_render_instruction(CodeGen g, IrExecutable executable,
4699	return ir_render_asm(g, executable, (IrInstructionAsm *)instruction);	4699	return ir_render_asm(g, executable, (IrInstructionAsm *)instruction);
4700	case IrInstructionIdTestNonNull:	4700	case IrInstructionIdTestNonNull:
4701	return ir_render_test_non_null(g, executable, (IrInstructionTestNonNull *)instruction);	4701	return ir_render_test_non_null(g, executable, (IrInstructionTestNonNull *)instruction);
4702	case IrInstructionIdUnwrapMaybe:	4702	case IrInstructionIdUnwrapOptional:
4703	return ir_render_unwrap_maybe(g, executable, (IrInstructionUnwrapMaybe *)instruction);	4703	return ir_render_unwrap_maybe(g, executable, (IrInstructionUnwrapOptional *)instruction);
4704	case IrInstructionIdClz:	4704	case IrInstructionIdClz:
4705	return ir_render_clz(g, executable, (IrInstructionClz *)instruction);	4705	return ir_render_clz(g, executable, (IrInstructionClz *)instruction);
4706	case IrInstructionIdCtz:	4706	case IrInstructionIdCtz:
...	@@ -4741,8 +4741,8 @@ static LLVMValueRef ir_render_instruction(CodeGen g, IrExecutable executable,	...	@@ -4741,8 +4741,8 @@ static LLVMValueRef ir_render_instruction(CodeGen g, IrExecutable executable,
4741	return ir_render_unwrap_err_code(g, executable, (IrInstructionUnwrapErrCode *)instruction);	4741	return ir_render_unwrap_err_code(g, executable, (IrInstructionUnwrapErrCode *)instruction);
4742	case IrInstructionIdUnwrapErrPayload:	4742	case IrInstructionIdUnwrapErrPayload:
4743	return ir_render_unwrap_err_payload(g, executable, (IrInstructionUnwrapErrPayload *)instruction);	4743	return ir_render_unwrap_err_payload(g, executable, (IrInstructionUnwrapErrPayload *)instruction);
4744	case IrInstructionIdMaybeWrap:	4744	case IrInstructionIdOptionalWrap:
4745	return ir_render_maybe_wrap(g, executable, (IrInstructionMaybeWrap *)instruction);	4745	return ir_render_maybe_wrap(g, executable, (IrInstructionOptionalWrap *)instruction);
4746	case IrInstructionIdErrWrapCode:	4746	case IrInstructionIdErrWrapCode:
4747	return ir_render_err_wrap_code(g, executable, (IrInstructionErrWrapCode *)instruction);	4747	return ir_render_err_wrap_code(g, executable, (IrInstructionErrWrapCode *)instruction);
4748	case IrInstructionIdErrWrapPayload:	4748	case IrInstructionIdErrWrapPayload:
...	@@ -4972,7 +4972,7 @@ static LLVMValueRef pack_const_int(CodeGen *g, LLVMTypeRef big_int_type_ref, Con	...	@@ -4972,7 +4972,7 @@ static LLVMValueRef pack_const_int(CodeGen *g, LLVMTypeRef big_int_type_ref, Con
4972	}	4972	}
4973	case TypeTableEntryIdPointer:	4973	case TypeTableEntryIdPointer:
4974	case TypeTableEntryIdFn:	4974	case TypeTableEntryIdFn:
4975	case TypeTableEntryIdMaybe:	4975	case TypeTableEntryIdOptional:
4976	case TypeTableEntryIdPromise:	4976	case TypeTableEntryIdPromise:
4977	{	4977	{
4978	LLVMValueRef ptr_val = gen_const_val(g, const_val, "");	4978	LLVMValueRef ptr_val = gen_const_val(g, const_val, "");
...	@@ -5137,19 +5137,19 @@ static LLVMValueRef gen_const_val(CodeGen g, ConstExprValue const_val, const c	...	@@ -5137,19 +5137,19 @@ static LLVMValueRef gen_const_val(CodeGen g, ConstExprValue const_val, const c
5137	} else {	5137	} else {
5138	return LLVMConstNull(LLVMInt1Type());	5138	return LLVMConstNull(LLVMInt1Type());
5139	}	5139	}
5140	case TypeTableEntryIdMaybe:	5140	case TypeTableEntryIdOptional:
5141	{	5141	{
5142	TypeTableEntry *child_type = type_entry->data.maybe.child_type;	5142	TypeTableEntry *child_type = type_entry->data.maybe.child_type;
5143	if (child_type->zero_bits) {	5143	if (child_type->zero_bits) {
5144	return LLVMConstInt(LLVMInt1Type(), const_val->data.x_nullable ? 1 : 0, false);	5144	return LLVMConstInt(LLVMInt1Type(), const_val->data.x_optional ? 1 : 0, false);
5145	} else if (type_is_codegen_pointer(child_type)) {	5145	} else if (type_is_codegen_pointer(child_type)) {
5146	return gen_const_val_ptr(g, const_val, name);	5146	return gen_const_val_ptr(g, const_val, name);
5147	} else {	5147	} else {
5148	LLVMValueRef child_val;	5148	LLVMValueRef child_val;
5149	LLVMValueRef maybe_val;	5149	LLVMValueRef maybe_val;
5150	bool make_unnamed_struct;	5150	bool make_unnamed_struct;
5151	if (const_val->data.x_nullable) {	5151	if (const_val->data.x_optional) {
5152	child_val = gen_const_val(g, const_val->data.x_nullable, "");	5152	child_val = gen_const_val(g, const_val->data.x_optional, "");
5153	maybe_val = LLVMConstAllOnes(LLVMInt1Type());	5153	maybe_val = LLVMConstAllOnes(LLVMInt1Type());
5154		5154
5155	make_unnamed_struct = is_llvm_value_unnamed_type(const_val->type, child_val);	5155	make_unnamed_struct = is_llvm_value_unnamed_type(const_val->type, child_val);
...	@@ -5755,8 +5755,8 @@ static void do_code_gen(CodeGen *g) {	...	@@ -5755,8 +5755,8 @@ static void do_code_gen(CodeGen *g) {
5755	} else if (instruction->id == IrInstructionIdSlice) {	5755	} else if (instruction->id == IrInstructionIdSlice) {
5756	IrInstructionSlice slice_instruction = (IrInstructionSlice )instruction;	5756	IrInstructionSlice slice_instruction = (IrInstructionSlice )instruction;
5757	slot = &slice_instruction->tmp_ptr;	5757	slot = &slice_instruction->tmp_ptr;
5758	} else if (instruction->id == IrInstructionIdMaybeWrap) {	5758	} else if (instruction->id == IrInstructionIdOptionalWrap) {
5759	IrInstructionMaybeWrap maybe_wrap_instruction = (IrInstructionMaybeWrap )instruction;	5759	IrInstructionOptionalWrap maybe_wrap_instruction = (IrInstructionOptionalWrap )instruction;
5760	slot = &maybe_wrap_instruction->tmp_ptr;	5760	slot = &maybe_wrap_instruction->tmp_ptr;
5761	} else if (instruction->id == IrInstructionIdErrWrapPayload) {	5761	} else if (instruction->id == IrInstructionIdErrWrapPayload) {
5762	IrInstructionErrWrapPayload err_wrap_payload_instruction = (IrInstructionErrWrapPayload )instruction;	5762	IrInstructionErrWrapPayload err_wrap_payload_instruction = (IrInstructionErrWrapPayload )instruction;
...	@@ -6511,7 +6511,7 @@ Buf codegen_generate_builtin_source(CodeGen g) {	...	@@ -6511,7 +6511,7 @@ Buf codegen_generate_builtin_source(CodeGen g) {
6511	" ComptimeInt: void,\n"	6511	" ComptimeInt: void,\n"
6512	" Undefined: void,\n"	6512	" Undefined: void,\n"
6513	" Null: void,\n"	6513	" Null: void,\n"
6514	" Nullable: Nullable,\n"	6514	" Optional: Optional,\n"
6515	" ErrorUnion: ErrorUnion,\n"	6515	" ErrorUnion: ErrorUnion,\n"
6516	" ErrorSet: ErrorSet,\n"	6516	" ErrorSet: ErrorSet,\n"
6517	" Enum: Enum,\n"	6517	" Enum: Enum,\n"
...	@@ -6570,7 +6570,7 @@ Buf codegen_generate_builtin_source(CodeGen g) {	...	@@ -6570,7 +6570,7 @@ Buf codegen_generate_builtin_source(CodeGen g) {
6570	" defs: []Definition,\n"	6570	" defs: []Definition,\n"
6571	" };\n"	6571	" };\n"
6572	"\n"	6572	"\n"
6573	" pub const Nullable = struct {\n"	6573	" pub const Optional = struct {\n"
6574	" child: type,\n"	6574	" child: type,\n"
6575	" };\n"	6575	" };\n"
6576	"\n"	6576	"\n"
...	@@ -7145,7 +7145,7 @@ static void prepend_c_type_to_decl_list(CodeGen g, GenH gen_h, TypeTableEntry	...	@@ -7145,7 +7145,7 @@ static void prepend_c_type_to_decl_list(CodeGen g, GenH gen_h, TypeTableEntry
7145	case TypeTableEntryIdArray:	7145	case TypeTableEntryIdArray:
7146	prepend_c_type_to_decl_list(g, gen_h, type_entry->data.array.child_type);	7146	prepend_c_type_to_decl_list(g, gen_h, type_entry->data.array.child_type);
7147	return;	7147	return;
7148	case TypeTableEntryIdMaybe:	7148	case TypeTableEntryIdOptional:
7149	prepend_c_type_to_decl_list(g, gen_h, type_entry->data.maybe.child_type);	7149	prepend_c_type_to_decl_list(g, gen_h, type_entry->data.maybe.child_type);
7150	return;	7150	return;
7151	case TypeTableEntryIdFn:	7151	case TypeTableEntryIdFn:
...	@@ -7234,7 +7234,7 @@ static void get_c_type(CodeGen g, GenH gen_h, TypeTableEntry *type_entry, Buf	...	@@ -7234,7 +7234,7 @@ static void get_c_type(CodeGen g, GenH gen_h, TypeTableEntry *type_entry, Buf
7234	buf_appendf(out_buf, "%s%s *", const_str, buf_ptr(&child_buf));	7234	buf_appendf(out_buf, "%s%s *", const_str, buf_ptr(&child_buf));
7235	break;	7235	break;
7236	}	7236	}
7237	case TypeTableEntryIdMaybe:	7237	case TypeTableEntryIdOptional:
7238	{	7238	{
7239	TypeTableEntry *child_type = type_entry->data.maybe.child_type;	7239	TypeTableEntry *child_type = type_entry->data.maybe.child_type;
7240	if (child_type->zero_bits) {	7240	if (child_type->zero_bits) {
...	@@ -7448,7 +7448,7 @@ static void gen_h_file(CodeGen *g) {	...	@@ -7448,7 +7448,7 @@ static void gen_h_file(CodeGen *g) {
7448	case TypeTableEntryIdBlock:	7448	case TypeTableEntryIdBlock:
7449	case TypeTableEntryIdBoundFn:	7449	case TypeTableEntryIdBoundFn:
7450	case TypeTableEntryIdArgTuple:	7450	case TypeTableEntryIdArgTuple:
7451	case TypeTableEntryIdMaybe:	7451	case TypeTableEntryIdOptional:
7452	case TypeTableEntryIdFn:	7452	case TypeTableEntryIdFn:
7453	case TypeTableEntryIdPromise:	7453	case TypeTableEntryIdPromise:
7454	zig_unreachable();	7454	zig_unreachable();

...	@@ -382,7 +382,7 @@ static AstNode trans_create_node_inline_fn(Context c, Buf fn_name, AstNode r	...	@@ -382,7 +382,7 @@ static AstNode trans_create_node_inline_fn(Context c, Buf fn_name, AstNode r
382	fn_def->data.fn_def.fn_proto = fn_proto;	382	fn_def->data.fn_def.fn_proto = fn_proto;
383	fn_proto->data.fn_proto.fn_def_node = fn_def;	383	fn_proto->data.fn_proto.fn_def_node = fn_def;
384		384
385	AstNode *unwrap_node = trans_create_node_prefix_op(c, PrefixOpUnwrapMaybe, ref_node);	385	AstNode *unwrap_node = trans_create_node_prefix_op(c, PrefixOpUnwrapOptional, ref_node);
386	AstNode *fn_call_node = trans_create_node(c, NodeTypeFnCallExpr);	386	AstNode *fn_call_node = trans_create_node(c, NodeTypeFnCallExpr);
387	fn_call_node->data.fn_call_expr.fn_ref_expr = unwrap_node;	387	fn_call_node->data.fn_call_expr.fn_ref_expr = unwrap_node;
388		388
...	@@ -410,7 +410,7 @@ static AstNode trans_create_node_inline_fn(Context c, Buf fn_name, AstNode r	...	@@ -410,7 +410,7 @@ static AstNode trans_create_node_inline_fn(Context c, Buf fn_name, AstNode r
410	}	410	}
411		411
412	static AstNode trans_create_node_unwrap_null(Context c, AstNode *child) {	412	static AstNode trans_create_node_unwrap_null(Context c, AstNode *child) {
413	return trans_create_node_prefix_op(c, PrefixOpUnwrapMaybe, child);	413	return trans_create_node_prefix_op(c, PrefixOpUnwrapOptional, child);
414	}	414	}
415		415
416	static AstNode get_global(Context c, Buf *name) {	416	static AstNode get_global(Context c, Buf *name) {
...	@@ -879,14 +879,14 @@ static AstNode trans_type(Context c, const Type *ty, const SourceLocation &sou	...	@@ -879,14 +879,14 @@ static AstNode trans_type(Context c, const Type *ty, const SourceLocation &sou
879	}	879	}
880		880
881	if (qual_type_child_is_fn_proto(child_qt)) {	881	if (qual_type_child_is_fn_proto(child_qt)) {
882	return trans_create_node_prefix_op(c, PrefixOpMaybe, child_node);	882	return trans_create_node_prefix_op(c, PrefixOpOptional, child_node);
883	}	883	}
884		884
885	PtrLen ptr_len = type_is_opaque(c, child_qt.getTypePtr(), source_loc) ? PtrLenSingle : PtrLenUnknown;	885	PtrLen ptr_len = type_is_opaque(c, child_qt.getTypePtr(), source_loc) ? PtrLenSingle : PtrLenUnknown;
886		886
887	AstNode *pointer_node = trans_create_node_ptr_type(c, child_qt.isConstQualified(),	887	AstNode *pointer_node = trans_create_node_ptr_type(c, child_qt.isConstQualified(),
888	child_qt.isVolatileQualified(), child_node, ptr_len);	888	child_qt.isVolatileQualified(), child_node, ptr_len);
889	return trans_create_node_prefix_op(c, PrefixOpMaybe, pointer_node);	889	return trans_create_node_prefix_op(c, PrefixOpOptional, pointer_node);
890	}	890	}
891	case Type::Typedef:	891	case Type::Typedef:
892	{	892	{
...	@@ -1963,7 +1963,7 @@ static AstNode trans_unary_operator(Context c, ResultUsed result_used, TransSc	...	@@ -1963,7 +1963,7 @@ static AstNode trans_unary_operator(Context c, ResultUsed result_used, TransSc
1963	bool is_fn_ptr = qual_type_is_fn_ptr(stmt->getSubExpr()->getType());	1963	bool is_fn_ptr = qual_type_is_fn_ptr(stmt->getSubExpr()->getType());
1964	if (is_fn_ptr)	1964	if (is_fn_ptr)
1965	return value_node;	1965	return value_node;
1966	AstNode *unwrapped = trans_create_node_prefix_op(c, PrefixOpUnwrapMaybe, value_node);	1966	AstNode *unwrapped = trans_create_node_prefix_op(c, PrefixOpUnwrapOptional, value_node);
1967	return trans_create_node_ptr_deref(c, unwrapped);	1967	return trans_create_node_ptr_deref(c, unwrapped);
1968	}	1968	}
1969	case UO_Plus:	1969	case UO_Plus:
...	@@ -2587,7 +2587,7 @@ static AstNode trans_call_expr(Context c, ResultUsed result_used, TransScope *	...	@@ -2587,7 +2587,7 @@ static AstNode trans_call_expr(Context c, ResultUsed result_used, TransScope *
2587	}	2587	}
2588	}	2588	}
2589	if (callee_node == nullptr) {	2589	if (callee_node == nullptr) {
2590	callee_node = trans_create_node_prefix_op(c, PrefixOpUnwrapMaybe, callee_raw_node);	2590	callee_node = trans_create_node_prefix_op(c, PrefixOpUnwrapOptional, callee_raw_node);
2591	}	2591	}
2592	} else {	2592	} else {
2593	callee_node = callee_raw_node;	2593	callee_node = callee_raw_node;
...	@@ -4301,7 +4301,7 @@ static AstNode trans_lookup_ast_maybe_fn(Context c, AstNode *ref_node) {	...	@@ -4301,7 +4301,7 @@ static AstNode trans_lookup_ast_maybe_fn(Context c, AstNode *ref_node) {
4301	return nullptr;	4301	return nullptr;
4302	if (prefix_node->type != NodeTypePrefixOpExpr)	4302	if (prefix_node->type != NodeTypePrefixOpExpr)
4303	return nullptr;	4303	return nullptr;
4304	if (prefix_node->data.prefix_op_expr.prefix_op != PrefixOpMaybe)	4304	if (prefix_node->data.prefix_op_expr.prefix_op != PrefixOpOptional)
4305	return nullptr;	4305	return nullptr;
4306		4306
4307	AstNode *fn_proto_node = prefix_node->data.prefix_op_expr.primary_expr;	4307	AstNode *fn_proto_node = prefix_node->data.prefix_op_expr.primary_expr;

...	@@ -156,7 +156,7 @@ pub const ChildProcess = struct {	...	@@ -156,7 +156,7 @@ pub const ChildProcess = struct {
156	};	156	};
157	}	157	}
158	try self.waitUnwrappedWindows();	158	try self.waitUnwrappedWindows();
159	return ??self.term;	159	return self.term.?;
160	}	160	}
161		161
162	pub fn killPosix(self: *ChildProcess) !Term {	162	pub fn killPosix(self: *ChildProcess) !Term {
...	@@ -175,7 +175,7 @@ pub const ChildProcess = struct {	...	@@ -175,7 +175,7 @@ pub const ChildProcess = struct {
175	};	175	};
176	}	176	}
177	self.waitUnwrapped();	177	self.waitUnwrapped();
178	return ??self.term;	178	return self.term.?;
179	}	179	}
180		180
181	/// Blocks until child process terminates and then cleans up all resources.	181	/// Blocks until child process terminates and then cleans up all resources.
...	@@ -212,8 +212,8 @@ pub const ChildProcess = struct {	...	@@ -212,8 +212,8 @@ pub const ChildProcess = struct {
212	defer Buffer.deinit(&stdout);	212	defer Buffer.deinit(&stdout);
213	defer Buffer.deinit(&stderr);	213	defer Buffer.deinit(&stderr);
214		214
215	var stdout_file_in_stream = io.FileInStream.init(&??child.stdout);	215	var stdout_file_in_stream = io.FileInStream.init(&child.stdout.?);
216	var stderr_file_in_stream = io.FileInStream.init(&??child.stderr);	216	var stderr_file_in_stream = io.FileInStream.init(&child.stderr.?);
217		217
218	try stdout_file_in_stream.stream.readAllBuffer(&stdout, max_output_size);	218	try stdout_file_in_stream.stream.readAllBuffer(&stdout, max_output_size);
219	try stderr_file_in_stream.stream.readAllBuffer(&stderr, max_output_size);	219	try stderr_file_in_stream.stream.readAllBuffer(&stderr, max_output_size);
...	@@ -232,7 +232,7 @@ pub const ChildProcess = struct {	...	@@ -232,7 +232,7 @@ pub const ChildProcess = struct {
232	}	232	}
233		233
234	try self.waitUnwrappedWindows();	234	try self.waitUnwrappedWindows();
235	return ??self.term;	235	return self.term.?;
236	}	236	}
237		237
238	fn waitPosix(self: *ChildProcess) !Term {	238	fn waitPosix(self: *ChildProcess) !Term {
...	@@ -242,7 +242,7 @@ pub const ChildProcess = struct {	...	@@ -242,7 +242,7 @@ pub const ChildProcess = struct {
242	}	242	}
243		243
244	self.waitUnwrapped();	244	self.waitUnwrapped();
245	return ??self.term;	245	return self.term.?;
246	}	246	}
247		247
248	pub fn deinit(self: *ChildProcess) void {	248	pub fn deinit(self: *ChildProcess) void {
...	@@ -619,13 +619,13 @@ pub const ChildProcess = struct {	...	@@ -619,13 +619,13 @@ pub const ChildProcess = struct {
619	self.term = null;	619	self.term = null;
620		620
621	if (self.stdin_behavior == StdIo.Pipe) {	621	if (self.stdin_behavior == StdIo.Pipe) {
622	os.close(??g_hChildStd_IN_Rd);	622	os.close(g_hChildStd_IN_Rd.?);
623	}	623	}
624	if (self.stderr_behavior == StdIo.Pipe) {	624	if (self.stderr_behavior == StdIo.Pipe) {
625	os.close(??g_hChildStd_ERR_Wr);	625	os.close(g_hChildStd_ERR_Wr.?);
626	}	626	}
627	if (self.stdout_behavior == StdIo.Pipe) {	627	if (self.stdout_behavior == StdIo.Pipe) {
628	os.close(??g_hChildStd_OUT_Wr);	628	os.close(g_hChildStd_OUT_Wr.?);
629	}	629	}
630	}	630	}
631		631

...	@@ -265,7 +265,7 @@ fn networkShareServersEql(ns1: []const u8, ns2: []const u8) bool {	...	@@ -265,7 +265,7 @@ fn networkShareServersEql(ns1: []const u8, ns2: []const u8) bool {
265	var it2 = mem.split(ns2, []u8{sep2});	265	var it2 = mem.split(ns2, []u8{sep2});
266		266
267	// TODO ASCII is wrong, we actually need full unicode support to compare paths.	267	// TODO ASCII is wrong, we actually need full unicode support to compare paths.
268	return asciiEqlIgnoreCase(??it1.next(), ??it2.next());	268	return asciiEqlIgnoreCase(it1.next().?, it2.next().?);
269	}	269	}
270		270
271	fn compareDiskDesignators(kind: WindowsPath.Kind, p1: []const u8, p2: []const u8) bool {	271	fn compareDiskDesignators(kind: WindowsPath.Kind, p1: []const u8, p2: []const u8) bool {
...	@@ -286,7 +286,7 @@ fn compareDiskDesignators(kind: WindowsPath.Kind, p1: []const u8, p2: []const u8	...	@@ -286,7 +286,7 @@ fn compareDiskDesignators(kind: WindowsPath.Kind, p1: []const u8, p2: []const u8
286	var it2 = mem.split(p2, []u8{sep2});	286	var it2 = mem.split(p2, []u8{sep2});
287		287
288	// TODO ASCII is wrong, we actually need full unicode support to compare paths.	288	// TODO ASCII is wrong, we actually need full unicode support to compare paths.
289	return asciiEqlIgnoreCase(??it1.next(), ??it2.next()) and asciiEqlIgnoreCase(??it1.next(), ??it2.next());	289	return asciiEqlIgnoreCase(it1.next().?, it2.next().?) and asciiEqlIgnoreCase(it1.next().?, it2.next().?);
290	},	290	},
291	}	291	}
292	}	292	}
...	@@ -414,8 +414,8 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {	...	@@ -414,8 +414,8 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {
414	WindowsPath.Kind.NetworkShare => {	414	WindowsPath.Kind.NetworkShare => {
415	result = try allocator.alloc(u8, max_size);	415	result = try allocator.alloc(u8, max_size);
416	var it = mem.split(paths[first_index], "/\\");	416	var it = mem.split(paths[first_index], "/\\");
417	const server_name = ??it.next();	417	const server_name = it.next().?;
418	const other_name = ??it.next();	418	const other_name = it.next().?;
419		419
420	result[result_index] = '\\';	420	result[result_index] = '\\';
421	result_index += 1;	421	result_index += 1;

...	@@ -222,7 +222,7 @@ fn renderTopLevelDecl(allocator: mem.Allocator, stream: var, tree: ast.Tree, i	...	@@ -222,7 +222,7 @@ fn renderTopLevelDecl(allocator: mem.Allocator, stream: var, tree: ast.Tree, i
222	}	222	}
223	}	223	}
224		224
225	const value_expr = ??tag.value_expr;	225	const value_expr = tag.value_expr.?;
226	try renderToken(tree, stream, tree.prevToken(value_expr.firstToken()), indent, start_col, Space.Space); // =	226	try renderToken(tree, stream, tree.prevToken(value_expr.firstToken()), indent, start_col, Space.Space); // =
227	try renderExpression(allocator, stream, tree, indent, start_col, value_expr, Space.Comma); // value,	227	try renderExpression(allocator, stream, tree, indent, start_col, value_expr, Space.Comma); // value,
228	},	228	},
...	@@ -465,8 +465,7 @@ fn renderExpression(	...	@@ -465,8 +465,7 @@ fn renderExpression(
465	ast.Node.PrefixOp.Op.BoolNot,	465	ast.Node.PrefixOp.Op.BoolNot,
466	ast.Node.PrefixOp.Op.Negation,	466	ast.Node.PrefixOp.Op.Negation,
467	ast.Node.PrefixOp.Op.NegationWrap,	467	ast.Node.PrefixOp.Op.NegationWrap,
468	ast.Node.PrefixOp.Op.UnwrapMaybe,	468	ast.Node.PrefixOp.Op.OptionalType,
469	ast.Node.PrefixOp.Op.MaybeType,
470	ast.Node.PrefixOp.Op.AddressOf,	469	ast.Node.PrefixOp.Op.AddressOf,
471	=> {	470	=> {
472	try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None);	471	try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None);
...	@@ -513,7 +512,7 @@ fn renderExpression(	...	@@ -513,7 +512,7 @@ fn renderExpression(
513		512
514	var it = call_info.params.iterator(0);	513	var it = call_info.params.iterator(0);
515	while (true) {	514	while (true) {
516	const param_node = ??it.next();	515	const param_node = it.next().?;
517		516
518	const param_node_new_indent = if (param_node.*.id == ast.Node.Id.MultilineStringLiteral) blk: {	517	const param_node_new_indent = if (param_node.*.id == ast.Node.Id.MultilineStringLiteral) blk: {
519	break :blk indent;	518	break :blk indent;
...	@@ -559,10 +558,10 @@ fn renderExpression(	...	@@ -559,10 +558,10 @@ fn renderExpression(
559	return renderToken(tree, stream, rbracket, indent, start_col, space); // ]	558	return renderToken(tree, stream, rbracket, indent, start_col, space); // ]
560	},	559	},
561		560
562	ast.Node.SuffixOp.Op.Deref => {	561	ast.Node.SuffixOp.Op.Deref, ast.Node.SuffixOp.Op.UnwrapOptional => {
563	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);	562	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
564	try renderToken(tree, stream, tree.prevToken(suffix_op.rtoken), indent, start_col, Space.None); // .	563	try renderToken(tree, stream, tree.prevToken(suffix_op.rtoken), indent, start_col, Space.None); // .
565	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // *	564	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // * or ?
566	},	565	},
567		566
568	@TagType(ast.Node.SuffixOp.Op).Slice => \|range\| {	567	@TagType(ast.Node.SuffixOp.Op).Slice => \|range\| {
...	@@ -595,7 +594,7 @@ fn renderExpression(	...	@@ -595,7 +594,7 @@ fn renderExpression(
595	}	594	}
596		595
597	if (field_inits.len == 1) blk: {	596	if (field_inits.len == 1) blk: {
598	const field_init = ??field_inits.at(0).*.cast(ast.Node.FieldInitializer);	597	const field_init = field_inits.at(0).*.cast(ast.Node.FieldInitializer).?;
599		598
600	if (field_init.expr.cast(ast.Node.SuffixOp)) \|nested_suffix_op\| {	599	if (field_init.expr.cast(ast.Node.SuffixOp)) \|nested_suffix_op\| {
601	if (nested_suffix_op.op == ast.Node.SuffixOp.Op.StructInitializer) {	600	if (nested_suffix_op.op == ast.Node.SuffixOp.Op.StructInitializer) {
...	@@ -688,7 +687,7 @@ fn renderExpression(	...	@@ -688,7 +687,7 @@ fn renderExpression(
688	var count: usize = 1;	687	var count: usize = 1;
689	var it = exprs.iterator(0);	688	var it = exprs.iterator(0);
690	while (true) {	689	while (true) {
691	const expr = (??it.next()).*;	690	const expr = it.next().?.*;
692	if (it.peek()) \|next_expr\| {	691	if (it.peek()) \|next_expr\| {
693	const expr_last_token = expr.*.lastToken() + 1;	692	const expr_last_token = expr.*.lastToken() + 1;
694	const loc = tree.tokenLocation(tree.tokens.at(expr_last_token).end, next_expr.*.firstToken());	693	const loc = tree.tokenLocation(tree.tokens.at(expr_last_token).end, next_expr.*.firstToken());
...	@@ -806,7 +805,7 @@ fn renderExpression(	...	@@ -806,7 +805,7 @@ fn renderExpression(
806	},	805	},
807	}	806	}
808		807
809	return renderExpression(allocator, stream, tree, indent, start_col, ??flow_expr.rhs, space);	808	return renderExpression(allocator, stream, tree, indent, start_col, flow_expr.rhs.?, space);
810	},	809	},
811		810
812	ast.Node.Id.Payload => {	811	ast.Node.Id.Payload => {
...	@@ -1245,7 +1244,7 @@ fn renderExpression(	...	@@ -1245,7 +1244,7 @@ fn renderExpression(
1245	} else {	1244	} else {
1246	var it = switch_case.items.iterator(0);	1245	var it = switch_case.items.iterator(0);
1247	while (true) {	1246	while (true) {
1248	const node = ??it.next();	1247	const node = it.next().?;
1249	if (it.peek()) \|next_node\| {	1248	if (it.peek()) \|next_node\| {
1250	try renderExpression(allocator, stream, tree, indent, start_col, node.*, Space.None);	1249	try renderExpression(allocator, stream, tree, indent, start_col, node.*, Space.None);
1251		1250
...	@@ -1550,7 +1549,7 @@ fn renderExpression(	...	@@ -1550,7 +1549,7 @@ fn renderExpression(
1550		1549
1551	var it = asm_node.outputs.iterator(0);	1550	var it = asm_node.outputs.iterator(0);
1552	while (true) {	1551	while (true) {
1553	const asm_output = ??it.next();	1552	const asm_output = it.next().?;
1554	const node = &(asm_output.*).base;	1553	const node = &(asm_output.*).base;
1555		1554
1556	if (it.peek()) \|next_asm_output\| {	1555	if (it.peek()) \|next_asm_output\| {
...	@@ -1588,7 +1587,7 @@ fn renderExpression(	...	@@ -1588,7 +1587,7 @@ fn renderExpression(
1588		1587
1589	var it = asm_node.inputs.iterator(0);	1588	var it = asm_node.inputs.iterator(0);
1590	while (true) {	1589	while (true) {
1591	const asm_input = ??it.next();	1590	const asm_input = it.next().?;
1592	const node = &(asm_input.*).base;	1591	const node = &(asm_input.*).base;
1593		1592
1594	if (it.peek()) \|next_asm_input\| {	1593	if (it.peek()) \|next_asm_input\| {
...	@@ -1620,7 +1619,7 @@ fn renderExpression(	...	@@ -1620,7 +1619,7 @@ fn renderExpression(
1620		1619
1621	var it = asm_node.clobbers.iterator(0);	1620	var it = asm_node.clobbers.iterator(0);
1622	while (true) {	1621	while (true) {
1623	const clobber_token = ??it.next();	1622	const clobber_token = it.next().?;
1624		1623
1625	if (it.peek() == null) {	1624	if (it.peek() == null) {
1626	try renderToken(tree, stream, clobber_token.*, indent_once, start_col, Space.Newline);	1625	try renderToken(tree, stream, clobber_token.*, indent_once, start_col, Space.Newline);

...	@@ -282,8 +282,8 @@ pub const CompareOutputContext = struct {	...	@@ -282,8 +282,8 @@ pub const CompareOutputContext = struct {
282	var stdout = Buffer.initNull(b.allocator);	282	var stdout = Buffer.initNull(b.allocator);
283	var stderr = Buffer.initNull(b.allocator);	283	var stderr = Buffer.initNull(b.allocator);
284		284
285	var stdout_file_in_stream = io.FileInStream.init(&??child.stdout);	285	var stdout_file_in_stream = io.FileInStream.init(&child.stdout.?);
286	var stderr_file_in_stream = io.FileInStream.init(&??child.stderr);	286	var stderr_file_in_stream = io.FileInStream.init(&child.stderr.?);
287		287
288	stdout_file_in_stream.stream.readAllBuffer(&stdout, max_stdout_size) catch unreachable;	288	stdout_file_in_stream.stream.readAllBuffer(&stdout, max_stdout_size) catch unreachable;
289	stderr_file_in_stream.stream.readAllBuffer(&stderr, max_stdout_size) catch unreachable;	289	stderr_file_in_stream.stream.readAllBuffer(&stderr, max_stdout_size) catch unreachable;
...	@@ -601,8 +601,8 @@ pub const CompileErrorContext = struct {	...	@@ -601,8 +601,8 @@ pub const CompileErrorContext = struct {
601	var stdout_buf = Buffer.initNull(b.allocator);	601	var stdout_buf = Buffer.initNull(b.allocator);
602	var stderr_buf = Buffer.initNull(b.allocator);	602	var stderr_buf = Buffer.initNull(b.allocator);
603		603
604	var stdout_file_in_stream = io.FileInStream.init(&??child.stdout);	604	var stdout_file_in_stream = io.FileInStream.init(&child.stdout.?);
605	var stderr_file_in_stream = io.FileInStream.init(&??child.stderr);	605	var stderr_file_in_stream = io.FileInStream.init(&child.stderr.?);
606		606
607	stdout_file_in_stream.stream.readAllBuffer(&stdout_buf, max_stdout_size) catch unreachable;	607	stdout_file_in_stream.stream.readAllBuffer(&stdout_buf, max_stdout_size) catch unreachable;
608	stderr_file_in_stream.stream.readAllBuffer(&stderr_buf, max_stdout_size) catch unreachable;	608	stderr_file_in_stream.stream.readAllBuffer(&stderr_buf, max_stdout_size) catch unreachable;
...	@@ -872,8 +872,8 @@ pub const TranslateCContext = struct {	...	@@ -872,8 +872,8 @@ pub const TranslateCContext = struct {
872	var stdout_buf = Buffer.initNull(b.allocator);	872	var stdout_buf = Buffer.initNull(b.allocator);
873	var stderr_buf = Buffer.initNull(b.allocator);	873	var stderr_buf = Buffer.initNull(b.allocator);
874		874
875	var stdout_file_in_stream = io.FileInStream.init(&??child.stdout);	875	var stdout_file_in_stream = io.FileInStream.init(&child.stdout.?);
876	var stderr_file_in_stream = io.FileInStream.init(&??child.stderr);	876	var stderr_file_in_stream = io.FileInStream.init(&child.stderr.?);
877		877
878	stdout_file_in_stream.stream.readAllBuffer(&stdout_buf, max_stdout_size) catch unreachable;	878	stdout_file_in_stream.stream.readAllBuffer(&stdout_buf, max_stdout_size) catch unreachable;
879	stderr_file_in_stream.stream.readAllBuffer(&stderr_buf, max_stdout_size) catch unreachable;	879	stderr_file_in_stream.stream.readAllBuffer(&stderr_buf, max_stdout_size) catch unreachable;

...	@@ -47,7 +47,7 @@ enum ConstCastResultId {	...	@@ -47,7 +47,7 @@ enum ConstCastResultId {
47	ConstCastResultIdErrSetGlobal,	47	ConstCastResultIdErrSetGlobal,
48	ConstCastResultIdPointerChild,	48	ConstCastResultIdPointerChild,
49	ConstCastResultIdSliceChild,	49	ConstCastResultIdSliceChild,
50	ConstCastResultIdNullableChild,	50	ConstCastResultIdOptionalChild,
51	ConstCastResultIdErrorUnionPayload,	51	ConstCastResultIdErrorUnionPayload,
52	ConstCastResultIdErrorUnionErrorSet,	52	ConstCastResultIdErrorUnionErrorSet,
53	ConstCastResultIdFnAlign,	53	ConstCastResultIdFnAlign,
...	@@ -86,7 +86,7 @@ struct ConstCastOnly {	...	@@ -86,7 +86,7 @@ struct ConstCastOnly {
86	ConstCastErrSetMismatch error_set;	86	ConstCastErrSetMismatch error_set;
87	ConstCastOnly *pointer_child;	87	ConstCastOnly *pointer_child;
88	ConstCastOnly *slice_child;	88	ConstCastOnly *slice_child;
89	ConstCastOnly *nullable_child;	89	ConstCastOnly *optional_child;
90	ConstCastOnly *error_union_payload;	90	ConstCastOnly *error_union_payload;
91	ConstCastOnly *error_union_error_set;	91	ConstCastOnly *error_union_error_set;
92	ConstCastOnly *return_type;	92	ConstCastOnly *return_type;
...	@@ -372,8 +372,8 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionTestNonNull *) {	...	@@ -372,8 +372,8 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionTestNonNull *) {
372	return IrInstructionIdTestNonNull;	372	return IrInstructionIdTestNonNull;
373	}	373	}
374		374
375	static constexpr IrInstructionId ir_instruction_id(IrInstructionUnwrapMaybe *) {	375	static constexpr IrInstructionId ir_instruction_id(IrInstructionUnwrapOptional *) {
376	return IrInstructionIdUnwrapMaybe;	376	return IrInstructionIdUnwrapOptional;
377	}	377	}
378		378
379	static constexpr IrInstructionId ir_instruction_id(IrInstructionClz *) {	379	static constexpr IrInstructionId ir_instruction_id(IrInstructionClz *) {
...	@@ -524,8 +524,8 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionUnwrapErrPayload	...	@@ -524,8 +524,8 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionUnwrapErrPayload
524	return IrInstructionIdUnwrapErrPayload;	524	return IrInstructionIdUnwrapErrPayload;
525	}	525	}
526		526
527	static constexpr IrInstructionId ir_instruction_id(IrInstructionMaybeWrap *) {	527	static constexpr IrInstructionId ir_instruction_id(IrInstructionOptionalWrap *) {
528	return IrInstructionIdMaybeWrap;	528	return IrInstructionIdOptionalWrap;
529	}	529	}
530		530
531	static constexpr IrInstructionId ir_instruction_id(IrInstructionErrWrapPayload *) {	531	static constexpr IrInstructionId ir_instruction_id(IrInstructionErrWrapPayload *) {
...	@@ -1571,7 +1571,7 @@ static IrInstruction ir_build_test_nonnull_from(IrBuilder irb, IrInstruction *	...	@@ -1571,7 +1571,7 @@ static IrInstruction ir_build_test_nonnull_from(IrBuilder irb, IrInstruction *
1571	static IrInstruction ir_build_unwrap_maybe(IrBuilder irb, Scope scope, AstNode source_node, IrInstruction *value,	1571	static IrInstruction ir_build_unwrap_maybe(IrBuilder irb, Scope scope, AstNode source_node, IrInstruction *value,
1572	bool safety_check_on)	1572	bool safety_check_on)
1573	{	1573	{
1574	IrInstructionUnwrapMaybe *instruction = ir_build_instruction<IrInstructionUnwrapMaybe>(irb, scope, source_node);	1574	IrInstructionUnwrapOptional *instruction = ir_build_instruction<IrInstructionUnwrapOptional>(irb, scope, source_node);
1575	instruction->value = value;	1575	instruction->value = value;

breaking syntax change: ??x to x.? (#1095)