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

fix seq add for nim node in VM (#5253)

Browse source 
fixes #4821
This commit is contained in:
Arne Döring 2017-01-19 20:10:01 +01:00 • committed by Andreas Rumpf
commit e8a00b805f
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/vm.nim
View file

@ -821,7 +821,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
of opcAddSeqElem: of opcAddSeqElem:
decodeB(rkNode) decodeB(rkNode)
if regs[ra].node.kind == nkBracket: if regs[ra].node.kind == nkBracket:
regs[ra].node.add(copyTree(regs[rb].regToNode)) regs[ra].node.add(copyValue(regs[rb].regToNode))
else: else:
stackTrace(c, tos, pc, errNilAccess) stackTrace(c, tos, pc, errNilAccess)
of opcGetImpl: of opcGetImpl:

7
tests/vm/tnimnode.nim
View file

@ -10,7 +10,7 @@ static:
# an assignment of stmtList into an array # an assignment of stmtList into an array
var nodeArray: array[1, NimNode] var nodeArray: array[1, NimNode]
# an assignment of stmtList into a seq # an assignment of stmtList into a seq
var nodeSeq = newSeq[NimNode](1) var nodeSeq = newSeq[NimNode](2)
proc checkNode(arg: NimNode; name: string): void {. compileTime .} = proc checkNode(arg: NimNode; name: string): void {. compileTime .} =
@ -21,12 +21,17 @@ proc checkNode(arg: NimNode; name: string): void {. compileTime .} =
node = arg node = arg
nodeArray = [arg] nodeArray = [arg]
nodeSeq[0] = arg nodeSeq[0] = arg
var seqAppend = newSeq[NimNode](0)
seqAppend.add([arg]) # at the time of this writing this works
seqAppend.add(arg) # bit this creates a copy
arg.add newCall(ident"echo", newLit("Hello World")) arg.add newCall(ident"echo", newLit("Hello World"))
assertEq arg.lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))""" assertEq arg.lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))"""
assertEq node.lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))""" assertEq node.lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))"""
assertEq nodeArray[0].lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))""" assertEq nodeArray[0].lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))"""
assertEq nodeSeq[0].lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))""" assertEq nodeSeq[0].lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))"""
assertEq seqAppend[0].lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))"""
assertEq seqAppend[1].lispRepr , """StmtList(DiscardStmt(Empty()), Call(Ident(!"echo"), StrLit(Hello World)))"""
echo "OK" echo "OK"