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

bugfix: ha.echo should be accepted

Browse source
This commit is contained in:
Araq 2012-07-08 22:03:06 +02:00
commit bb82e30508
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/extccomp.nim
View file

@ -490,10 +490,12 @@ proc getCompileCFileCmd*(cfilename: string, isExternal = false): string =
includeCmd = "" includeCmd = ""
compilePattern = cc[c].compilerExe compilePattern = cc[c].compilerExe
# XXX fix the grammar finally, we need multi-line if expressions: var cfile = if noAbsolutePaths(): extractFileName(cfilename)
var cfile = if noAbsolutePaths(): extractFileName(cfilename) else: cfilename else: cfilename
var objfile = if not isExternal or noAbsolutePaths(): toObjFile( var objfile = if not isExternal or noAbsolutePaths():
cfile) else: completeCFilePath(toObjFile(cfile)) toObjFile(cfile)
else:
completeCFilePath(toObjFile(cfile))
cfile = quoteIfContainsWhite(AddFileExt(cfile, cExt)) cfile = quoteIfContainsWhite(AddFileExt(cfile, cExt))
objfile = quoteIfContainsWhite(objfile) objfile = quoteIfContainsWhite(objfile)
result = quoteIfContainsWhite(compilePattern % [ result = quoteIfContainsWhite(compilePattern % [

5
compiler/semstmts.nim
View file

@ -1188,8 +1188,9 @@ proc SemStmt(c: PContext, n: PNode): PNode =
if gCmd == cmdInteractive: if gCmd == cmdInteractive:
result = buildEchoStmt(c, semExpr(c, n)) result = buildEchoStmt(c, semExpr(c, n))
else: else:
LocalError(n.info, errStmtExpected) result = semExprNoType(c, n)
result = ast.emptyNode #LocalError(n.info, errStmtExpected)
#result = ast.emptyNode
if result == nil: InternalError(n.info, "SemStmt: result = nil") if result == nil: InternalError(n.info, "SemStmt: result = nil")
incl(result.flags, nfSem) incl(result.flags, nfSem)