authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-09-10 08:26:59-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-09-10 13:06:08-04:00
logd5a7fcfc13b8aa65a56cfa12c235b207ab6ae949
treec335a069eb7ad5c0e10691d8f1902af9382c2406
parentfaafc4132731e854a471ad4c4bb231efb525ea9a

Dwarf: implement and test multi array list slices

1 files changed, 131 insertions(+), 20 deletions(-)

test/src/Debugger.zig+131-20
......@@ -538,7 +538,7 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
538538 \\frame variable null_u32 maybe_u32 nonnull_u32
539539 \\breakpoint delete --force 1
540540 \\
541 \\breakpoint set --file optionals.zig --source-pattern-regexp '_ = .{ &null_u32, &nonnull_u32 };'
541 \\breakpoint set --file optionals.zig --source-pattern-regexp '_ = \.{ &null_u32, &nonnull_u32 };'
542542 \\process continue
543543 \\frame variable --show-types null_u32 maybe_u32 nonnull_u32
544544 \\breakpoint delete --force 2
......@@ -1333,50 +1333,61 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
13331333 .path = "main.zig",
13341334 .source =
13351335 \\const std = @import("std");
1336 \\fn testMultiArrayList() void {}
1336 \\const Elem0 = struct { u32, u8, u16 };
1337 \\const Elem1 = struct { a: u32, b: u8, c: u16 };
1338 \\fn testMultiArrayList(
1339 \\ list0: std.MultiArrayList(Elem0),
1340 \\ slice0: std.MultiArrayList(Elem0).Slice,
1341 \\ list1: std.MultiArrayList(Elem1),
1342 \\ slice1: std.MultiArrayList(Elem1).Slice,
1343 \\) void {
1344 \\ _ = .{ list0, slice0, list1, slice1 };
1345 \\}
13371346 \\pub fn main() !void {
1338 \\ const Elem0 = struct { u32, u8, u16 };
13391347 \\ var list0: std.MultiArrayList(Elem0) = .{};
13401348 \\ defer list0.deinit(std.heap.page_allocator);
13411349 \\ try list0.setCapacity(std.heap.page_allocator, 8);
13421350 \\ list0.appendAssumeCapacity(.{ 1, 2, 3 });
13431351 \\ list0.appendAssumeCapacity(.{ 4, 5, 6 });
13441352 \\ list0.appendAssumeCapacity(.{ 7, 8, 9 });
1353 \\ const slice0 = list0.slice();
13451354 \\
1346 \\ const Elem1 = struct { a: u32, b: u8, c: u16 };
13471355 \\ var list1: std.MultiArrayList(Elem1) = .{};
13481356 \\ defer list1.deinit(std.heap.page_allocator);
13491357 \\ try list1.setCapacity(std.heap.page_allocator, 12);
13501358 \\ list1.appendAssumeCapacity(.{ .a = 1, .b = 2, .c = 3 });
13511359 \\ list1.appendAssumeCapacity(.{ .a = 4, .b = 5, .c = 6 });
13521360 \\ list1.appendAssumeCapacity(.{ .a = 7, .b = 8, .c = 9 });
1361 \\ const slice1 = list1.slice();
13531362 \\
1354 \\ testMultiArrayList();
1363 \\ testMultiArrayList(list0, slice0, list1, slice1);
13551364 \\}
13561365 \\
13571366 ,
13581367 },
13591368 },
1360 \\breakpoint set --file main.zig --source-pattern-regexp 'testMultiArrayList\(\);'
1369 \\breakpoint set --file main.zig --source-pattern-regexp '_ = \.{ list0, slice0, list1, slice1 };'
13611370 \\process launch
13621371 \\frame variable --show-types -- list0 list0.len list0.capacity list0[0] list0[1] list0[2] list0.0 list0.1 list0.2
1372 \\frame variable --show-types -- slice0 slice0.len slice0.capacity slice0[0] slice0[1] slice0[2] slice0.0 slice0.1 slice0.2
13631373 \\frame variable --show-types -- list1 list1.len list1.capacity list1[0] list1[1] list1[2] list1.a list1.b list1.c
1374 \\frame variable --show-types -- slice1 slice1.len slice1.capacity slice1[0] slice1[1] slice1[2] slice1.a slice1.b slice1.c
13641375 \\breakpoint delete --force 1
13651376 ,
13661377 &.{
13671378 \\(lldb) frame variable --show-types -- list0 list0.len list0.capacity list0[0] list0[1] list0[2] list0.0 list0.1 list0.2
1368 \\(std.multi_array_list.MultiArrayList(main.main.Elem0)) list0 = len=3 capacity=8 {
1369 \\ (root.main.main.Elem0) [0] = {
1379 \\(std.multi_array_list.MultiArrayList(main.Elem0)) list0 = len=3 capacity=8 {
1380 \\ (root.main.Elem0) [0] = {
13701381 \\ (u32) 0 = 1
13711382 \\ (u8) 1 = 2
13721383 \\ (u16) 2 = 3
13731384 \\ }
1374 \\ (root.main.main.Elem0) [1] = {
1385 \\ (root.main.Elem0) [1] = {
13751386 \\ (u32) 0 = 4
13761387 \\ (u8) 1 = 5
13771388 \\ (u16) 2 = 6
13781389 \\ }
1379 \\ (root.main.main.Elem0) [2] = {
1390 \\ (root.main.Elem0) [2] = {
13801391 \\ (u32) 0 = 7
13811392 \\ (u8) 1 = 8
13821393 \\ (u16) 2 = 9
......@@ -1384,17 +1395,17 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
13841395 \\}
13851396 \\(usize) list0.len = 3
13861397 \\(usize) list0.capacity = 8
1387 \\(root.main.main.Elem0) list0[0] = {
1398 \\(root.main.Elem0) list0[0] = {
13881399 \\ (u32) 0 = 1
13891400 \\ (u8) 1 = 2
13901401 \\ (u16) 2 = 3
13911402 \\}
1392 \\(root.main.main.Elem0) list0[1] = {
1403 \\(root.main.Elem0) list0[1] = {
13931404 \\ (u32) 0 = 4
13941405 \\ (u8) 1 = 5
13951406 \\ (u16) 2 = 6
13961407 \\}
1397 \\(root.main.main.Elem0) list0[2] = {
1408 \\(root.main.Elem0) list0[2] = {
13981409 \\ (u32) 0 = 7
13991410 \\ (u8) 1 = 8
14001411 \\ (u16) 2 = 9
......@@ -1414,19 +1425,69 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
14141425 \\ (u16) [1] = 6
14151426 \\ (u16) [2] = 9
14161427 \\}
1428 \\(lldb) frame variable --show-types -- slice0 slice0.len slice0.capacity slice0[0] slice0[1] slice0[2] slice0.0 slice0.1 slice0.2
1429 \\(std.multi_array_list.MultiArrayList(main.Elem0).Slice) slice0 = len=3 capacity=8 {
1430 \\ (root.main.Elem0) [0] = {
1431 \\ (u32) 0 = 1
1432 \\ (u8) 1 = 2
1433 \\ (u16) 2 = 3
1434 \\ }
1435 \\ (root.main.Elem0) [1] = {
1436 \\ (u32) 0 = 4
1437 \\ (u8) 1 = 5
1438 \\ (u16) 2 = 6
1439 \\ }
1440 \\ (root.main.Elem0) [2] = {
1441 \\ (u32) 0 = 7
1442 \\ (u8) 1 = 8
1443 \\ (u16) 2 = 9
1444 \\ }
1445 \\}
1446 \\(usize) slice0.len = 3
1447 \\(usize) slice0.capacity = 8
1448 \\(root.main.Elem0) slice0[0] = {
1449 \\ (u32) 0 = 1
1450 \\ (u8) 1 = 2
1451 \\ (u16) 2 = 3
1452 \\}
1453 \\(root.main.Elem0) slice0[1] = {
1454 \\ (u32) 0 = 4
1455 \\ (u8) 1 = 5
1456 \\ (u16) 2 = 6
1457 \\}
1458 \\(root.main.Elem0) slice0[2] = {
1459 \\ (u32) 0 = 7
1460 \\ (u8) 1 = 8
1461 \\ (u16) 2 = 9
1462 \\}
1463 \\([3]u32) slice0.0 = {
1464 \\ (u32) [0] = 1
1465 \\ (u32) [1] = 4
1466 \\ (u32) [2] = 7
1467 \\}
1468 \\([3]u8) slice0.1 = {
1469 \\ (u8) [0] = 2
1470 \\ (u8) [1] = 5
1471 \\ (u8) [2] = 8
1472 \\}
1473 \\([3]u16) slice0.2 = {
1474 \\ (u16) [0] = 3
1475 \\ (u16) [1] = 6
1476 \\ (u16) [2] = 9
1477 \\}
14171478 \\(lldb) frame variable --show-types -- list1 list1.len list1.capacity list1[0] list1[1] list1[2] list1.a list1.b list1.c
1418 \\(std.multi_array_list.MultiArrayList(main.main.Elem1)) list1 = len=3 capacity=12 {
1419 \\ (root.main.main.Elem1) [0] = {
1479 \\(std.multi_array_list.MultiArrayList(main.Elem1)) list1 = len=3 capacity=12 {
1480 \\ (root.main.Elem1) [0] = {
14201481 \\ (u32) a = 1
14211482 \\ (u8) b = 2
14221483 \\ (u16) c = 3
14231484 \\ }
1424 \\ (root.main.main.Elem1) [1] = {
1485 \\ (root.main.Elem1) [1] = {
14251486 \\ (u32) a = 4
14261487 \\ (u8) b = 5
14271488 \\ (u16) c = 6
14281489 \\ }
1429 \\ (root.main.main.Elem1) [2] = {
1490 \\ (root.main.Elem1) [2] = {
14301491 \\ (u32) a = 7
14311492 \\ (u8) b = 8
14321493 \\ (u16) c = 9
......@@ -1434,17 +1495,17 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
14341495 \\}
14351496 \\(usize) list1.len = 3
14361497 \\(usize) list1.capacity = 12
1437 \\(root.main.main.Elem1) list1[0] = {
1498 \\(root.main.Elem1) list1[0] = {
14381499 \\ (u32) a = 1
14391500 \\ (u8) b = 2
14401501 \\ (u16) c = 3
14411502 \\}
1442 \\(root.main.main.Elem1) list1[1] = {
1503 \\(root.main.Elem1) list1[1] = {
14431504 \\ (u32) a = 4
14441505 \\ (u8) b = 5
14451506 \\ (u16) c = 6
14461507 \\}
1447 \\(root.main.main.Elem1) list1[2] = {
1508 \\(root.main.Elem1) list1[2] = {
14481509 \\ (u32) a = 7
14491510 \\ (u8) b = 8
14501511 \\ (u16) c = 9
......@@ -1464,6 +1525,56 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
14641525 \\ (u16) [1] = 6
14651526 \\ (u16) [2] = 9
14661527 \\}
1528 \\(lldb) frame variable --show-types -- slice1 slice1.len slice1.capacity slice1[0] slice1[1] slice1[2] slice1.a slice1.b slice1.c
1529 \\(std.multi_array_list.MultiArrayList(main.Elem1).Slice) slice1 = len=3 capacity=12 {
1530 \\ (root.main.Elem1) [0] = {
1531 \\ (u32) a = 1
1532 \\ (u8) b = 2
1533 \\ (u16) c = 3
1534 \\ }
1535 \\ (root.main.Elem1) [1] = {
1536 \\ (u32) a = 4
1537 \\ (u8) b = 5
1538 \\ (u16) c = 6
1539 \\ }
1540 \\ (root.main.Elem1) [2] = {
1541 \\ (u32) a = 7
1542 \\ (u8) b = 8
1543 \\ (u16) c = 9
1544 \\ }
1545 \\}
1546 \\(usize) slice1.len = 3
1547 \\(usize) slice1.capacity = 12
1548 \\(root.main.Elem1) slice1[0] = {
1549 \\ (u32) a = 1
1550 \\ (u8) b = 2
1551 \\ (u16) c = 3
1552 \\}
1553 \\(root.main.Elem1) slice1[1] = {
1554 \\ (u32) a = 4
1555 \\ (u8) b = 5
1556 \\ (u16) c = 6
1557 \\}
1558 \\(root.main.Elem1) slice1[2] = {
1559 \\ (u32) a = 7
1560 \\ (u8) b = 8
1561 \\ (u16) c = 9
1562 \\}
1563 \\([3]u32) slice1.a = {
1564 \\ (u32) [0] = 1
1565 \\ (u32) [1] = 4
1566 \\ (u32) [2] = 7
1567 \\}
1568 \\([3]u8) slice1.b = {
1569 \\ (u8) [0] = 2
1570 \\ (u8) [1] = 5
1571 \\ (u8) [2] = 8
1572 \\}
1573 \\([3]u16) slice1.c = {
1574 \\ (u16) [0] = 3
1575 \\ (u16) [1] = 6
1576 \\ (u16) [2] = 9
1577 \\}
14671578 \\(lldb) breakpoint delete --force 1
14681579 \\1 breakpoints deleted; 0 breakpoint locations disabled.
14691580 },