Merge branch 'devel' into araq

This commit is contained in:
Andreas Rumpf
2017-04-04 13:38:41 +02:00
4 changed files with 22 additions and 5 deletions

View File

@@ -155,7 +155,7 @@ proc presentFailedCandidates(c: PContext, n: PNode, errors: CandidateErrors):
renderTree(n[err.unmatchedVarParam]) & "' is immutable\n")
for diag in err.diagnostics:
add(candidates, diag & "\n")
result = (prefer, candidates)
proc notFoundError*(c: PContext, n: PNode, errors: CandidateErrors) =
@@ -250,13 +250,11 @@ proc resolveOverloads(c: PContext, n, orig: PNode,
if result.state in {csEmpty, csNoMatch}:
tryOp "."
elif nfDotSetter in n.flags:
internalAssert f.kind == nkIdent and n.sonsLen == 3
elif nfDotSetter in n.flags and f.kind == nkIdent and n.len == 3:
let calleeName = newStrNode(nkStrLit,
f.ident.s[0..f.ident.s.len-2]).withInfo(n.info)
let callOp = newIdentNode(getIdent".=", n.info)
n.sons[0..1] = [callOp, n[1], calleeName]
excl(n.flags, nfDotSetter)
orig.sons[0..1] = [callOp, orig[1], calleeName]
pickBest(callOp)

View File

@@ -13,7 +13,6 @@
#define _GENODE_CPP__THREAD_H_
#include <base/thread.h>
#include <util/avl_tree.h>
#include <util/reconstructible.h>
namespace Nim { struct SysThread; }

View File

@@ -593,6 +593,8 @@ elif defined(genode):
proc createThread*[TArg](t: var Thread[TArg],
tp: proc (arg: TArg) {.thread, nimcall.},
param: TArg) =
t.core = cast[PGcThread](allocShared0(sizeof(GcThread)))
when TArg isnot void: t.data = param
t.dataFn = tp
when hasSharedHeap: t.stackSize = ThreadStackSize

View File

@@ -0,0 +1,18 @@
discard """
output: '''ok'''
"""
# bug #5638
type X = object
a_impl: int
proc a(x: X): int =
x.a_impl
var x: X
assert(not compiles((block:
x.a = 1
)))
echo "ok"