diff options
| author | Araq <rumpf_a@web.de> | 2013-02-11 07:11:42 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-02-11 07:11:42 +0100 |
| commit | 68135b3b500074b43bf155a4a8cbb77756f112d2 (patch) | |
| tree | 7a8391748edcebe57d6967a044ba568b0c90d255 /compiler/options.nim | |
| parent | 9bb11a48a672f20a4c0b7d1bb327ac08dc5ab4b8 (diff) | |
| parent | a668b4ffb57d23e4a1276a5436a600653f7755fb (diff) | |
| download | Nim-68135b3b500074b43bf155a4a8cbb77756f112d2.tar.gz | |
Merge branch 'master' of github.com:Araq/Nimrod
Conflicts: lib/system/gc.nim
Diffstat (limited to 'compiler/options.nim')
| -rwxr-xr-x | compiler/options.nim | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/options.nim b/compiler/options.nim index 6381ced41..d74bc7304 100755 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -80,8 +80,8 @@ type # please make sure we have under 32 options cmdInteractive, # start interactive session cmdRun # run the project via TCC backend TStringSeq* = seq[string] - TGCMode* = enum # the selected GC - gcNone, gcBoehm, gcRefc, gcV2 # + TGCMode* = enum # the selected GC + gcNone, gcBoehm, gcMarkAndSweep, gcRefc, gcV2 const ChecksOptions* = {optObjCheck, optFieldCheck, optRangeCheck, optNilCheck, @@ -269,7 +269,6 @@ proc binaryStrSearch*(x: openarray[string], y: string): int = return mid result = - 1 -# Can we keep this? I'm using it all the time template nimdbg*: expr = c.module.fileIdx == gProjectMainIdx template cnimdbg*: expr = p.module.module.fileIdx == gProjectMainIdx template pnimdbg*: expr = p.lex.fileIdx == gProjectMainIdx |