diff options
-rw-r--r-- | compiler/ast.nim | 6 | ||||
-rw-r--r-- | compiler/pragmas.nim | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index 66fbe577c..d6fc5920e 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -736,7 +736,7 @@ type TLibKind* = enum libHeader, libDynamic - + TLib* = object # also misused for headers! kind*: TLibKind generated*: bool # needed for the backends: @@ -744,7 +744,7 @@ type name*: Rope path*: PNode # can be a string literal! - + CompilesId* = int ## id that is used for the caching logic within ## ``system.compiles``. See the seminst module. TInstantiation* = object @@ -1259,7 +1259,7 @@ proc assignType*(dest, src: PType) = # this fixes 'type TLock = TSysLock': if src.sym != nil: if dest.sym != nil: - dest.sym.flags = dest.sym.flags + src.sym.flags + dest.sym.flags = dest.sym.flags + (src.sym.flags-{sfExported}) if dest.sym.annex == nil: dest.sym.annex = src.sym.annex mergeLoc(dest.sym.loc, src.sym.loc) else: diff --git a/compiler/pragmas.nim b/compiler/pragmas.nim index 4476dab72..387738f6d 100644 --- a/compiler/pragmas.nim +++ b/compiler/pragmas.nim @@ -227,7 +227,7 @@ proc getLib(c: PContext, kind: TLibKind, path: PNode): PLib = for it in c.libs: if it.kind == kind and trees.exprStructuralEquivalent(it.path, path): return it - + result = newLib(kind) result.path = path c.libs.add result |