diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-04-24 10:00:53 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-04-24 10:00:53 +0200 |
| commit | 1aede6d31136b7932c1e144e0476ff8dd96ecb1f (patch) | |
| tree | 9248fe083f42d5f8a1c3f64268e7093037b4e1fd | |
| parent | 7cba41db2396e3ec9b13f0ba71148ec856dcf8f8 (diff) | |
| parent | 34e253bf34b7e407792cebb9be7872c9daf572f6 (diff) | |
| download | Nim-1aede6d31136b7932c1e144e0476ff8dd96ecb1f.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
| -rw-r--r-- | compiler/sempass2.nim | 2 | ||||
| -rw-r--r-- | config/nimdoc.cfg | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim index ce7474966..96bdc6cba 100644 --- a/compiler/sempass2.nim +++ b/compiler/sempass2.nim @@ -517,7 +517,7 @@ proc propagateEffects(tracked: PEffects, n: PNode, s: PSym) = proc procVarcheck(n: PNode) = if n.kind in nkSymChoices: for x in n: procVarCheck(x) - elif n.kind == nkSym and n.sym.magic != mNone: + elif n.kind == nkSym and n.sym.magic != mNone and n.sym.kind in routineKinds: localError(n.info, errXCannotBePassedToProcVar, n.sym.name.s) proc notNilCheck(tracked: PEffects, n: PNode, paramType: PType) = diff --git a/config/nimdoc.cfg b/config/nimdoc.cfg index fdc3d2ba0..3e656cb8f 100644 --- a/config/nimdoc.cfg +++ b/config/nimdoc.cfg @@ -129,6 +129,8 @@ doc.file = """<?xml version="1.0" encoding="utf-8" ?> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="viewport" content="width=device-width, initial-scale=1.0"> + <!-- Favicon --> <link rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAAAAAUAAAAF////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAAAAAIAAABbAAAAlQAAAKIAAACbAAAAmwAAAKIAAACVAAAAWwAAAAL///8A////AP///wD///8A////AAAAABQAAADAAAAAYwAAAA3///8A////AP///wD///8AAAAADQAAAGMAAADAAAAAFP///wD///8A////AP///wAAAACdAAAAOv///wD///8A////AP///wD///8A////AP///wD///8AAAAAOgAAAJ3///8A////AP///wAAAAAnAAAAcP///wAAAAAoAAAASv///wD///8A////AP///wAAAABKAAAAKP///wAAAABwAAAAJ////wD///8AAAAAgQAAABwAAACIAAAAkAAAAJMAAACtAAAAFQAAABUAAACtAAAAkwAAAJAAAACIAAAAHAAAAIH///8A////AAAAAKQAAACrAAAAaP///wD///8AAAAARQAAANIAAADSAAAARf///wD///8AAAAAaAAAAKsAAACk////AAAAADMAAACcAAAAnQAAABj///8A////AP///wAAAAAYAAAAGP///wD///8A////AAAAABgAAACdAAAAnAAAADMAAAB1AAAAwwAAAP8AAADpAAAAsQAAAE4AAAAb////AP///wAAAAAbAAAATgAAALEAAADpAAAA/wAAAMMAAAB1AAAAtwAAAOkAAAD/AAAA/wAAAP8AAADvAAAA3gAAAN4AAADeAAAA3gAAAO8AAAD/AAAA/wAAAP8AAADpAAAAtwAAAGUAAAA/AAAA3wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADfAAAAPwAAAGX///8A////AAAAAEgAAADtAAAAvwAAAL0AAADGAAAA7wAAAO8AAADGAAAAvQAAAL8AAADtAAAASP///wD///8A////AP///wD///8AAAAAO////wD///8A////AAAAAIcAAACH////AP///wD///8AAAAAO////wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A//8AAP//AAD4HwAA7/cAAN/7AAD//wAAoYUAAJ55AACf+QAAh+EAAAAAAADAAwAA4AcAAP5/AAD//wAA//8AAA=="/> |