summary refs log tree commit diff stats
path: root/compiler/semexprs.nim
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2012-03-21 23:11:16 +0100
committerAraq <rumpf_a@web.de>2012-03-21 23:11:16 +0100
commit4f22326b2493642c1edb39ab262f1f7d0e81461c (patch)
treecf7ef0052339faf70132673be800e77033dd5a8a /compiler/semexprs.nim
parent03ba0f3e251a08587a12a340949bb2de49178af9 (diff)
parent70f5236d48855cd4ef55f4d12e07183316a1f886 (diff)
downloadNim-4f22326b2493642c1edb39ab262f1f7d0e81461c.tar.gz
Merge branch 'master' of github.com:Araq/Nimrod
Diffstat (limited to 'compiler/semexprs.nim')
-rwxr-xr-xcompiler/semexprs.nim4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index d3b30e24b..147f38abb 100755
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -918,7 +918,7 @@ proc semAsgn(c: PContext, n: PNode): PNode =
     let nOrig = n.copyTree
     a = builtinFieldAccess(c, a, {efLValue})
     if a == nil: 
-      return propertyWriteAccess(c, n, nOrig, a)
+      return propertyWriteAccess(c, n, nOrig, n[0])
   of nkBracketExpr: 
     # a[i] = x
     # --> `[]=`(a, i, x)
@@ -1028,7 +1028,7 @@ proc semExpandToAst(c: PContext, n: PNode, magicSym: PSym,
 
     # Preserve the magic symbol in order to be handled in evals.nim
     n.sons[0] = newSymNode(magicSym, n.info)
-    n.typ = expandedSym.getReturnType
+    n.typ = getSysSym("PNimrodNode").typ # expandedSym.getReturnType
     result = n
   else:
     result = semDirectOp(c, n, flags)