jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make tests green again

Browse source
This commit is contained in:
Andreas Rumpf 2018-02-03 07:57:47 +01:00
commit 992fd38487
2 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/sigmatch.nim
View file

@ -1859,9 +1859,9 @@ proc paramTypesMatchAux(m: var TCandidate, f, a: PType,
var r = typeRel(m, f, a) var r = typeRel(m, f, a)
when false:
# This special typing rule for macros and templates is not documented # This special typing rule for macros and templates is not documented
# anywhere and breaks symmetry. # anywhere and breaks symmetry. It's hard to get rid of though, my
# custom seqs example fails to compile without this:
if r != isNone and m.calleeSym != nil and if r != isNone and m.calleeSym != nil and
m.calleeSym.kind in {skMacro, skTemplate}: m.calleeSym.kind in {skMacro, skTemplate}:
# XXX: duplicating this is ugly, but we cannot (!) move this # XXX: duplicating this is ugly, but we cannot (!) move this

4
tests/macros/tgettypeinst.nim
View file

@ -1,10 +1,6 @@
discard """ discard """
disabled: "true"
""" """
# disabled: relied on undocumented overloading rules. Too much work
# to make this sane.
import macros, strUtils import macros, strUtils
proc symToIdent(x: NimNode): NimNode = proc symToIdent(x: NimNode): NimNode =