iv-org-mirror/shard-spectator
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-spectator.git synced 2024-08-15 00:53:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Workaround for what seems to be a Crystal macro bug

Browse source 
The syntax:
stub instance.==(other) { true }
effectively becomes:
stub instance.==(other { true })
This commit is contained in:
Michael Miller 2020-01-01 21:48:58 -07:00
parent a9ac48e12c
commit 061028782b
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/spectator/mocks/double.cr
View file

@ -17,13 +17,28 @@ module Spectator::Mocks
named = false named = false
name = definition.name.id name = definition.name.id
params = definition.args params = definition.args
# Possibly a weird compiler bug, but syntax like this:
# stub instance.==(other) { true }
# Results in `other` being the call `other { true }`.
# This works around the issue by pulling out the block
# and setting the parameter to just the name.
if params.last.is_a?(Call)
body = params.last.block
params[-1] = params.last.name
end
args = params.map do |p| args = params.map do |p|
n = p.is_a?(TypeDeclaration) ? p.var : p.id n = p.is_a?(TypeDeclaration) ? p.var : p.id
r = named ? "#{n}: #{n}".id : n r = named ? "#{n}: #{n}".id : n
named = true if n.starts_with?('*') named = true if n.starts_with?('*')
r r
end end
body = definition.block.is_a?(Nop) ? block : definition.block
# The unless is here because `||=` can't be used in macros @_@
unless body
body = definition.block.is_a?(Nop) ? block : definition.block
end
elsif definition.is_a?(TypeDeclaration) # stub foo : Symbol elsif definition.is_a?(TypeDeclaration) # stub foo : Symbol
name = definition.var name = definition.var
params = [] of MacroId params = [] of MacroId

8
src/spectator/mocks/stubs.cr
View file

@ -12,13 +12,19 @@ module Spectator::Mocks
named = false named = false
name = definition.name.id name = definition.name.id
params = definition.args params = definition.args
if params.last.is_a?(Call)
body = params.last.block
params[-1] = params.last.name
end
args = params.map do |p| args = params.map do |p|
n = p.is_a?(TypeDeclaration) ? p.var : p.id n = p.is_a?(TypeDeclaration) ? p.var : p.id
r = named ? "#{n}: #{n}".id : n r = named ? "#{n}: #{n}".id : n
named = true if n.starts_with?('*') named = true if n.starts_with?('*')
r r
end end
body = definition.block.is_a?(Nop) ? block : definition.block unless body
body = definition.block.is_a?(Nop) ? block : definition.block
end
elsif definition.is_a?(TypeDeclaration) # stub foo : Symbol elsif definition.is_a?(TypeDeclaration) # stub foo : Symbol
name = definition.var name = definition.var
params = [] of MacroId params = [] of MacroId