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

fixes #31

Browse source
This commit is contained in:
Araq 2011-11-27 16:32:05 +01:00
commit 020a10927a
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/ccgexprs.nim
View file

@ -1484,20 +1484,14 @@ proc genTupleConstr(p: BProc, n: PNode, d: var TLoc) =
if d.k == locNone: getTemp(p, t, d)
for i in countup(0, sonsLen(n) - 1):
var it = n.sons[i]
if it.kind == nkExprColonExpr:
initLoc(rec, locExpr, it.sons[1].typ, d.s)
if (t.n.sons[i].kind != nkSym): InternalError(n.info, "genTupleConstr")
rec.r = ropef("$1.$2",
[rdLoc(d), mangleRecFieldName(t.n.sons[i].sym, t)])
expr(p, it.sons[1], rec)
elif t.n == nil:
if it.kind == nkExprColonExpr: it = it.sons[1]
if t.n == nil:
initLoc(rec, locExpr, it.typ, d.s)
rec.r = ropef("$1.Field$2", [rdLoc(d), toRope(i)])
expr(p, it, rec)
else:
initLoc(rec, locExpr, it.typ, d.s)
if (t.n.sons[i].kind != nkSym):
InternalError(n.info, "genTupleConstr: 2")
if (t.n.sons[i].kind != nkSym): InternalError(n.info, "genTupleConstr")
rec.r = ropef("$1.$2",
[rdLoc(d), mangleRecFieldName(t.n.sons[i].sym, t)])
expr(p, it, rec)

4
compiler/nimrod.nim
View file

@ -49,6 +49,7 @@ proc ProcessCmdLine(pass: TCmdLinePass) =
if pass == passCmd2:
arguments = cmdLineRest(p)
echo "Setting args to ", arguments
if optRun notin gGlobalOptions and arguments != "":
rawMessage(errArgsNeedRunOption, [])
@ -91,7 +92,8 @@ proc HandleCmdLine() =
rawMessage(hintSuccessX, [$gLinesCompiled,
formatFloat(epochTime() - start, ffDecimal, 3)])
if optRun in gGlobalOptions:
var ex = quoteIfContainsWhite(changeFileExt(projectName, "").prependCurDir)
var ex = quoteIfContainsWhite(
changeFileExt(projectFullPath, "").prependCurDir)
execExternalProgram(ex & ' ' & arguments)
#GC_disableMarkAndSweep()