mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig fmt: implement "line comment followed by top-level comptime"

Browse Source
This commit is contained in:
Andrew Kelley 2021-02-01 20:11:55 -07:00
parent 20554d32c0
commit 272a0ab359
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/zig/parser_test.zig
View File

@ -5,6 +5,17 @@
// and substantial portions of the software.
test "zig fmt: simple top level comptime block" {
try testCanonical(
\\// line comment
\\comptime {}
\\
);
}
test "zig fmt: two spaced line comments before decl" {
try testCanonical(
\\// line comment
\\
\\// another
\\comptime {}
\\
);

11
lib/std/zig/render.zig
View File

@ -36,10 +36,11 @@ fn renderComments(ais: *Ais, tree: ast.Tree, start: usize, end: usize, prefix: [
var index: usize = start;
var count: usize = 0;
while (true) {
// Scan forward to the next line comment, counting newlines.
const comment_start = mem.indexOf(u8, tree.source[index..end], "//") orelse return count;
const newline = mem.indexOfScalar(u8, tree.source[comment_start..end], '\n').?;
const untrimmed_comment = tree.source[comment_start..][0..newline];
const comment_start = index +
(mem.indexOf(u8, tree.source[index..end], "//") orelse return count);
const newline = comment_start +
mem.indexOfScalar(u8, tree.source[comment_start..end], '\n').?;
const untrimmed_comment = tree.source[comment_start..newline];
const trimmed_comment = mem.trimRight(u8, untrimmed_comment, " \r\t");
if (count == 0) {
count += 1;
@ -52,7 +53,7 @@ fn renderComments(ais: *Ais, tree: ast.Tree, start: usize, end: usize, prefix: [
}
}
try ais.writer().print("{s}\n", .{trimmed_comment});
index += comment_start + newline;
index = newline + 1;
}
}

22
lib/std/zig/tokenizer.zig
View File

@ -1035,7 +1035,10 @@ pub const Tokenizer = struct {
result.tag = .ContainerDocComment;
state = .container_doc_comment;
},
'\n' => state = .start,
'\n' => {
state = .start;
result.loc.start = self.index + 1;
},
'\t', '\r' => state = .line_comment,
else => {
state = .line_comment;
@ -1061,7 +1064,10 @@ pub const Tokenizer = struct {
},
},
.line_comment => switch (c) {
'\n' => state = .start,
'\n' => {
state = .start;
result.loc.start = self.index + 1;
},
'\t', '\r' => {},
else => self.checkLiteralCharacter(),
},
@ -1499,6 +1505,18 @@ test "tokenizer" {
testTokenize("test", &[_]Token.Tag{.Keyword_test});
}
test "line comment followed by top-level comptime" {
testTokenize(
\\// line comment
\\comptime {}
\\
, &[_]Token.Tag{
.Keyword_comptime,
.LBrace,
.RBrace,
});
}
test "tokenizer - unknown length pointer and then c pointer" {
testTokenize(
\\[*]u8