fixes merge conflict

This commit is contained in:
Andreas Rumpf 2018-05-26 19:09:02 +02:00
commit 12bd1c494c
16 changed files with 235 additions and 213 deletions

View file

@ -263,7 +263,8 @@ proc newConfigRef*(): ConfigRef =
linkOptions: "",
compileOptions: "",
ccompilerpath: "",
toCompile: @[]
toCompile: @[],
arguments: ""
)
setTargetFromSystem(result.target)
# enable colors by default on terminals
@ -562,20 +563,6 @@ proc isDynlibOverride*(conf: ConfigRef; lib: string): bool =
result = optDynlibOverrideAll in conf.globalOptions or
conf.dllOverrides.hasKey(lib.canonDynlibName)
proc binaryStrSearch*(x: openArray[string], y: string): int =
var a = 0
var b = len(x) - 1
while a <= b:
var mid = (a + b) div 2
var c = cmpIgnoreCase(x[mid], y)
if c < 0:
a = mid + 1
elif c > 0:
b = mid - 1
else:
return mid
result = - 1
proc parseIdeCmd*(s: string): IdeCmd =
case s:
of "sug": ideSug