manual merge

This commit is contained in:
cooldome
2018-06-10 23:07:05 +01:00
parent 17ab7aff44
commit 4d87d666ee

View File

@@ -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]))