diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/commands.nim | 2 | ||||
| -rw-r--r-- | compiler/options.nim | 12 | ||||
| -rw-r--r-- | compiler/packagehandling.nim | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/compiler/commands.nim b/compiler/commands.nim index b468dd6b8..48926f602 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -12,7 +12,7 @@ # We do this here before the 'import' statement so 'defined' does not get # confused with 'TGCMode.gcGenerational' etc. -template bootSwitch(name, expr, userString: expr): expr = +template bootSwitch(name, expr, userString) = # Helper to build boot constants, for debugging you can 'echo' the else part. const name = if expr: " " & userString else: "" diff --git a/compiler/options.nim b/compiler/options.nim index dbd8ca2b9..a5154cb48 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -129,10 +129,10 @@ var proc importantComments*(): bool {.inline.} = gCmd in {cmdDoc, cmdIdeTools} proc usesNativeGC*(): bool {.inline.} = gSelectedGC >= gcRefc -template compilationCachePresent*: expr = +template compilationCachePresent*: untyped = {optCaasEnabled, optSymbolFiles} * gGlobalOptions != {} -template optPreserveOrigSource*: expr = +template optPreserveOrigSource*: untyped = optEmbedOrigSrc in gGlobalOptions const @@ -405,10 +405,10 @@ proc binaryStrSearch*(x: openArray[string], y: string): int = return mid result = - 1 -template nimdbg*: expr = c.module.fileIdx == gProjectMainIdx -template cnimdbg*: expr = p.module.module.fileIdx == gProjectMainIdx -template pnimdbg*: expr = p.lex.fileIdx == gProjectMainIdx -template lnimdbg*: expr = L.fileIdx == gProjectMainIdx +template nimdbg*: untyped = c.module.fileIdx == gProjectMainIdx +template cnimdbg*: untyped = p.module.module.fileIdx == gProjectMainIdx +template pnimdbg*: untyped = p.lex.fileIdx == gProjectMainIdx +template lnimdbg*: untyped = L.fileIdx == gProjectMainIdx proc parseIdeCmd*(s: string): IdeCmd = case s: diff --git a/compiler/packagehandling.nim b/compiler/packagehandling.nim index c42a4d763..6a98ffe60 100644 --- a/compiler/packagehandling.nim +++ b/compiler/packagehandling.nim @@ -15,7 +15,7 @@ iterator myParentDirs(p: string): string = if current.len == 0: break yield current -template newPackageCache(): expr = +template newPackageCache(): untyped = newStringTable(when FileSystemCaseSensitive: modeCaseInsensitive else: |