diff options
| author | Araq <rumpf_a@web.de> | 2018-06-08 19:50:36 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-06-08 19:50:36 +0200 |
| commit | 8e9551b1c7614029f12e7d62ba81f367d1aaf6bd (patch) | |
| tree | 6aaa97a9734784ab5a65d1d2975100e4dd9872d1 /compiler/pragmas.nim | |
| parent | 8ba7e7d807c37a0988abd69ef9824b4822fe04f3 (diff) | |
| parent | f99acdb07584d2c4c5eb1f22d998d97bcd823357 (diff) | |
| download | Nim-8e9551b1c7614029f12e7d62ba81f367d1aaf6bd.tar.gz | |
fixex merge conflicts
Diffstat (limited to 'compiler/pragmas.nim')
| -rw-r--r-- | compiler/pragmas.nim | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim index 815ec67d7..de9636809 100644 --- a/compiler/pragmas.nim +++ b/compiler/pragmas.nim @@ -381,6 +381,10 @@ proc processPush(c: PContext, n: PNode, start: int) = x.otherPragmas.add n.sons[i] #localError(c.config, n.info, errOptionExpected) + # If stacktrace is disabled globally we should not enable it + if optStackTrace notin c.optionStack[0].options: + c.config.options.excl(optStackTrace) + proc processPop(c: PContext, n: PNode) = if c.optionStack.len <= 1: localError(c.config, n.info, "{.pop.} without a corresponding {.push.}") |