From 2952604d5d18078ed768e12010f4463176620e9a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 23 May 2020 20:40:09 -0400 Subject: [PATCH] update docgen to new ast API --- doc/docgen.zig | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/docgen.zig b/doc/docgen.zig index 92a7353fa1..7886c7cc90 100644 --- a/doc/docgen.zig +++ b/doc/docgen.zig @@ -776,7 +776,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok next_tok_is_fn = false; const token = tokenizer.next(); - try writeEscaped(out, src[index..token.start]); + try writeEscaped(out, src[index..token.loc.start]); switch (token.id) { .Eof => break, @@ -827,13 +827,13 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok .Keyword_while, => { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); }, .Keyword_fn => { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); next_tok_is_fn = true; }, @@ -844,7 +844,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok .Keyword_false, => { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); }, @@ -853,13 +853,13 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok .CharLiteral, => { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); }, .Builtin => { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); }, @@ -869,34 +869,34 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok .ShebangLine, => { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); }, .Identifier => { if (prev_tok_was_fn) { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); } else { const is_int = blk: { - if (src[token.start] != 'i' and src[token.start] != 'u') + if (src[token.loc.start] != 'i' and src[token.loc.start] != 'u') break :blk false; - var i = token.start + 1; - if (i == token.end) + var i = token.loc.start + 1; + if (i == token.loc.end) break :blk false; - while (i != token.end) : (i += 1) { + while (i != token.loc.end) : (i += 1) { if (src[i] < '0' or src[i] > '9') break :blk false; } break :blk true; }; - if (is_int or isType(src[token.start..token.end])) { + if (is_int or isType(src[token.loc.start..token.loc.end])) { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); } else { - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); } } }, @@ -905,7 +905,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok .FloatLiteral, => { try out.writeAll(""); - try writeEscaped(out, src[token.start..token.end]); + try writeEscaped(out, src[token.loc.start..token.loc.end]); try out.writeAll(""); }, @@ -963,7 +963,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok .AngleBracketAngleBracketRight, .AngleBracketAngleBracketRightEqual, .Tilde, - => try writeEscaped(out, src[token.start..token.end]), + => try writeEscaped(out, src[token.loc.start..token.loc.end]), .Invalid, .Invalid_ampersands => return parseError( docgen_tokenizer, @@ -972,7 +972,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok .{}, ), } - index = token.end; + index = token.loc.end; } try out.writeAll(""); }