Skip to content

Commit 00f2c25

Browse files
committed
std: use std.ArrayList(u8) instead of std.Buffer in src-self-hosted/translate_c.zig
1 parent 471b8ce commit 00f2c25

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src-self-hosted/translate_c.zig

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ const Scope = struct {
209209

210210
pub const Context = struct {
211211
tree: *ast.Tree,
212-
source_buffer: *std.Buffer,
212+
source_buffer: *std.ArrayList(u8),
213213
err: Error,
214214
source_manager: *ZigClangSourceManager,
215215
decl_table: DeclTable,
@@ -296,7 +296,8 @@ pub fn translate(
296296
.eof_token = undefined,
297297
};
298298

299-
var source_buffer = try std.Buffer.initSize(arena, 0);
299+
var source_buffer = std.ArrayList(u8).init(arena);
300+
errdefer source_buffer.deinit();
300301

301302
var context = Context{
302303
.tree = tree,
@@ -4289,7 +4290,7 @@ fn makeRestorePoint(c: *Context) RestorePoint {
42894290
return RestorePoint{
42904291
.c = c,
42914292
.token_index = c.tree.tokens.len,
4292-
.src_buf_index = c.source_buffer.len(),
4293+
.src_buf_index = c.source_buffer.len,
42934294
};
42944295
}
42954296

@@ -4751,11 +4752,11 @@ fn appendToken(c: *Context, token_id: Token.Id, bytes: []const u8) !ast.TokenInd
47514752

47524753
fn appendTokenFmt(c: *Context, token_id: Token.Id, comptime format: []const u8, args: var) !ast.TokenIndex {
47534754
assert(token_id != .Invalid);
4754-
const start_index = c.source_buffer.len();
4755+
const start_index = c.source_buffer.len;
47554756
errdefer c.source_buffer.shrink(start_index);
47564757

47574758
try c.source_buffer.outStream().print(format, args);
4758-
const end_index = c.source_buffer.len();
4759+
const end_index = c.source_buffer.len;
47594760
const token_index = c.tree.tokens.len;
47604761
const new_token = try c.tree.tokens.addOne();
47614762
errdefer c.tree.tokens.shrink(token_index);
@@ -4765,7 +4766,7 @@ fn appendTokenFmt(c: *Context, token_id: Token.Id, comptime format: []const u8,
47654766
.start = start_index,
47664767
.end = end_index,
47674768
};
4768-
try c.source_buffer.appendByte(' ');
4769+
try c.source_buffer.append(' ');
47694770

47704771
return token_index;
47714772
}
@@ -5839,7 +5840,7 @@ fn parseCPrefixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
58395840

58405841
fn tokenSlice(c: *Context, token: ast.TokenIndex) []u8 {
58415842
const tok = c.tree.tokens.at(token);
5842-
const slice = c.source_buffer.toSlice()[tok.start..tok.end];
5843+
const slice = c.source_buffer.span()[tok.start..tok.end];
58435844
return if (mem.startsWith(u8, slice, "@\""))
58445845
slice[2 .. slice.len - 1]
58455846
else

0 commit comments

Comments
 (0)