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

bugfix: fixed broken expr proc bodies

Browse source
This commit is contained in:
Araq 2012-10-12 18:40:24 +02:00
commit 8cadc60e08
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/semstmts.nim
View file

@ -903,9 +903,9 @@ proc semStaticStmt(c: PContext, n: PNode): PNode =
result.sons[0] = emptyNode
# special marker values that indicates that we are
# 1) AnalyzingDestructor: currenlty analyzing the type for destructor
# 1) AnalyzingDestructor: currently analyzing the type for destructor
# generation (needed for recursive types)
# 2) DestructorIsTrivial: completed the anlysis before and determined
# 2) DestructorIsTrivial: completed the analysis before and determined
# that the type has a trivial destructor
var AnalyzingDestructor, DestructorIsTrivial: PSym
new(AnalyzingDestructor)
@ -1131,6 +1131,10 @@ proc semStmtList(c: PContext, n: PNode): PNode =
of nkPragma, nkCommentStmt, nkNilLit, nkEmpty: nil
else: localError(n.sons[j].info, errStmtInvalidAfterReturn)
else: nil
# a statement list (s; e) has the type 'e':
if result.kind == nkStmtList and result.len > 0:
result.typ = lastSon(result).typ
proc SemStmt(c: PContext, n: PNode): PNode =
# now: simply an alias: