mirror of
https://gitea.invidious.io/iv-org/shard-spectator.git
synced 2024-08-15 00:53:35 +00:00
Better handling of casting with covariance and contravariance
This commit is contained in:
parent
2a484d5816
commit
59884f253f
6 changed files with 24 additions and 18 deletions
|
@ -41,11 +41,7 @@ module Spectator::Mocks
|
|||
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
|
||||
@spectator_stub_calls << %call
|
||||
if (%stub = @spectator_stubs.find(&.callable?(%call)))
|
||||
if (%cast = %stub.as?(::Spectator::Mocks::GenericMethodStub(typeof(%method({{args.splat}})))))
|
||||
%cast.call(%args)
|
||||
else
|
||||
raise "The return type of stub #{%stub} doesn't match the expected type #{typeof(%method({{args.splat}}))}"
|
||||
end
|
||||
%stub.call(%args, typeof(%method({{args.splat}})))
|
||||
else
|
||||
%method({{args.splat}})
|
||||
end
|
||||
|
@ -56,11 +52,7 @@ module Spectator::Mocks
|
|||
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
|
||||
@spectator_stub_calls << %call
|
||||
if (%stub = @spectator_stubs.find(&.callable?(%call)))
|
||||
if (%cast = %stub.as?(::Spectator::Mocks::GenericMethodStub(typeof(%method({{args.splat}}) { |*%yield_args| yield *%yield_args }))))
|
||||
%cast.call(%args)
|
||||
else
|
||||
raise "The return type of stub #{%stub} doesn't match the expected type #{typeof(%method({{args.splat}}) { |*%ya| yield *%ya })}"
|
||||
end
|
||||
%stub.call(%args, typeof(%method({{args.splat}}) { |*%ya| yield *%ya }))
|
||||
else
|
||||
%method({{args.splat}}) do |*%yield_args|
|
||||
yield *%yield_args
|
||||
|
|
|
@ -13,8 +13,6 @@ module Spectator::Mocks
|
|||
super && (!@args || @args === call.args)
|
||||
end
|
||||
|
||||
abstract def call(args : GenericArguments(T, NT)) : ReturnType forall T, NT
|
||||
|
||||
def to_s(io)
|
||||
super(io)
|
||||
if @args
|
||||
|
|
|
@ -10,6 +10,8 @@ module Spectator::Mocks
|
|||
@name == call.name
|
||||
end
|
||||
|
||||
abstract def call(args : GenericArguments(T, NT), rt : RT.class) forall T, NT, RT
|
||||
|
||||
def to_s(io)
|
||||
io << '#'
|
||||
io << @name
|
||||
|
|
|
@ -4,8 +4,12 @@ require "./value_method_stub"
|
|||
|
||||
module Spectator::Mocks
|
||||
class NilMethodStub < GenericMethodStub(Nil)
|
||||
def call(_args : GenericArguments(T, NT)) : Nil forall T, NT
|
||||
nil
|
||||
def call(_args : GenericArguments(T, NT), rt : RT.class) forall T, NT, RT
|
||||
if (cast = nil.as?(RT))
|
||||
cast
|
||||
else
|
||||
raise "The return type of stub #{to_s} : Nil doesn't match the expected type #{RT}"
|
||||
end
|
||||
end
|
||||
|
||||
def and_return(value : T) forall T
|
||||
|
|
|
@ -7,8 +7,13 @@ module Spectator::Mocks
|
|||
super(name, source, args)
|
||||
end
|
||||
|
||||
def call(_args : GenericArguments(T, NT)) : ReturnType forall T, NT
|
||||
@proc.call
|
||||
def call(_args : GenericArguments(T, NT), rt : RT.class) forall T, NT, RT
|
||||
result = @proc.call
|
||||
if (cast = result.as?(RT))
|
||||
cast
|
||||
else
|
||||
raise "The return type of stub #{to_s} : #{ReturnType} doesn't match the expected type #{RT}"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,8 +7,13 @@ module Spectator::Mocks
|
|||
super(name, source, args)
|
||||
end
|
||||
|
||||
def call(_args : GenericArguments(T, NT)) : ReturnType forall T, NT
|
||||
@value
|
||||
def call(_args : GenericArguments(T, NT), rt : RT.class) forall T, NT, RT
|
||||
result = @value
|
||||
if (cast = result.as?(RT))
|
||||
cast
|
||||
else
|
||||
raise "The return type of stub #{to_s} : #{ReturnType} doesn't match the expected type #{RT}"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue