@@ -209,7 +209,7 @@ const Scope = struct {
209
209
210
210
pub const Context = struct {
211
211
tree : * ast.Tree ,
212
- source_buffer : * std.Buffer ,
212
+ source_buffer : * std .ArrayList ( u8 ) ,
213
213
err : Error ,
214
214
source_manager : * ZigClangSourceManager ,
215
215
decl_table : DeclTable ,
@@ -296,7 +296,8 @@ pub fn translate(
296
296
.eof_token = undefined ,
297
297
};
298
298
299
- var source_buffer = try std .Buffer .initSize (arena , 0 );
299
+ var source_buffer = std .ArrayList (u8 ).init (arena );
300
+ errdefer source_buffer .deinit ();
300
301
301
302
var context = Context {
302
303
.tree = tree ,
@@ -4289,7 +4290,7 @@ fn makeRestorePoint(c: *Context) RestorePoint {
4289
4290
return RestorePoint {
4290
4291
.c = c ,
4291
4292
.token_index = c .tree .tokens .len ,
4292
- .src_buf_index = c .source_buffer .len () ,
4293
+ .src_buf_index = c .source_buffer .len ,
4293
4294
};
4294
4295
}
4295
4296
@@ -4751,11 +4752,11 @@ fn appendToken(c: *Context, token_id: Token.Id, bytes: []const u8) !ast.TokenInd
4751
4752
4752
4753
fn appendTokenFmt (c : * Context , token_id : Token.Id , comptime format : []const u8 , args : var ) ! ast.TokenIndex {
4753
4754
assert (token_id != .Invalid );
4754
- const start_index = c .source_buffer .len () ;
4755
+ const start_index = c .source_buffer .len ;
4755
4756
errdefer c .source_buffer .shrink (start_index );
4756
4757
4757
4758
try c .source_buffer .outStream ().print (format , args );
4758
- const end_index = c .source_buffer .len () ;
4759
+ const end_index = c .source_buffer .len ;
4759
4760
const token_index = c .tree .tokens .len ;
4760
4761
const new_token = try c .tree .tokens .addOne ();
4761
4762
errdefer c .tree .tokens .shrink (token_index );
@@ -4765,7 +4766,7 @@ fn appendTokenFmt(c: *Context, token_id: Token.Id, comptime format: []const u8,
4765
4766
.start = start_index ,
4766
4767
.end = end_index ,
4767
4768
};
4768
- try c .source_buffer .appendByte (' ' );
4769
+ try c .source_buffer .append (' ' );
4769
4770
4770
4771
return token_index ;
4771
4772
}
@@ -5839,7 +5840,7 @@ fn parseCPrefixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
5839
5840
5840
5841
fn tokenSlice (c : * Context , token : ast.TokenIndex ) []u8 {
5841
5842
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 ];
5843
5844
return if (mem .startsWith (u8 , slice , "@\" " ))
5844
5845
slice [2 .. slice .len - 1 ]
5845
5846
else
0 commit comments