diff options
| author | Araq <rumpf_a@web.de> | 2013-09-03 23:46:41 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-09-03 23:46:41 +0200 |
| commit | 40b379859c1f0775718a873a0ba58d32510855aa (patch) | |
| tree | 5e45f929dba481fb2413d2f28587a1dbc65b2bb5 /compiler/semmagic.nim | |
| parent | 891f871ba71b0b6e136fea13e5be0bd3e0860fea (diff) | |
| parent | 6fa72c5d9d9662e6657ddf5c670dc56dc2748ecc (diff) | |
| download | Nim-40b379859c1f0775718a873a0ba58d32510855aa.tar.gz | |
resolved the conflict
Diffstat (limited to 'compiler/semmagic.nim')
| -rw-r--r-- | compiler/semmagic.nim | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim index b9ef8b008..88567b10a 100644 --- a/compiler/semmagic.nim +++ b/compiler/semmagic.nim @@ -113,6 +113,7 @@ proc magicsAfterOverloadResolution(c: PContext, n: PNode, result.typ = getSysType(tyString) of mInstantiationInfo: result = semInstantiationInfo(c, n) of mOrd: result = semOrd(c, n) + of mHigh: result = semLowHigh(c, n, mHigh) of mShallowCopy: result = semShallowCopy(c, n, flags) of mNBindSym: result = semBindSym(c, n) of mLocals: result = semLocals(c, n) |