diff options
author | Clay Sweetser <clay.sweetser@gmail.com> | 2014-05-26 10:16:59 -0400 |
---|---|---|
committer | Clay Sweetser <clay.sweetser@gmail.com> | 2014-05-26 10:16:59 -0400 |
commit | 9d68fe378203f4cdd9edc412b8d0b0f6b422fb14 (patch) | |
tree | e7f809ef1bc386d026ca8f96a63d886c327db210 | |
parent | c4f77ecd9ace7ba131438f325138aeecbf4ae490 (diff) | |
download | Nim-9d68fe378203f4cdd9edc412b8d0b0f6b422fb14.tar.gz |
Rename some variables in the isCastable code
-rw-r--r-- | compiler/semexprs.nim | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index faba700ca..5d4dc33bf 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -184,18 +184,18 @@ proc isCastable(dst, src: PType): bool = # castableTypeKinds = {tyInt, tyPtr, tyRef, tyCstring, tyString, # tySequence, tyPointer, tyNil, tyOpenArray, # tyProc, tySet, tyEnum, tyBool, tyChar} - var ds, ss: BiggestInt + var dstSize, srcSize: BiggestInt - ds = computeSize(dst) - ss = computeSize(src) - if ds < 0: + dstSize = computeSize(dst) + srcSize = computeSize(src) + if dstSize < 0: result = false - elif ss < 0: + elif srcSize < 0: result = false elif not typeAllowed(dst, skParam): result = false else: - result = (ds >= ss) or + result = (dstSize >= srcSize) or (skipTypes(dst, abstractInst).kind in IntegralTypes) or (skipTypes(src, abstractInst-{tyTypeDesc}).kind in IntegralTypes) |