zig

commit af2ede4d96d5dd01a9db2f6fbfbe430214beaf63 (tree)
parent 50754ba336e99ac3db972a8b4e7bc583d77f2892
Author: Vexu <git@vexu.eu>
Date:   Tue, 14 Jan 2020 16:39:54 +0200

fix crash on multiline library name

Diffstat:
M
lib/std/zig/parse.zig
 | 
7
++++++-
M
lib/std/zig/parser_test.zig
 | 
10
++++++++++

2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/lib/std/zig/parse.zig b/lib/std/zig/parse.zig
@@ -285,7 +285,12 @@ fn parseTopLevelDecl(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node
 
     if (extern_export_inline_token) |token| {
         if (lib_name) |string_literal_node|
-            putBackToken(it, string_literal_node.cast(Node.StringLiteral).?.token);
+            if (string_literal_node.cast(Node.StringLiteral)) |single| {
+                putBackToken(it, single.token);
+            } else if (string_literal_node.cast(Node.MultilineStringLiteral)) |multi| {
+                while (multi.lines.pop()) |line|
+                    putBackToken(it, line);
+            } else unreachable;
         putBackToken(it, token);
         return null;
     }
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
@@ -2721,6 +2721,16 @@ test "zig fmt: extern without container keyword returns error" {
     );
 }
 
+test "zig fmt: extern multiline lib name" {
+    try testError(
+        \\extern \\super
+        \\    \\long
+        \\    \\library
+        \\    \\name
+        \\
+    );
+}
+
 const std = @import("std");
 const mem = std.mem;
 const warn = std.debug.warn;