diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
| commit | e9243a16167b24899d4fcf051f3252b3a5804811 (patch) | |
| tree | dc4733a6f178d4f04ee4da33c50ca807eb7e9dd0 /compiler/ccgutils.nim | |
| parent | fc7961d4ccd31ab6e7eabbeb7aa22b5488924b4f (diff) | |
| parent | 02ff5f596c330b68927f843814ecb9b86c2eee67 (diff) | |
| download | Nim-e9243a16167b24899d4fcf051f3252b3a5804811.tar.gz | |
Merge branch 'devel' into araq
Diffstat (limited to 'compiler/ccgutils.nim')
| -rw-r--r-- | compiler/ccgutils.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/ccgutils.nim b/compiler/ccgutils.nim index 6a7aa8951..4cfeeb3c3 100644 --- a/compiler/ccgutils.nim +++ b/compiler/ccgutils.nim @@ -100,7 +100,7 @@ proc getUniqueType*(key: PType): PType = if result == nil: gCanonicalTypes[k] = key result = key - of tyTypeDesc, tyTypeClasses, tyGenericParam, tyFromExpr, tyFieldAccessor: + of tyTypeDesc, tyTypeClasses, tyGenericParam, tyFromExpr: if key.isResolvedUserTypeClass: return getUniqueType(lastSon(key)) if key.sym != nil: @@ -126,7 +126,7 @@ proc getUniqueType*(key: PType): PType = result = slowSearch(key, k) of tyGenericInvocation, tyGenericBody, tyOpenArray, tyArray, tySet, tyRange, tyTuple, - tySequence, tyForward, tyVarargs, tyProxy: + tySequence, tyForward, tyVarargs, tyProxy, tyOpt: # we have to do a slow linear search because types may need # to be compared by their structure: result = slowSearch(key, k) @@ -157,7 +157,7 @@ proc getUniqueType*(key: PType): PType = else: # ugh, we need the canon here: result = slowSearch(key, k) - of tyUnused, tyUnused0, tyUnused1, tyUnused2: internalError("getUniqueType") + of tyUnused, tyOptAsRef, tyUnused1, tyUnused2: internalError("getUniqueType") proc makeSingleLineCString*(s: string): string = result = "\"" |