diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2019-02-18 09:56:01 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-02-18 09:56:01 +0100 |
| commit | c8e33cbb75caf21a76d379ce94b42baffbefa73f (patch) | |
| tree | 2382ee25980be7fa3e89a1a5483cb78857463115 /compiler | |
| parent | 9e754c3b0623433380de171d25bfb862eb2f9ab7 (diff) | |
| parent | 8b39551fca81e95b51393a2a8e702eebe3ba7c51 (diff) | |
| download | Nim-c8e33cbb75caf21a76d379ce94b42baffbefa73f.tar.gz | |
fixed merge conflict
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/jsgen.nim | 7 | ||||
| -rw-r--r-- | compiler/pragmas.nim | 2 | ||||
| -rw-r--r-- | compiler/reorder.nim | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index 8625f2fe1..65706cdfa 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -1149,7 +1149,7 @@ template isIndirect(x: PSym): bool = let v = x ({sfAddrTaken, sfGlobal} * v.flags != {} and #(mapType(v.typ) != etyObject) and - {sfImportc, sfVolatile, sfExportc} * v.flags == {} and + {sfImportc, sfExportc} * v.flags == {} and v.kind notin {skProc, skFunc, skConverter, skMethod, skIterator, skConst, skTemp, skLet}) @@ -1235,7 +1235,7 @@ proc genProcForSymIfNeeded(p: PProc, s: PSym) = proc genCopyForParamIfNeeded(p: PProc, n: PNode) = let s = n.sym - if p.prc == s.owner or needsNoCopy(p, n): + if p.prc == s.owner or needsNoCopy(p, n): return var owner = p.up while true: @@ -1597,8 +1597,7 @@ proc createVar(p: PProc, typ: PType, indirect: bool): Rope = internalError(p.config, "createVar: " & $t.kind) result = nil -template returnType: untyped = - ~"" +template returnType: untyped = ~"" proc genVarInit(p: PProc, v: PSym, n: PNode) = var diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim index b1063b682..3b6f82c40 100644 --- a/compiler/pragmas.nim +++ b/compiler/pragmas.nim @@ -241,7 +241,7 @@ proc pragmaNoForward(c: PContext, n: PNode; flag=sfNoForward) = # deprecated as of 0.18.1 message(c.config, n.info, warnDeprecated, - "use {.experimental: \"codeReordering.\".} instead; " & + "use {.experimental: \"codeReordering\".} instead; " & (if flag == sfNoForward: "{.noForward.}" else: "{.reorder.}") & " is deprecated") proc processCallConv(c: PContext, n: PNode) = diff --git a/compiler/reorder.nim b/compiler/reorder.nim index 8c4d0d307..18ec659ba 100644 --- a/compiler/reorder.nim +++ b/compiler/reorder.nim @@ -212,7 +212,7 @@ proc mergeSections(conf: ConfigRef; comps: seq[seq[DepN]], res: PNode) = # Problematic circular dependency, we arrange the nodes into # their original relative order and make sure to re-merge # consecutive type and const sections - var wmsg = "Circular dependency detected. reorder pragma may not be able to" & + var wmsg = "Circular dependency detected. `codeReordering` pragma may not be able to" & " reorder some nodes properely" when defined(debugReorder): wmsg &= ":\n" |