From 9d68fe378203f4cdd9edc412b8d0b0f6b422fb14 Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Mon, 26 May 2014 10:16:59 -0400 Subject: Rename some variables in the isCastable code --- compiler/semexprs.nim | 12 ++++++------ 1 file 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) -- cgit 1.4.1-2-gfad0