From 674a1110f0ad8b95bb6d7332c87aa1c684cd0973 Mon Sep 17 00:00:00 2001
From: Matthew Baulch <baulch.matt@gmail.com>
Date: Thu, 11 Aug 2016 21:13:18 +1000
Subject: [PATCH] Require ordinal or set argument to system.ord

---
 compiler/semmagic.nim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim
index d9fec62759..cbe9bc1768 100644
--- a/compiler/semmagic.nim
+++ b/compiler/semmagic.nim
@@ -114,8 +114,12 @@ proc semTypeTraits(c: PContext, n: PNode): PNode =
 
 proc semOrd(c: PContext, n: PNode): PNode =
   result = n
-  result.typ = makeRangeType(c, firstOrd(n.sons[1].typ),
-                                lastOrd(n.sons[1].typ), n.info)
+  let parType = n.sons[1].typ
+  if isOrdinalType(parType) or parType.kind == tySet:
+    result.typ = makeRangeType(c, firstOrd(parType), lastOrd(parType), n.info)
+  else:
+    localError(n.info, errOrdinalTypeExpected)
+    result.typ = errorType(c)
 
 proc semBindSym(c: PContext, n: PNode): PNode =
   result = copyNode(n)