diff options
author | Andreas Rumpf <andreas@andreas-desktop> | 2010-03-08 20:46:54 +0100 |
---|---|---|
committer | Andreas Rumpf <andreas@andreas-desktop> | 2010-03-08 20:46:54 +0100 |
commit | dab64b5c0e45bfcbe914e461565dc3b1e7168e26 (patch) | |
tree | 67a47e4986722050d482aa67ad3698b0c4b5abad /rod/sigmatch.nim | |
parent | a2d78c562c3cba6c635f44cd0205dc68d85f2672 (diff) | |
download | Nim-dab64b5c0e45bfcbe914e461565dc3b1e7168e26.tar.gz |
bugfix: bug499771
Diffstat (limited to 'rod/sigmatch.nim')
-rwxr-xr-x | rod/sigmatch.nim | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/rod/sigmatch.nim b/rod/sigmatch.nim index 801079931..2db387b95 100755 --- a/rod/sigmatch.nim +++ b/rod/sigmatch.nim @@ -1,7 +1,7 @@ # # # The Nimrod Compiler -# (c) Copyright 2009 Andreas Rumpf +# (c) Copyright 2010 Andreas Rumpf # # See the file "copying.txt", included in this # distribution, for details about the copyright. @@ -353,14 +353,12 @@ proc typeRel(mapping: var TIdTable, f, a: PType): TTypeRelation = of tyPointer: result = isEqual of tyNil: result = isSubtype of tyRef, tyPtr, tyProc, tyCString: result = isConvertible - else: - nil + else: nil of tyString: case a.kind of tyString: result = isEqual of tyNil: result = isSubtype - else: - nil + else: nil of tyCString: # conversion from string to cstring is automatic: case a.Kind @@ -418,8 +416,8 @@ proc typeRel(mapping: var TIdTable, f, a: PType): TTypeRelation = idTablePut(mapping, f, concrete) result = isGeneric else: - InternalError(f.sym.info, "has constraints: " & f.sym.name.s) # check - # constraints: + InternalError(f.sym.info, "has constraints: " & f.sym.name.s) + # check constraints: for i in countup(0, sonsLen(f) - 1): if typeRel(mapping, f.sons[i], a) >= isSubtype: concrete = concreteType(mapping, a) |