diff options
author | Araq <rumpf_a@web.de> | 2018-09-15 00:41:32 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-09-15 00:41:32 +0200 |
commit | b9dc486db15bb1b4b6f3cef7626733b904d377f7 (patch) | |
tree | f22bffa2b91db78f0448f5075a8344c28c4dc7a0 /lib | |
parent | ea1c28294a66b4f0d42a20841c09ac35b13a394b (diff) | |
parent | 49d5fb60a76875b201b2ff4bdc65cd196c94bbfa (diff) | |
download | Nim-b9dc486db15bb1b4b6f3cef7626733b904d377f7.tar.gz |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'lib')
-rw-r--r-- | lib/system/hti.nim | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/system/hti.nim b/lib/system/hti.nim index 9931fa11e..c7b52bbdf 100644 --- a/lib/system/hti.nim +++ b/lib/system/hti.nim @@ -7,12 +7,6 @@ # distribution, for details about the copyright. # -when declared(ThisIsSystem): - # we are in system module: - {.pragma: codegenType, compilerproc.} -else: - {.pragma: codegenType.} - type # This should be the same as ast.TTypeKind # many enum fields are not used at runtime @@ -79,7 +73,7 @@ type tyVoidHidden TNimNodeKind = enum nkNone, nkSlot, nkList, nkCase - TNimNode {.codegenType.} = object + TNimNode {.compilerProc.} = object kind: TNimNodeKind offset: int typ: ptr TNimType @@ -92,7 +86,7 @@ type ntfAcyclic = 1, # type cannot form a cycle ntfEnumHole = 2 # enum has holes and thus `$` for them needs the slow # version - TNimType {.codegenType.} = object + TNimType {.compilerProc.} = object size: int kind: TNimKind flags: set[TNimTypeFlag] @@ -109,6 +103,6 @@ type PNimType = ptr TNimType when defined(nimTypeNames): - var nimTypeRoot {.codegenType.}: PNimType + var nimTypeRoot {.compilerProc.}: PNimType # node.len may be the ``first`` element of a set |