From d73d3c21e8a4ac8b66a2801968fe201392fe2dbe Mon Sep 17 00:00:00 2001 From: Danh Phan Date: Sat, 17 Feb 2024 15:37:26 -0600 Subject: [PATCH] more ally -> arena --- src/de/interfaces/map_access.zig | 36 ++++++++-------- src/de/interfaces/seq_access.zig | 18 ++++---- src/de/interfaces/union_access.zig | 18 ++++---- src/de/interfaces/variant_access.zig | 18 ++++---- src/de/interfaces/visitor.zig | 64 ++++++++++++++-------------- 5 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/de/interfaces/map_access.zig b/src/de/interfaces/map_access.zig index 9895e18b..326f0f16 100644 --- a/src/de/interfaces/map_access.zig +++ b/src/de/interfaces/map_access.zig @@ -25,42 +25,42 @@ pub fn MapAccess( pub const Err = E; - pub fn nextKeySeed(self: Self, ally: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { + pub fn nextKeySeed(self: Self, arena: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { if (methods.nextKeySeed) |func| { - return try func(self.impl, ally, seed); + return try func(self.impl, arena, seed); } @compileError("nextKeySeed is not implemented by type: " ++ @typeName(Impl)); } - pub fn nextValueSeed(self: Self, ally: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { + pub fn nextValueSeed(self: Self, arena: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { if (methods.nextValueSeed) |func| { - return try func(self.impl, ally, seed); + return try func(self.impl, arena, seed); } @compileError("nextValueSeed is not implemented by type: " ++ @typeName(Impl)); } - pub fn nextKey(self: Self, ally: std.mem.Allocator, comptime Key: type) E!?Key { + pub fn nextKey(self: Self, arena: std.mem.Allocator, comptime Key: type) E!?Key { if (methods.nextKey) |func| { - return try func(self.impl, ally, Key); + return try func(self.impl, arena, Key); } var seed = DefaultSeed(Key){}; const ds = seed.seed(); - return try self.nextKeySeed(ally, ds); + return try self.nextKeySeed(arena, ds); } - pub fn nextValue(self: Self, ally: std.mem.Allocator, comptime Value: type) E!Value { + pub fn nextValue(self: Self, arena: std.mem.Allocator, comptime Value: type) E!Value { if (methods.nextValue) |func| { - return try func(self.impl, ally, Value); + return try func(self.impl, arena, Value); } var seed = DefaultSeed(Value){}; const ds = seed.seed(); - return try self.nextValueSeed(ally, ds); + return try self.nextValueSeed(arena, ds); } }; @@ -73,9 +73,9 @@ pub fn MapAccess( fn NextKeySeedFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { + fn func(impl: Impl, arena: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -86,9 +86,9 @@ fn NextKeySeedFn(comptime Impl: type, comptime E: type) type { fn NextValueSeedFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { + fn func(impl: Impl, arena: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -99,9 +99,9 @@ fn NextValueSeedFn(comptime Impl: type, comptime E: type) type { fn NextKeyFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Key: type) E!?Key { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Key: type) E!?Key { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -112,9 +112,9 @@ fn NextKeyFn(comptime Impl: type, comptime E: type) type { fn NextValueFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Value: type) E!Value { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Value: type) E!Value { _ = impl; - _ = ally; + _ = arena; unreachable; } diff --git a/src/de/interfaces/seq_access.zig b/src/de/interfaces/seq_access.zig index 748028ab..6213aff3 100644 --- a/src/de/interfaces/seq_access.zig +++ b/src/de/interfaces/seq_access.zig @@ -23,23 +23,23 @@ pub fn SeqAccess( pub const Err = E; - pub fn nextElementSeed(self: Self, ally: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { + pub fn nextElementSeed(self: Self, arena: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { if (methods.nextElementSeed) |func| { - return try func(self.impl, ally, seed); + return try func(self.impl, arena, seed); } @compileError("nextElementSeed is not implemented by type: " ++ @typeName(Impl)); } - pub fn nextElement(self: Self, ally: std.mem.Allocator, comptime Elem: type) E!?Elem { + pub fn nextElement(self: Self, arena: std.mem.Allocator, comptime Elem: type) E!?Elem { if (methods.nextElement) |func| { - return try func(self.impl, ally, Elem); + return try func(self.impl, arena, Elem); } var seed = DefaultSeed(Elem){}; const ds = seed.seed(); - return try self.nextElementSeed(ally, ds); + return try self.nextElementSeed(arena, ds); } }; @@ -52,9 +52,9 @@ pub fn SeqAccess( fn NextElementSeedFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { + fn func(impl: Impl, arena: std.mem.Allocator, seed: anytype) E!?@TypeOf(seed).Value { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -65,9 +65,9 @@ fn NextElementSeedFn(comptime Impl: type, comptime E: type) type { fn NextElementFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Elem: type) E!?Elem { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Elem: type) E!?Elem { _ = impl; - _ = ally; + _ = arena; unreachable; } diff --git a/src/de/interfaces/union_access.zig b/src/de/interfaces/union_access.zig index 6a078a90..990b56c2 100644 --- a/src/de/interfaces/union_access.zig +++ b/src/de/interfaces/union_access.zig @@ -23,23 +23,23 @@ pub fn UnionAccess( pub const Err = E; - pub fn variantSeed(self: Self, ally: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { + pub fn variantSeed(self: Self, arena: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { if (methods.variantSeed) |func| { - return try func(self.impl, ally, seed); + return try func(self.impl, arena, seed); } @compileError("variantSeed is not implemented by type: " ++ @typeName(Impl)); } - pub fn variant(self: Self, ally: std.mem.Allocator, comptime Variant: type) E!Variant { + pub fn variant(self: Self, arena: std.mem.Allocator, comptime Variant: type) E!Variant { if (methods.variant) |func| { - return try func(self.impl, ally, Variant); + return try func(self.impl, arena, Variant); } var ds = DefaultSeed(Variant){}; const seed = ds.seed(); - return try self.variantSeed(ally, seed); + return try self.variantSeed(arena, seed); } }; @@ -52,9 +52,9 @@ pub fn UnionAccess( fn VariantSeedFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { + fn func(impl: Impl, arena: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -65,9 +65,9 @@ fn VariantSeedFn(comptime Impl: type, comptime E: type) type { fn VariantFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime T: type) E!T { + fn func(impl: Impl, arena: std.mem.Allocator, comptime T: type) E!T { _ = impl; - _ = ally; + _ = arena; unreachable; } diff --git a/src/de/interfaces/variant_access.zig b/src/de/interfaces/variant_access.zig index 53718fbd..52421ee8 100644 --- a/src/de/interfaces/variant_access.zig +++ b/src/de/interfaces/variant_access.zig @@ -23,23 +23,23 @@ pub fn VariantAccess( pub const Err = E; - pub fn payloadSeed(self: Self, ally: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { + pub fn payloadSeed(self: Self, arena: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { if (methods.payloadSeed) |func| { - return try func(self.impl, ally, seed); + return try func(self.impl, arena, seed); } @compileError("payloadSeed is not implemented by type: " ++ @typeName(Impl)); } - pub fn payload(self: Self, ally: std.mem.Allocator, comptime Payload: type) E!Payload { + pub fn payload(self: Self, arena: std.mem.Allocator, comptime Payload: type) E!Payload { if (methods.payload) |func| { - return try func(self.impl, ally, Payload); + return try func(self.impl, arena, Payload); } var ds = DefaultSeed(Payload){}; const seed = ds.seed(); - return try self.payloadSeed(ally, seed); + return try self.payloadSeed(arena, seed); } }; @@ -52,9 +52,9 @@ pub fn VariantAccess( fn PayloadSeedFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { + fn func(impl: Impl, arena: std.mem.Allocator, seed: anytype) E!@TypeOf(seed).Value { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -65,9 +65,9 @@ fn PayloadSeedFn(comptime Impl: type, comptime E: type) type { fn PayloadFn(comptime Impl: type, comptime E: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Payload: type) E!Payload { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Payload: type) E!Payload { _ = impl; - _ = ally; + _ = arena; unreachable; } diff --git a/src/de/interfaces/visitor.zig b/src/de/interfaces/visitor.zig index f290818f..a46c17dd 100644 --- a/src/de/interfaces/visitor.zig +++ b/src/de/interfaces/visitor.zig @@ -33,15 +33,15 @@ pub fn Visitor( pub const Value = T; - pub fn visitBool(self: Self, ally: std.mem.Allocator, comptime Deserializer: type, input: bool) Deserializer.Err!T { + pub fn visitBool(self: Self, arena: std.mem.Allocator, comptime Deserializer: type, input: bool) Deserializer.Err!T { if (methods.visitBool) |func| { - return try func(self.impl, ally, Deserializer, input); + return try func(self.impl, arena, Deserializer, input); } return error.Unsupported; } - pub fn visitFloat(self: Self, ally: std.mem.Allocator, comptime Deserializer: type, input: anytype) Deserializer.Err!T { + pub fn visitFloat(self: Self, arena: std.mem.Allocator, comptime Deserializer: type, input: anytype) Deserializer.Err!T { if (methods.visitFloat) |func| { comptime { switch (@typeInfo(@TypeOf(input))) { @@ -50,13 +50,13 @@ pub fn Visitor( } } - return try func(self.impl, ally, Deserializer, input); + return try func(self.impl, arena, Deserializer, input); } return error.Unsupported; } - pub fn visitInt(self: Self, ally: std.mem.Allocator, comptime Deserializer: type, input: anytype) Deserializer.Err!T { + pub fn visitInt(self: Self, arena: std.mem.Allocator, comptime Deserializer: type, input: anytype) Deserializer.Err!T { if (methods.visitInt) |func| { comptime { switch (@typeInfo(@TypeOf(input))) { @@ -65,23 +65,23 @@ pub fn Visitor( } } - return try func(self.impl, ally, Deserializer, input); + return try func(self.impl, arena, Deserializer, input); } return error.Unsupported; } - pub fn visitMap(self: Self, ally: std.mem.Allocator, comptime Deserializer: type, map: anytype) Deserializer.Err!T { + pub fn visitMap(self: Self, arena: std.mem.Allocator, comptime Deserializer: type, map: anytype) Deserializer.Err!T { if (methods.visitMap) |func| { - return try func(self.impl, ally, Deserializer, map); + return try func(self.impl, arena, Deserializer, map); } return error.Unsupported; } - pub fn visitNull(self: Self, ally: std.mem.Allocator, comptime Deserializer: type) Deserializer.Err!T { + pub fn visitNull(self: Self, arena: std.mem.Allocator, comptime Deserializer: type) Deserializer.Err!T { if (methods.visitNull) |func| { - return try func(self.impl, ally, Deserializer); + return try func(self.impl, arena, Deserializer); } return error.Unsupported; @@ -92,17 +92,17 @@ pub fn Visitor( /// The visitor is responsible for visiting the entire sequence. Note /// that this implies that `seq` must be able to identify /// the end of a sequence when it is encountered. - pub fn visitSeq(self: Self, ally: std.mem.Allocator, comptime Deserializer: type, seq: anytype) Deserializer.Err!T { + pub fn visitSeq(self: Self, arena: std.mem.Allocator, comptime Deserializer: type, seq: anytype) Deserializer.Err!T { if (methods.visitSeq) |func| { - return try func(self.impl, ally, Deserializer, seq); + return try func(self.impl, arena, Deserializer, seq); } return error.Unsupported; } - pub fn visitSome(self: Self, ally: std.mem.Allocator, deserializer: anytype) @TypeOf(deserializer).Err!T { + pub fn visitSome(self: Self, arena: std.mem.Allocator, deserializer: anytype) @TypeOf(deserializer).Err!T { if (methods.visitSome) |func| { - return try func(self.impl, ally, deserializer); + return try func(self.impl, arena, deserializer); } return error.Unsupported; @@ -113,7 +113,7 @@ pub fn Visitor( /// The visitor is responsible for visiting the entire slice. pub fn visitString( self: Self, - ally: std.mem.Allocator, + arena: std.mem.Allocator, comptime Deserializer: type, input: anytype, lifetime: StringLifetime, @@ -125,23 +125,23 @@ pub fn Visitor( } } - return try func(self.impl, ally, Deserializer, input, lifetime); + return try func(self.impl, arena, Deserializer, input, lifetime); } return error.Unsupported; } - pub fn visitUnion(self: Self, ally: std.mem.Allocator, comptime Deserializer: type, ua: anytype, va: anytype) Deserializer.Err!T { + pub fn visitUnion(self: Self, arena: std.mem.Allocator, comptime Deserializer: type, ua: anytype, va: anytype) Deserializer.Err!T { if (methods.visitUnion) |func| { - return try func(self.impl, ally, Deserializer, ua, va); + return try func(self.impl, arena, Deserializer, ua, va); } return error.Unsupported; } - pub fn visitVoid(self: Self, ally: std.mem.Allocator, comptime Deserializer: type) Deserializer.Err!T { + pub fn visitVoid(self: Self, arena: std.mem.Allocator, comptime Deserializer: type) Deserializer.Err!T { if (methods.visitVoid) |func| { - return try func(self.impl, ally, Deserializer); + return try func(self.impl, arena, Deserializer); } return error.Unsupported; @@ -165,9 +165,9 @@ pub fn VisitStringReturn(comptime T: type) type { fn VisitAnyFn(comptime Impl: type, comptime T: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Deserializer: type, input: anytype) Deserializer.Err!T { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Deserializer: type, input: anytype) Deserializer.Err!T { _ = impl; - _ = ally; + _ = arena; _ = input; unreachable; @@ -179,9 +179,9 @@ fn VisitAnyFn(comptime Impl: type, comptime T: type) type { fn VisitBoolFn(comptime Impl: type, comptime T: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Deserializer: type, input: bool) Deserializer.Err!T { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Deserializer: type, input: bool) Deserializer.Err!T { _ = impl; - _ = ally; + _ = arena; _ = input; unreachable; @@ -193,9 +193,9 @@ fn VisitBoolFn(comptime Impl: type, comptime T: type) type { fn VisitNothingFn(comptime Impl: type, comptime T: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Deserializer: type) Deserializer.Err!T { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Deserializer: type) Deserializer.Err!T { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -205,9 +205,9 @@ fn VisitNothingFn(comptime Impl: type, comptime T: type) type { } fn VisitSomeFn(comptime Impl: type, comptime T: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, deserializer: anytype) @TypeOf(deserializer).Err!T { + fn func(impl: Impl, arena: std.mem.Allocator, deserializer: anytype) @TypeOf(deserializer).Err!T { _ = impl; - _ = ally; + _ = arena; unreachable; } @@ -220,14 +220,14 @@ fn VisitStringFn(comptime Impl: type, comptime T: type) type { const Lambda = struct { fn func( impl: Impl, - ally: std.mem.Allocator, + arena: std.mem.Allocator, comptime Deserializer: type, input: anytype, lifeitime: StringLifetime, ) Deserializer.Err!VisitStringReturn(T) { _ = lifeitime; _ = impl; - _ = ally; + _ = arena; _ = input; unreachable; @@ -239,9 +239,9 @@ fn VisitStringFn(comptime Impl: type, comptime T: type) type { fn VisitUnionFn(comptime Impl: type, comptime T: type) type { const Lambda = struct { - fn func(impl: Impl, ally: std.mem.Allocator, comptime Deserializer: type, ua: anytype, va: anytype) Deserializer.Err!T { + fn func(impl: Impl, arena: std.mem.Allocator, comptime Deserializer: type, ua: anytype, va: anytype) Deserializer.Err!T { _ = impl; - _ = ally; + _ = arena; _ = ua; _ = va;