status-im
/
nimqml
mirror of https://github.com/status-im/nimqml.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed missing arguments in the code generated for a signal emittion 

This could cause crashes when accessing the i-th argument from Qml
through arg0, arg1
This commit is contained in:
Filippo Cucchetto 2016-09-25 17:45:17 +02:00
parent c1287e7263
commit 3814eac811
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/private/nimqmlmacros.nim
View File

@ -53,7 +53,8 @@ proc removeChild(node: NimNode, child: NimNode): bool =
proc toString(info: ProcInfo): string {.compiletime.} =
## Convert a ProcInfo to string
"SlotInfo {\"$1\", $2, [$3]}" % [info.name, info.returnType, info.parametersTypes.join(",")]
let str = "ProcInfo {\n Name:\"$1\",\n Return Type:$2,\n Param Types:[$3],\n Param Names:[$4]\n}"
str % [info.name, info.returnType, info.parametersTypes.join(","), info.parametersNames.join(",")]
proc display(info: ProcInfo) {.compiletime.} =
@ -472,8 +473,18 @@ macro slot*(s: stmt): stmt =
macro signal*(s: stmt): stmt {.immediate.} =
## Generate the signal implementation
let info = extractProcInfo(s)
let str = "$1.emit(\"$2\", [$3])"
s[s.len - 1 ] = parseStmt(str % [info.parametersNames[0], info.name, ""])
# Remove self from parameter names
var parametersNames: seq[string] = @[]
var i = 0
for name in info.parametersNames:
if i != 0:
parametersNames.add("newQVariant($1)" % name)
inc(i)
let format = "$1.emit(\"$2\", [$3])"
let str = format % [info.parametersNames[0], info.name, parametersNames.join(", ")]
s[s.len - 1 ] = parseStmt(str)
return s