Manual merge

This commit is contained in:
cooldome 2018-06-12 23:20:34 +01:00
commit 3dd61d6fff

View file

@ -593,6 +593,7 @@ proc typeToString(typ: PType, prefer: TPreferedDesc = preferName): string =
result = typeToStr[t.kind]
result.addTypeFlags(t)
proc firstOrd*(conf: ConfigRef; t: PType): BiggestInt =
case t.kind
of tyBool, tyChar, tySequence, tyOpenArray, tyString, tyVarargs, tyProxy: