diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2013-01-27 23:41:45 +0200 |
|---|---|---|
| committer | Zahary Karadjov <zahary@gmail.com> | 2013-01-27 23:41:45 +0200 |
| commit | 81a3585872b1a327b62ba528addbee913d6bbe5a (patch) | |
| tree | aff8358bc86704edbd89fd56ec4f7b0cd3583bca /compiler/ccgstmts.nim | |
| parent | 67f37264b3f461fe46f5cfea7c35c0a4f709dcb0 (diff) | |
| parent | 07585088955c1fe8fb815c40409ed9f5d66fd446 (diff) | |
| download | Nim-81a3585872b1a327b62ba528addbee913d6bbe5a.tar.gz | |
merged upstream master
Diffstat (limited to 'compiler/ccgstmts.nim')
| -rwxr-xr-x | compiler/ccgstmts.nim | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/ccgstmts.nim b/compiler/ccgstmts.nim index 5927c6afd..2f07d24cb 100755 --- a/compiler/ccgstmts.nim +++ b/compiler/ccgstmts.nim @@ -122,6 +122,7 @@ proc genBreakState(p: BProc, n: PNode) = lineF(p, cpsStmts, "if ((((NI*) $1.ClEnv)[0]) < 0) break;$n", [rdLoc(a)]) # lineF(p, cpsStmts, "if (($1) < 0) break;$n", [rdLoc(a)]) +proc genVarPrototypeAux(m: BModule, sym: PSym) proc genSingleVar(p: BProc, a: PNode) = var v = a.sons[0].sym if sfCompileTime in v.flags: return @@ -140,6 +141,9 @@ proc genSingleVar(p: BProc, a: PNode) = genObjectInit(p.module.preInitProc, cpsInit, v.typ, v.loc, true) # Alternative construction using default constructor (which may zeromem): # if sfImportc notin v.flags: constructLoc(p.module.preInitProc, v.loc) + if sfExportc in v.flags and generatedHeader != nil: + genVarPrototypeAux(generatedHeader, v) + else: assignLocalVar(p, v) initLocalVar(p, v, immediateAsgn) @@ -878,7 +882,8 @@ proc genStmts(p: BProc, t: PNode) = # we have to emit the type information for object types here to support # separate compilation: genTypeSection(p.module, t) - of nkCommentStmt, nkNilLit, nkIteratorDef, nkIncludeStmt, nkImportStmt, + of nkCommentStmt, nkNilLit, nkIteratorDef, nkIncludeStmt, + nkImportStmt, nkImportExceptStmt, nkExportStmt, nkExportExceptStmt, nkFromStmt, nkTemplateDef, nkMacroDef: nil of nkPragma: genPragma(p, t) |