Skip to content

Commit

Permalink
proc params as syms (#15332)
Browse files Browse the repository at this point in the history
* proc params are now syms

* Fix typesrenderer

* Add testcase for disrupteks issue

* fix test

* Trigger build

* Trigger build

* Trigger build

Co-authored-by: Clyybber <darkmine956@gmail.com>
  • Loading branch information
cooldome and Clyybber authored Sep 16, 2020
1 parent a3e9cc5 commit 341be0b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions compiler/semtypes.nim
Original file line number Diff line number Diff line change
Expand Up @@ -1286,6 +1286,7 @@ proc semProcTypeNode(c: PContext, n, genericParams: PNode,
addParamOrResult(c, arg, kind)
styleCheckDef(c.config, a[j].info, arg)
onDef(a[j].info, arg)
a[j] = newSymNode(arg)

var r: PType
if n[0].kind != nkEmpty:
Expand Down
2 changes: 1 addition & 1 deletion compiler/typesrenderer.nim
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ proc renderType(n: PNode): string =
let typeStr = renderType(n[typePos])
result = typeStr
for i in 1..<typePos:
assert n[i].kind == nkIdent
assert n[i].kind in {nkSym, nkIdent}
result.add(',' & typeStr)
of nkTupleTy:
result = "tuple["
Expand Down
10 changes: 9 additions & 1 deletion lib/js/jsffi.nim
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,14 @@ macro `{}`*(typ: typedesc, xs: varargs[untyped]): auto =
# Macro to build a lambda using JavaScript's `this`
# from a proc, `this` being the first argument.

proc replaceSyms(n: NimNode): NimNode =
if n.kind == nnkSym:
result = newIdentNode($n)
else:
result = n
for i in 0..<n.len:
result[i] = replaceSyms(n[i])

macro bindMethod*(procedure: typed): auto =
## Takes the name of a procedure and wraps it into a lambda missing the first
## argument, which passes the JavaScript builtin ``this`` as the first
Expand Down Expand Up @@ -491,7 +499,7 @@ macro bindMethod*(procedure: typed): auto =
getImpl(procedure)
else:
procedure
args = rawProc[3]
args = rawProc[3].copyNimTree.replaceSyms
thisType = args[1][1]
params = newNimNode(nnkFormalParams).add(args[0])
body = newNimNode(nnkLambda)
Expand Down
8 changes: 8 additions & 0 deletions tests/macros/tmacros_various.nim
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,11 @@ noop:
makeVar
echo tensorY

macro xbenchmark(body: typed): untyped =
result = body

xbenchmark:
proc fastSHA(inputtest: string) =
discard inputtest
fastSHA("hey")

0 comments on commit 341be0b

Please sign in to comment.