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

Merge pull request #9085 from LemonBoy/fix-9079

Browse source 
Constant folding should not drop distinct types
This commit is contained in:
Andreas Rumpf 2018-09-28 09:29:09 +02:00 • committed by GitHub
commit 959e3a08b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/semfold.nim
View file

@ -37,10 +37,7 @@ proc newIntNodeT*(intVal: BiggestInt, n: PNode; g: ModuleGraph): PNode =
proc newFloatNodeT*(floatVal: BiggestFloat, n: PNode; g: ModuleGraph): PNode = proc newFloatNodeT*(floatVal: BiggestFloat, n: PNode; g: ModuleGraph): PNode =
result = newFloatNode(nkFloatLit, floatVal) result = newFloatNode(nkFloatLit, floatVal)
if skipTypes(n.typ, abstractVarRange).kind == tyFloat: result.typ = n.typ
result.typ = getFloatLitType(g, result)
else:
result.typ = n.typ
result.info = n.info result.info = n.info
proc newStrNodeT*(strVal: string, n: PNode; g: ModuleGraph): PNode = proc newStrNodeT*(strVal: string, n: PNode; g: ModuleGraph): PNode =

19
tests/distinct/t9079.nim Normal file
View file

@ -0,0 +1,19 @@
discard """
output: '''
25.0
210.0
'''
"""
type
Dollars = distinct float
proc `$`(d: Dollars): string {.borrow.}
proc `*` *(a, b: Dollars): Dollars {.borrow.}
proc `+` *(a, b: Dollars): Dollars {.borrow.}
var a = Dollars(20)
a = Dollars(25.0)
echo a
a = 10.Dollars * (20.Dollars + 1.Dollars)
echo a