diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/nversion.nim | 6 | ||||
| -rw-r--r-- | compiler/semtypinst.nim | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/compiler/nversion.nim b/compiler/nversion.nim index db38354ce..b996d0b9b 100644 --- a/compiler/nversion.nim +++ b/compiler/nversion.nim @@ -1,7 +1,7 @@ # # # The Nimrod Compiler -# (c) Copyright 2012 Andreas Rumpf +# (c) Copyright 2014 Andreas Rumpf # # See the file "copying.txt", included in this # distribution, for details about the copyright. @@ -15,8 +15,8 @@ const defaultAsmMarkerSymbol* = '!' VersionMajor* = 0 VersionMinor* = 9 - VersionPatch* = 3 + VersionPatch* = 4 VersionAsString* = $VersionMajor & "." & $VersionMinor & "." & $VersionPatch - RodFileVersion* = "1214" # modify this if the rod-format changes! + RodFileVersion* = "1215" # modify this if the rod-format changes! diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index 271a01266..33de40f34 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -352,8 +352,9 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType = result = handleGenericInvokation(cl, t) of tyGenericBody: - internalError(cl.info, "ReplaceTypeVarsT: tyGenericBody" ) - result = replaceTypeVarsT(cl, lastSon(t)) + localError(cl.info, errCannotInstantiateX, typeToString(t)) + result = t + #result = replaceTypeVarsT(cl, lastSon(t)) of tyFromExpr: if cl.allowMetaTypes: return |