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

bugfix: bug #511622

Browse source
This commit is contained in:
Andreas Rumpf 2010-03-08 23:09:46 +01:00
commit 684bb09773
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rod/transf.nim
View file

@ -1,7 +1,7 @@
# #
# #
# The Nimrod Compiler # The Nimrod Compiler
# (c) Copyright 2009 Andreas Rumpf # (c) Copyright 2010 Andreas Rumpf
# #
# See the file "copying.txt", included in this # See the file "copying.txt", included in this
# distribution, for details about the copyright. # distribution, for details about the copyright.
@ -287,7 +287,10 @@ proc transformConv(c: PTransf, n: PNode): PNode =
var source = skipTypes(n.sons[1].typ, abstractVarRange) var source = skipTypes(n.sons[1].typ, abstractVarRange)
case dest.kind case dest.kind
of tyInt..tyInt64, tyEnum, tyChar, tyBool: of tyInt..tyInt64, tyEnum, tyChar, tyBool:
if (firstOrd(dest) <= firstOrd(source)) and if not isOrdinalType(source):
# XXX int64 -> float conversion?
result = n
elif (firstOrd(dest) <= firstOrd(source)) and
(lastOrd(source) <= lastOrd(dest)): (lastOrd(source) <= lastOrd(dest)):
# BUGFIX: simply leave n as it is; we need a nkConv node, # BUGFIX: simply leave n as it is; we need a nkConv node,
# but no range check: # but no range check:

2
tests/accept/run/spec.csv
View file

@ -9,7 +9,7 @@ tbind3.nim;1
tbintre2.nim;halloworld99110223 tbintre2.nim;halloworld99110223
tbintree.nim;halloworld99110223 tbintree.nim;halloworld99110223
tbug499771.nim;TSubRange: 5 from 1 to 10 tbug499771.nim;TSubRange: 5 from 1 to 10
tbug511622.nim;10 tbug511622.nim;3
tcasestm.nim;ayyy tcasestm.nim;ayyy
tclosure.nim;2 4 6 8 10 tclosure.nim;2 4 6 8 10
tcnstseq.nim;AngelikaAnneAnnaAnkaAnja tcnstseq.nim;AngelikaAnneAnnaAnkaAnja

1 tack.nim 125
9 tbintre2.nim halloworld99110223
10 tbintree.nim halloworld99110223
11 tbug499771.nim TSubRange: 5 from 1 to 10
12 tbug511622.nim 10 3
13 tcasestm.nim ayyy
14 tclosure.nim 2 4 6 8 10
15 tcnstseq.nim AngelikaAnneAnnaAnkaAnja

3
tests/accept/run/tbug511622.nim
View file

@ -6,4 +6,5 @@ proc FibonacciA(n: int): int64 =
var q: float64 = 1.0 / p var q: float64 = 1.0 / p
return int64((pow(p, fn) + pow(q, fn)) / sqrt(5.0)) return int64((pow(p, fn) + pow(q, fn)) / sqrt(5.0))
echo FibonacciA(4) #OUT 10 echo FibonacciA(4) #OUT 3