diff options
| author | Araq <rumpf_a@web.de> | 2013-12-27 23:10:36 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-12-27 23:10:36 +0100 |
| commit | 92b8fac94a7243cde785d985db3fd86b6025b079 (patch) | |
| tree | edbfdbab6cf496d6a0cfe226957769c3c43d2fa9 /compiler/aliases.nim | |
| parent | 706266d8b728b19fde6d69fd6ccdfb65ae7b6a17 (diff) | |
| download | Nim-92b8fac94a7243cde785d985db3fd86b6025b079.tar.gz | |
case consistency part 4
Diffstat (limited to 'compiler/aliases.nim')
| -rw-r--r-- | compiler/aliases.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/aliases.nim b/compiler/aliases.nim index 7accb8ce3..5be7b5f12 100644 --- a/compiler/aliases.nim +++ b/compiler/aliases.nim @@ -42,7 +42,7 @@ proc isPartOfAux(n: PNode, b: PType, marker: var TIntSet): TAnalysisResult = proc isPartOfAux(a, b: PType, marker: var TIntSet): TAnalysisResult = result = arNo if a == nil or b == nil: return - if ContainsOrIncl(marker, a.id): return + if containsOrIncl(marker, a.id): return if compareTypes(a, b, dcEqIgnoreDistinct): return arYes case a.kind of tyObject: @@ -58,7 +58,7 @@ proc isPartOfAux(a, b: PType, marker: var TIntSet): TAnalysisResult = proc isPartOf(a, b: PType): TAnalysisResult = ## checks iff 'a' can be part of 'b'. Iterates over VALUE types! - var marker = InitIntSet() + var marker = initIntSet() # watch out: parameters reversed because I'm too lazy to change the code... result = isPartOfAux(b, a, marker) @@ -115,7 +115,7 @@ proc isPartOf*(a, b: PNode): TAnalysisResult = var x = if a[1].kind == nkHiddenStdConv: a[1][1] else: a[1] var y = if b[1].kind == nkHiddenStdConv: b[1][1] else: b[1] - if SameValue(x, y): result = arYes + if sameValue(x, y): result = arYes else: result = arNo # else: maybe and no are accurate else: |