jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring: removed empty withBracketExpr template (#18152)

Browse source
This commit is contained in:
Andreas Rumpf 2021-06-02 13:14:10 +02:00 • committed by GitHub
commit 6768f507fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/semgnrc.nim
View file

@ -303,8 +303,7 @@ proc semGenericStmt(c: PContext, n: PNode,
result = newNodeI(nkCall, n.info) result = newNodeI(nkCall, n.info)
result.add newIdentNode(getIdent(c.cache, "[]"), n.info) result.add newIdentNode(getIdent(c.cache, "[]"), n.info)
for i in 0..<n.len: result.add(n[i]) for i in 0..<n.len: result.add(n[i])
withBracketExpr ctx, n[0]: result = semGenericStmt(c, result, flags, ctx)
result = semGenericStmt(c, result, flags, ctx)
of nkAsgn, nkFastAsgn: of nkAsgn, nkFastAsgn:
checkSonsLen(n, 2, c.config) checkSonsLen(n, 2, c.config)
let a = n[0] let a = n[0]
@ -323,8 +322,7 @@ proc semGenericStmt(c: PContext, n: PNode,
result.add newIdentNode(getIdent(c.cache, "[]="), n.info) result.add newIdentNode(getIdent(c.cache, "[]="), n.info)
for i in 0..<a.len: result.add(a[i]) for i in 0..<a.len: result.add(a[i])
result.add(b) result.add(b)
withBracketExpr ctx, a[0]: result = semGenericStmt(c, result, flags, ctx)
result = semGenericStmt(c, result, flags, ctx)
else: else:
for i in 0..<n.len: for i in 0..<n.len:
result[i] = semGenericStmt(c, n[i], flags, ctx) result[i] = semGenericStmt(c, n[i], flags, ctx)

10
compiler/semtempl.nim
View file

@ -131,9 +131,6 @@ type
noGenSym: int noGenSym: int
inTemplateHeader: int inTemplateHeader: int
template withBracketExpr(ctx, x, body: untyped) =
body
proc getIdentNode(c: var TemplCtx, n: PNode): PNode = proc getIdentNode(c: var TemplCtx, n: PNode): PNode =
case n.kind case n.kind
of nkPostfix: result = getIdentNode(c, n[1]) of nkPostfix: result = getIdentNode(c, n[1])
@ -491,9 +488,7 @@ proc semTemplBody(c: var TemplCtx, n: PNode): PNode =
result = newNodeI(nkCall, n.info) result = newNodeI(nkCall, n.info)
result.add newIdentNode(getIdent(c.c.cache, "[]"), n.info) result.add newIdentNode(getIdent(c.c.cache, "[]"), n.info)
for i in 0..<n.len: result.add(n[i]) for i in 0..<n.len: result.add(n[i])
let n0 = semTemplBody(c, n[0]) result = semTemplBodySons(c, result)
withBracketExpr c, n0:
result = semTemplBodySons(c, result)
of nkCurlyExpr: of nkCurlyExpr:
result = newNodeI(nkCall, n.info) result = newNodeI(nkCall, n.info)
result.add newIdentNode(getIdent(c.c.cache, "{}"), n.info) result.add newIdentNode(getIdent(c.c.cache, "{}"), n.info)
@ -512,8 +507,7 @@ proc semTemplBody(c: var TemplCtx, n: PNode): PNode =
for i in 0..<a.len: result.add(a[i]) for i in 0..<a.len: result.add(a[i])
result.add(b) result.add(b)
let a0 = semTemplBody(c, a[0]) let a0 = semTemplBody(c, a[0])
withBracketExpr c, a0: result = semTemplBodySons(c, result)
result = semTemplBodySons(c, result)
of nkCurlyExpr: of nkCurlyExpr:
result = newNodeI(nkCall, n.info) result = newNodeI(nkCall, n.info)
result.add newIdentNode(getIdent(c.c.cache, "{}="), n.info) result.add newIdentNode(getIdent(c.c.cache, "{}="), n.info)