@@ -1142,10 +1142,14 @@ fn generateCall(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj
11421142 const arg_keys = args .keys ();
11431143 const arg_count = arg_keys .len ;
11441144
1145- var missing_arguments = std .StringArrayHashMap (usize ).init ( self . gc . allocator ) ;
1146- defer missing_arguments .deinit ();
1145+ var missing_arguments = std .StringArrayHashMapUnmanaged (usize ).empty ;
1146+ defer missing_arguments .deinit (self . gc . allocator );
11471147 for (arg_keys , 0.. ) | arg_name , pindex | {
1148- try missing_arguments .put (arg_name .string , pindex );
1148+ try missing_arguments .put (
1149+ self .gc .allocator ,
1150+ arg_name .string ,
1151+ pindex ,
1152+ );
11491153 }
11501154
11511155 if (components .arguments .len > args .count ()) {
@@ -1211,10 +1215,11 @@ fn generateCall(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj
12111215 }
12121216
12131217 // Argument order reference
1214- var arguments_order_ref = std .array_list . Managed ([]const u8 ).init ( self . gc . allocator ) ;
1215- defer arguments_order_ref .deinit ();
1218+ var arguments_order_ref = std .ArrayList ([]const u8 ).empty ;
1219+ defer arguments_order_ref .deinit (self . gc . allocator );
12161220 for (components .arguments ) | arg | {
12171221 try arguments_order_ref .append (
1222+ self .gc .allocator ,
12181223 if (arg .name ) | name |
12191224 lexemes [name ]
12201225 else
@@ -1224,25 +1229,25 @@ fn generateCall(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj
12241229
12251230 // Push default arguments
12261231 if (missing_arguments .count () > 0 ) {
1227- var tmp_missing_arguments = try missing_arguments .clone ();
1228- defer tmp_missing_arguments .deinit ();
1232+ var tmp_missing_arguments = try missing_arguments .clone (self . gc . allocator );
1233+ defer tmp_missing_arguments .deinit (self . gc . allocator );
12291234 const missing_keys = tmp_missing_arguments .keys ();
12301235 for (missing_keys ) | missing_key | {
12311236 if (defaults .get (try self .gc .copyString (missing_key ))) | default | {
12321237 // TODO: like ObjTypeDef, avoid generating constants multiple time for the same value
12331238 try self .emitConstant (locations [node ], default );
12341239 try self .OP_CLONE (locations [node ]);
12351240
1236- try arguments_order_ref .append (missing_key );
1241+ try arguments_order_ref .append (self . gc . allocator , missing_key );
12371242 _ = missing_arguments .orderedRemove (missing_key );
12381243 needs_reorder = true ;
12391244 }
12401245 }
12411246 }
12421247
12431248 if (missing_arguments .count () > 0 ) {
1244- var missing = std .array_list . Managed (u8 ).init ( self . gc . allocator ) ;
1245- const missing_writer = missing .writer ();
1249+ var missing = std .ArrayList (u8 ).empty ;
1250+ const missing_writer = missing .writer (self . gc . allocator );
12461251 for (missing_arguments .keys (), 0.. ) | key , i | {
12471252 try missing_writer .print (
12481253 "{s}{s}" ,
@@ -1255,7 +1260,7 @@ fn generateCall(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj
12551260 },
12561261 );
12571262 }
1258- defer missing .deinit ();
1263+ defer missing .deinit (self . gc . allocator );
12591264 self .reporter .reportErrorFmt (
12601265 .call_arguments ,
12611266 self .ast .tokens .get (locations [node ]),
@@ -1342,8 +1347,8 @@ fn generateCall(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj
13421347 } else if (error_types ) | errors | {
13431348 if (self .current .? .enclosing != null and self .current .? .function .? .type_def .resolved_type .? .Function .function_type != .Test ) {
13441349 var handles_any = false ;
1345- var not_handled = std .array_list . Managed (* obj .ObjTypeDef ).init ( self . gc . allocator ) ;
1346- defer not_handled .deinit ();
1350+ var not_handled = std .ArrayList (* obj .ObjTypeDef ).empty ;
1351+ defer not_handled .deinit (self . gc . allocator );
13471352 for (errors ) | error_type | {
13481353 if (error_type .def_type == .Void ) {
13491354 continue ;
@@ -1373,12 +1378,12 @@ fn generateCall(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj
13731378 locations [components .callee ],
13741379 );
13751380 } else {
1376- try not_handled .append (error_type );
1381+ try not_handled .append (self . gc . allocator , error_type );
13771382 }
13781383 }
13791384
13801385 if (handles_any ) {
1381- not_handled .clearAndFree ();
1386+ not_handled .clearAndFree (self . gc . allocator );
13821387 break ;
13831388 }
13841389 }
@@ -3621,10 +3626,11 @@ fn generateObjectInit(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error
36213626
36223627 var fields = if (node_type_def .def_type == .ObjectInstance ) inst : {
36233628 const fields = node_type_def .resolved_type .? .ObjectInstance .of .resolved_type .? .Object .fields ;
3624- var fields_type_defs = std .StringArrayHashMap (* obj .ObjTypeDef ).init ( self . gc . allocator ) ;
3629+ var fields_type_defs = std .StringArrayHashMapUnmanaged (* obj .ObjTypeDef ).empty ;
36253630 var it = fields .iterator ();
36263631 while (it .next ()) | kv | {
36273632 try fields_type_defs .put (
3633+ self .gc .allocator ,
36283634 kv .value_ptr .* .name ,
36293635 kv .value_ptr .* .type_def ,
36303636 );
@@ -3633,7 +3639,7 @@ fn generateObjectInit(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error
36333639 } else node_type_def .resolved_type .? .ForeignContainer .buzz_type ;
36343640
36353641 defer if (node_type_def .def_type == .ObjectInstance ) {
3636- fields .deinit ();
3642+ fields .deinit (self . gc . allocator );
36373643 };
36383644
36393645 const object_location = if (node_type_def .def_type == .ObjectInstance )
@@ -3642,8 +3648,8 @@ fn generateObjectInit(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error
36423648 node_type_def .resolved_type .? .ForeignContainer .location ;
36433649
36443650 // Keep track of what's been initialized or not by this statement
3645- var init_properties = std .StringHashMap (void ).init ( self . gc . allocator ) ;
3646- defer init_properties .deinit ();
3651+ var init_properties = std .StringHashMapUnmanaged (void ).empty ;
3652+ defer init_properties .deinit (self . gc . allocator );
36473653
36483654 for (components .properties ) | property | {
36493655 const property_name = lexemes [property .name ];
@@ -3701,7 +3707,7 @@ fn generateObjectInit(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error
37013707
37023708 _ = try self .generateNode (property .value , breaks );
37033709
3704- try init_properties .put (property_name , {});
3710+ try init_properties .put (self . gc . allocator , property_name , {});
37053711
37063712 try self .emitCodeArg (
37073713 location ,
@@ -4185,8 +4191,8 @@ fn generateTry(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj.
41854191 // Jump reached if no error was raised
41864192 const no_error_jump = try self .OP_JUMP (self .ast .nodes .items (.end_location )[components .body ]);
41874193
4188- var exit_jumps = std .array_list . Managed (usize ).init ( self . gc . allocator ) ;
4189- defer exit_jumps .deinit ();
4194+ var exit_jumps = std .ArrayList (usize ).empty ;
4195+ defer exit_jumps .deinit (self . gc . allocator );
41904196
41914197 self .patchTryOrJit (try_jump );
41924198 var has_unconditional = components .unconditional_clause != null ;
@@ -4214,7 +4220,10 @@ fn generateTry(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj.
42144220 self .current .? .try_should_handle = previous ;
42154221
42164222 // After handling the error, jump over next clauses
4217- try exit_jumps .append (try self .emitJump (location , .OP_JUMP ));
4223+ try exit_jumps .append (
4224+ self .gc .allocator ,
4225+ try self .emitJump (location , .OP_JUMP ),
4226+ );
42184227
42194228 self .patchJump (next_clause_jump );
42204229 // Pop `is` result
@@ -4230,7 +4239,10 @@ fn generateTry(self: *Self, node: Ast.Node.Index, breaks: ?*Breaks) Error!?*obj.
42304239 _ = try self .generateNode (unconditional_clause , breaks );
42314240 self .current .? .try_should_handle = previous ;
42324241
4233- try exit_jumps .append (try self .emitJump (location , .OP_JUMP ));
4242+ try exit_jumps .append (
4243+ self .gc .allocator ,
4244+ try self .emitJump (location , .OP_JUMP ),
4245+ );
42344246 }
42354247
42364248 // Tell runtime we're not in a try block anymore
0 commit comments