mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-07 21:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some merge conflict leftovers

Browse Source
This commit is contained in:
narimiran
2023-01-31 18:01:06 +01:00
parent 17d45dfd6a
commit afdbfd2c7e
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/semexprs.nim
View File

@@ -2795,18 +2795,6 @@ proc semExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
defer:
if isCompilerDebug():
echo ("<", c.config$n.info, n, ?.result.typ)
<<<<<<< HEAD
=======
template directLiteral(typeKind: TTypeKind) =
if result.typ == nil:
if expectedType != nil and (
let expected = expectedType.skipTypes(abstractRange-{tyDistinct});
expected.kind == typeKind):
result.typ = expected
changeType(c, result, expectedType, check=true)
else:
result.typ = getSysType(c.graph, n.info, typeKind)
>>>>>>> 7031ea65c (Implemented basic macro expand functionality (#20579))
result = n
when defined(nimsuggest):