From e606ad8d3f0db462407500ffbe5e4c82adc14fbb Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Thu, 27 Jan 2011 17:59:32 +0000 Subject: [PATCH] No need for defining my own join, used addFileExt instead of & --- installer.nim | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/installer.nim b/installer.nim index 36858db..7d65014 100644 --- a/installer.nim +++ b/installer.nim @@ -20,13 +20,6 @@ proc getNimVersion(cmd: string = "nimrod"): String = return "0.8.10" -proc join(s: seq[string], sep: char = ' '): string = - result = "" - for i in 0..len(s)-1: - if i < len(s)-1: - result.add($sep) - result.add(s[i]) - proc dependExists(name: string, verRange: PVersionRange): Bool = if name == "nimrod": var nimVer = getNimVersion() @@ -51,7 +44,7 @@ proc verifyDepends*(proj: TProject): seq[TDepend] = elif spl.len > 1: nameStr = spl[0] spl.del(0) - verStr = join(spl, ' ') + verStr = join(spl, " ") else: raise newException(EInstall, "Incorrect dependency got: " & i) @@ -73,9 +66,9 @@ proc install*(name: string, filename: string = "") = var babelFile: TProject = initProj() var path = "" if filename == "": - path = name & ".babel" + path = name.addFileExt("babel") else: - path = filename / name & ".babel" + path = filename / name.addFileExt("babel") echo("Reading ", path, "...") babelFile = parseBabel(path)