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

fixes a strange issue most likely caused by a git merge (#20822)

Browse source
This commit is contained in:
Andreas Rumpf 2022-11-12 13:12:28 +01:00 • committed by GitHub
commit 852cf596ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/scriptconfig.nim
View file

@ -181,15 +181,13 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
options.cppDefine(conf, a.getString(0)) options.cppDefine(conf, a.getString(0))
cbexc stdinReadLine, EOFError: cbexc stdinReadLine, EOFError:
if defined(nimsuggest) or graph.config.cmd == cmdCheck: if defined(nimsuggest) or graph.config.cmd == cmdCheck:
discard
else:
setResult(a, "") setResult(a, "")
else:
setResult(a, stdin.readLine()) setResult(a, stdin.readLine())
cbexc stdinReadAll, EOFError: cbexc stdinReadAll, EOFError:
if defined(nimsuggest) or graph.config.cmd == cmdCheck: if defined(nimsuggest) or graph.config.cmd == cmdCheck:
discard
else:
setResult(a, "") setResult(a, "")
else:
setResult(a, stdin.readAll()) setResult(a, stdin.readAll())
proc runNimScript*(cache: IdentCache; scriptName: AbsoluteFile; proc runNimScript*(cache: IdentCache; scriptName: AbsoluteFile;