From 4d87d666ee12d9a16a0a3b21ab30b46f9e933cb0 Mon Sep 17 00:00:00 2001 From: cooldome Date: Sun, 10 Jun 2018 23:07:05 +0100 Subject: [PATCH] manual merge --- compiler/semtypes.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim index 366ba9cb79..602c5eeaf7 100644 --- a/compiler/semtypes.nim +++ b/compiler/semtypes.nim @@ -232,9 +232,9 @@ proc semRangeAux(c: PContext, n: PNode, prev: PType): PType = if not hasUnknownTypes: if not sameType(rangeT[0].skipTypes({tyRange}), rangeT[1].skipTypes({tyRange})): - localError(c.config, n.info, errPureTypeMismatch) + localError(c.config, n.info, "type mismatch") elif not rangeT[0].isOrdinalType and rangeT[0].kind notin tyFloat..tyFloat128: - localError(c.config, n.info, errOrdinalOrFloatTypeExpected) + localError(c.config, n.info, "ordinal or float type expected") elif enumHasHoles(rangeT[0]): localError(c.config, n.info, "enum '$1' has holes" % typeToString(rangeT[0]))