Commit 4428acf0f7

Asherah Connor <ashe@kivikakk.ee>
2021-02-04 11:33:41
zig fmt: deref, unwrap optional
master
1 parent 725adf8
Changed files (3)
lib
std
zig
ast.zig
parser_test.zig
render.zig
lib/std/zig/ast.zig
@@ -462,6 +462,7 @@ pub const Tree = struct {
             .UndefinedLiteral,
             .UnreachableLiteral,
             .Identifier,
+            .Deref,
             => return main_tokens[n] + end_offset,
 
             .Call,
@@ -515,7 +516,6 @@ pub const Tree = struct {
             .Asm => unreachable, // TODO
             .SliceOpen => unreachable, // TODO
             .Slice => unreachable, // TODO
-            .Deref => unreachable, // TODO
             .ArrayInitOne => unreachable, // TODO
             .ArrayInit => unreachable, // TODO
             .StructInitOne => unreachable, // TODO
lib/std/zig/parser_test.zig
@@ -1503,15 +1503,15 @@ test "zig fmt: top-level fields" {
 //        \\
 //    );
 //}
-//
-//test "zig fmt: ptr deref operator and unwrap optional operator" {
-//    try testCanonical(
-//        \\const a = b.*;
-//        \\const a = b.?;
-//        \\
-//    );
-//}
-//
+
+test "zig fmt: ptr deref operator and unwrap optional operator" {
+   try testCanonical(
+       \\const a = b.*;
+       \\const a = b.?;
+       \\
+   );
+}
+
 //test "zig fmt: comment after if before another if" {
 //    try testCanonical(
 //        \\test "aoeu" {
lib/std/zig/render.zig
@@ -991,21 +991,16 @@ fn renderExpression(ais: *Ais, tree: ast.Tree, node: ast.Node.Index, space: Spac
         //    return renderToken(ais, tree, suffix_op.rtoken, space); // ]
         //},
 
-        .Deref => unreachable, // TODO
-        //.Deref => {
-        //    const suffix_op = base.castTag(.Deref).?;
-
-        //    try renderExpression(ais, tree, suffix_op.lhs, Space.None);
-        //    return renderToken(ais, tree, suffix_op.rtoken, space); // .*
-        //},
-        .UnwrapOptional => unreachable, // TODO
-        //.UnwrapOptional => {
-        //    const suffix_op = base.castTag(.UnwrapOptional).?;
+        .Deref => {
+            try renderExpression(ais, tree, datas[node].lhs, .None);
+            return renderToken(ais, tree, main_tokens[node], space);
+        },
 
-        //    try renderExpression(ais, tree, suffix_op.lhs, Space.None);
-        //    try renderToken(ais, tree, tree.prevToken(suffix_op.rtoken), Space.None); // .
-        //    return renderToken(ais, tree, suffix_op.rtoken, space); // ?
-        //},
+        .UnwrapOptional => {
+            try renderExpression(ais, tree, datas[node].lhs, .None);
+            try renderToken(ais, tree, main_tokens[node], .None);
+            return renderToken(ais, tree, datas[node].rhs, space);
+        },
 
         .Break => unreachable, // TODO
         //.Break => {