jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implement the --nilseqs switch properly

Browse source
This commit is contained in:
Andreas Rumpf 2018-08-15 16:56:32 +02:00
commit 27e1fbe7db
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/commands.nim
View file

@ -278,6 +278,7 @@ proc testCompileOption*(conf: ConfigRef; switch: string, info: TLineInfo): bool
of "implicitstatic": result = contains(conf.options, optImplicitStatic) of "implicitstatic": result = contains(conf.options, optImplicitStatic)
of "patterns": result = contains(conf.options, optPatterns) of "patterns": result = contains(conf.options, optPatterns)
of "excessivestacktrace": result = contains(conf.globalOptions, optExcessiveStackTrace) of "excessivestacktrace": result = contains(conf.globalOptions, optExcessiveStackTrace)
of "nilseqs": result = contains(conf.options, optNilSeqs)
else: invalidCmdLineOption(conf, passCmd1, switch, info) else: invalidCmdLineOption(conf, passCmd1, switch, info)
proc processPath(conf: ConfigRef; path: string, info: TLineInfo, proc processPath(conf: ConfigRef; path: string, info: TLineInfo,

1
lib/system.nim
View file

@ -4049,6 +4049,7 @@ proc `==`*(x, y: cstring): bool {.magic: "EqCString", noSideEffect,
else: result = strcmp(x, y) == 0 else: result = strcmp(x, y) == 0
when defined(nimNoNilSeqs2): when defined(nimNoNilSeqs2):
when not compileOption("nilseqs"):
proc `==`*(x: string; y: type(nil)): bool {.error.} = discard proc `==`*(x: string; y: type(nil)): bool {.error.} = discard
proc `==`*(x: type(nil); y: string): bool {.error.} = discard proc `==`*(x: type(nil); y: string): bool {.error.} = discard