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

fixes #1692

Browse source
This commit is contained in:
Araq 2014-12-10 19:59:14 +01:00
commit d3cf767c3a
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/vm.nim
View file

@ -7,7 +7,7 @@
# distribution, for details about the copyright. # distribution, for details about the copyright.
# #
## This file implements the new evaluation engine for Nimrod code. ## This file implements the new evaluation engine for Nim code.
## An instruction is 1-3 int32s in memory, it is a register based VM. ## An instruction is 1-3 int32s in memory, it is a register based VM.
const debugEchoCode = false const debugEchoCode = false
@ -1151,7 +1151,8 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
let ast = parseString(regs[rb].node.strVal, c.debug[pc].toFullPath, let ast = parseString(regs[rb].node.strVal, c.debug[pc].toFullPath,
c.debug[pc].line.int, c.debug[pc].line.int,
proc (info: TLineInfo; msg: TMsgKind; arg: string) = proc (info: TLineInfo; msg: TMsgKind; arg: string) =
if error.isNil: error = formatMsg(info, msg, arg)) if error.isNil and msg <= msgs.errMax:
error = formatMsg(info, msg, arg))
if not error.isNil: if not error.isNil:
c.errorFlag = error c.errorFlag = error
elif sonsLen(ast) != 1: elif sonsLen(ast) != 1:
@ -1164,7 +1165,8 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
let ast = parseString(regs[rb].node.strVal, c.debug[pc].toFullPath, let ast = parseString(regs[rb].node.strVal, c.debug[pc].toFullPath,
c.debug[pc].line.int, c.debug[pc].line.int,
proc (info: TLineInfo; msg: TMsgKind; arg: string) = proc (info: TLineInfo; msg: TMsgKind; arg: string) =
if error.isNil: error = formatMsg(info, msg, arg)) if error.isNil and msg <= msgs.errMax:
error = formatMsg(info, msg, arg))
if not error.isNil: if not error.isNil:
c.errorFlag = error c.errorFlag = error
else: else: