diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/condsyms.nim | 3 | ||||
| -rw-r--r-- | compiler/nim.nim | 5 | ||||
| -rw-r--r-- | compiler/options.nim | 8 | ||||
| -rw-r--r-- | compiler/renderer.nim | 8 |
4 files changed, 3 insertions, 21 deletions
diff --git a/compiler/condsyms.nim b/compiler/condsyms.nim index 8e0e2f300..3d14408a3 100644 --- a/compiler/condsyms.nim +++ b/compiler/condsyms.nim @@ -47,8 +47,7 @@ proc initDefines*(symbols: StringTableRef) = defineSymbol("nimparsebiggestfloatmagic") # deadcode defineSymbol("nimalias") # deadcode defineSymbol("nimlocks") # deadcode - defineSymbol("nimnode") # deadcode pending `nimnode` reference in opengl package - # refs https://github.com/nim-lang/opengl/pull/79 + defineSymbol("nimnode") # deadcode defineSymbol("nimvarargstyped") # deadcode defineSymbol("nimtypedescfixed") # deadcode defineSymbol("nimKnowsNimvm") # deadcode diff --git a/compiler/nim.nim b/compiler/nim.nim index 420579b97..b28e8b20c 100644 --- a/compiler/nim.nim +++ b/compiler/nim.nim @@ -12,10 +12,7 @@ import std/[os, strutils, parseopt] when defined(nimPreviewSlimSystem): import std/assertions -when defined(windows) and not defined(nimKochBootstrap): - # remove workaround pending bootstrap >= 1.5.1 - # refs https://github.com/nim-lang/Nim/issues/18334#issuecomment-867114536 - # alternative would be to prepend `currentSourcePath.parentDir.quoteShell` +when defined(windows): when defined(gcc): when defined(x86): {.link: "../icons/nim.res".} diff --git a/compiler/options.nim b/compiler/options.nim index c0b99744c..e78dd72f2 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -867,14 +867,6 @@ template patchModule(conf: ConfigRef) {.dirty.} = let ov = conf.moduleOverrides[key] if ov.len > 0: result = AbsoluteFile(ov) -when (NimMajor, NimMinor) < (1, 1) or not declared(isRelativeTo): - proc isRelativeTo(path, base: string): bool = - # pending #13212 use os.isRelativeTo - let path = path.normalizedPath - let base = base.normalizedPath - let ret = relativePath(path, base) - result = path.len > 0 and not ret.startsWith ".." - const stdlibDirs* = [ "pure", "core", "arch", "pure/collections", diff --git a/compiler/renderer.nim b/compiler/renderer.nim index ea5446cb1..f0ad21815 100644 --- a/compiler/renderer.nim +++ b/compiler/renderer.nim @@ -1380,15 +1380,9 @@ proc gsub(g: var TSrcGen, n: PNode, c: TContext, fromStmtList = false) = of nkAccQuoted: put(g, tkAccent, "`") for i in 0..<n.len: - proc getStrVal(n: PNode): string = - # pending https://github.com/nim-lang/Nim/pull/17540, use `getStrVal` - case n.kind - of nkIdent: n.ident.s - of nkSym: n.sym.name.s - else: "" proc isAlpha(n: PNode): bool = if n.kind in {nkIdent, nkSym}: - let tmp = n.getStrVal + let tmp = n.getPIdent.s result = tmp.len > 0 and tmp[0] in {'a'..'z', 'A'..'Z'} var useSpace = false if i == 1 and n[0].kind == nkIdent and n[0].ident.s in ["=", "'"]: |