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

fixes newly introduced bugs

Browse source
This commit is contained in:
Araq 2014-08-14 02:42:26 +02:00
commit 2728bbccc4
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/ccgstmts.nim
View file

@ -1,7 +1,7 @@
# #
# #
# The Nimrod Compiler # The Nimrod Compiler
# (c) Copyright 2013 Andreas Rumpf # (c) Copyright 2014 Andreas Rumpf
# #
# See the file "copying.txt", included in this # See the file "copying.txt", included in this
# distribution, for details about the copyright. # distribution, for details about the copyright.
@ -160,7 +160,6 @@ proc genSingleVar(p: BProc, a: PNode) =
var v = a.sons[0].sym var v = a.sons[0].sym
if sfCompileTime in v.flags: return if sfCompileTime in v.flags: return
var targetProc = p var targetProc = p
var immediateAsgn = isAssignedImmediately(a.sons[2])
if sfGlobal in v.flags: if sfGlobal in v.flags:
if sfPure in v.flags: if sfPure in v.flags:
# v.owner.kind != skModule: # v.owner.kind != skModule:
@ -180,14 +179,14 @@ proc genSingleVar(p: BProc, a: PNode) =
registerGcRoot(p, v) registerGcRoot(p, v)
else: else:
assignLocalVar(p, v) assignLocalVar(p, v)
initLocalVar(p, v, immediateAsgn) initLocalVar(p, v, isAssignedImmediately(a.sons[2]))
if immediateAsgn: if a.sons[2].kind != nkEmpty:
genLineDir(targetProc, a) genLineDir(targetProc, a)
loadInto(targetProc, a.sons[0], a.sons[2], v.loc) loadInto(targetProc, a.sons[0], a.sons[2], v.loc)
proc genClosureVar(p: BProc, a: PNode) = proc genClosureVar(p: BProc, a: PNode) =
var immediateAsgn = isAssignedImmediately(a.sons[2]) var immediateAsgn = a.sons[2].kind != nkEmpty
if immediateAsgn: if immediateAsgn:
var v: TLoc var v: TLoc
initLocExpr(p, a.sons[0], v) initLocExpr(p, a.sons[0], v)

4
doc/lib.txt
View file

@ -450,10 +450,6 @@ Other
This module contains code for reading from `stdin`:idx:. On UNIX the GNU This module contains code for reading from `stdin`:idx:. On UNIX the GNU
readline library is wrapped and set up. readline library is wrapped and set up.
* `zmq <zmq.html>`_
Nimrod 0mq wrapper. This file contains the low level C wrappers as well as
some higher level constructs.
Wrappers Wrappers
======== ========

2
lib/system.nim
View file

@ -2185,7 +2185,7 @@ when not defined(JS): #and not defined(NimrodVM):
proc initStackBottomWith(locals: pointer) {.inline, compilerproc.} = proc initStackBottomWith(locals: pointer) {.inline, compilerproc.} =
# We need to keep initStackBottom around for now to avoid # We need to keep initStackBottom around for now to avoid
# bootstrapping problems. # bootstrapping problems.
when defined(setStackBottom): when declared(setStackBottom):
setStackBottom(locals) setStackBottom(locals)
var var

2
web/nimrod.ini
View file

@ -54,7 +54,7 @@ srcdoc2: "pure/httpserver;pure/httpclient;pure/smtp;impure/ssl;pure/fsmonitor"
srcdoc2: "pure/ropes;pure/unidecode/unidecode;pure/xmldom;pure/xmldomparser" srcdoc2: "pure/ropes;pure/unidecode/unidecode;pure/xmldom;pure/xmldomparser"
srcdoc2: "pure/xmlparser;pure/htmlparser;pure/xmltree;pure/colors;pure/mimetypes" srcdoc2: "pure/xmlparser;pure/htmlparser;pure/xmltree;pure/colors;pure/mimetypes"
srcdoc2: "pure/json;pure/base64;pure/scgi;pure/redis;impure/graphics" srcdoc2: "pure/json;pure/base64;pure/scgi;pure/redis;impure/graphics"
srcdoc2: "impure/rdstdin;wrappers/zmq;wrappers/sphinx" srcdoc2: "impure/rdstdin;wrappers/sphinx"
srcdoc2: "pure/collections/tables;pure/collections/sets;pure/collections/lists" srcdoc2: "pure/collections/tables;pure/collections/sets;pure/collections/lists"
srcdoc2: "pure/collections/intsets;pure/collections/queues;pure/encodings" srcdoc2: "pure/collections/intsets;pure/collections/queues;pure/encodings"
srcdoc2: "pure/events;pure/collections/sequtils;pure/irc;pure/cookies" srcdoc2: "pure/events;pure/collections/sequtils;pure/irc;pure/cookies"