diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/cgen.nim | 15 | ||||
| -rw-r--r-- | compiler/commands.nim | 5 | ||||
| -rw-r--r-- | compiler/extccomp.nim | 10 | ||||
| -rw-r--r-- | compiler/options.nim | 1 |
4 files changed, 27 insertions, 4 deletions
diff --git a/compiler/cgen.nim b/compiler/cgen.nim index 78847c3b8..4d3cabd3a 100644 --- a/compiler/cgen.nim +++ b/compiler/cgen.nim @@ -676,6 +676,12 @@ proc generateHeaders(m: BModule) = add(m.s[cfsHeaders], "#undef powerpc" & tnl) add(m.s[cfsHeaders], "#undef unix" & tnl) +proc openNamespaceNim(): Rope = + result.add("namespace Nim {" & tnl) + +proc closeNamespaceNim(): Rope = + result.add("}" & tnl) + proc closureSetup(p: BProc, prc: PSym) = if tfCapturesEnv notin prc.typ.flags: return # prc.ast[paramsPos].last contains the type we're after: @@ -918,6 +924,7 @@ proc addIntTypes(result: var Rope) {.inline.} = addf(result, "#define NIM_NEW_MANGLING_RULES" & tnl & "#define NIM_INTBITS $1" & tnl, [ platform.CPU[targetCPU].intSize.rope]) + if useNimNamespace : result.add("#define USE_NIM_NAMESPACE" & tnl) proc getCopyright(cfile: Cfile): Rope = if optCompileOnly in gGlobalOptions: @@ -1083,7 +1090,11 @@ proc genMainProc(m: BModule) = appcg(m, m.s[cfsProcs], nimMain, [m.g.mainModInit, initStackBottomCall, rope(m.labels)]) if optNoMain notin gGlobalOptions: + if useNimNamespace: + m.s[cfsProcs].add closeNamespaceNim() & "using namespace Nim;" & tnl + appcg(m, m.s[cfsProcs], otherMain, []) + if useNimNamespace: m.s[cfsProcs].add openNamespaceNim() proc getSomeInitName(m: PSym, suffix: string): Rope = assert m.kind == skModule @@ -1191,7 +1202,9 @@ proc genModule(m: BModule, cfile: Cfile): Rope = add(result, genSectionStart(i)) add(result, m.s[i]) add(result, genSectionEnd(i)) + if useNimNamespace and i == cfsHeaders: result.add openNamespaceNim() add(result, m.s[cfsInitProc]) + if useNimNamespace: result.add closeNamespaceNim() proc newPreInitProc(m: BModule): BProc = result = newProc(nil, m) @@ -1330,11 +1343,13 @@ proc writeHeader(m: BModule) = add(result, genSectionStart(i)) add(result, m.s[i]) add(result, genSectionEnd(i)) + if useNimNamespace and i == cfsHeaders: result.add openNamespaceNim() add(result, m.s[cfsInitProc]) if optGenDynLib in gGlobalOptions: result.add("N_LIB_IMPORT ") result.addf("N_CDECL(void, NimMain)(void);$n", []) + if useNimNamespace: result.add closeNamespaceNim() result.addf("#endif /* $1 */$n", [guard]) writeRope(result, m.filename) diff --git a/compiler/commands.nim b/compiler/commands.nim index 20727966b..820cb7e1a 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -698,6 +698,11 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo; expectNoArg(switch, arg, pass, info) newDestructors = true defineSymbol("nimNewRuntime") + of "cppcompiletonamespace": + expectNoArg(switch, arg, pass, info) + useNimNamespace = true + defineSymbol("cppCompileToNamespace") + else: if strutils.find(switch, '.') >= 0: options.setConfigVar(switch, arg) else: invalidCmdLineOption(pass, switch, info) diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim index 8b5a3bf3d..f9b18a335 100644 --- a/compiler/extccomp.nim +++ b/compiler/extccomp.nim @@ -176,10 +176,10 @@ compiler bcc: result = ( name: "bcc", objExt: "obj", - optSpeed: " -O2 -6 ", + optSpeed: " -O3 -6 ", optSize: " -O1 -6 ", - compilerExe: "bcc32", - cppCompiler: "", + compilerExe: "bcc32c", + cppCompiler: "cpp32c", compileTmpl: "-c $options $include -o$objfile $file", buildGui: " -tW", buildDll: " -tWD", @@ -193,7 +193,9 @@ compiler bcc: pic: "", asmStmtFrmt: "__asm{$n$1$n}$n", structStmtFmt: "$1 $2", - props: {hasCpp}) + props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, + hasAttribute}) + # Digital Mars C Compiler compiler dmc: diff --git a/compiler/options.nim b/compiler/options.nim index 40e97e94f..69a555b3f 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -149,6 +149,7 @@ var gExperimentalMode*: bool newDestructors*: bool gDynlibOverrideAll*: bool + useNimNamespace*: bool type SymbolFilesOption* = enum |