Use multiReplace in some places

This commit is contained in:
data-man 2018-07-13 13:33:43 +03:00
commit 2e332b29af
2 changed files with 2 additions and 2 deletions

View file

@ -48,7 +48,7 @@ proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
for prag in c2nimConfig.pragma: for prag in c2nimConfig.pragma:
outpragma &= "{." & prag & ".}\n" outpragma &= "{." & prag & ".}\n"
let fname = file.splitFile().name.replace(re"[\.\-]", "_") let fname = file.splitFile().name.multiReplace([(".", "_"), ("-", "_")])
if c2nimConfig.dynlib.len() != 0: if c2nimConfig.dynlib.len() != 0:
let let

View file

@ -6,7 +6,7 @@ import globals
# File loction # File loction
proc getNimout*(file: string, rename=true): string = proc getNimout*(file: string, rename=true): string =
result = file.splitFile().name.replace(re"[\-\.]", "_") & ".nim" result = file.splitFile().name.multiReplace([("-", "_"), (".", "_")]) & ".nim"
if gOutput != "": if gOutput != "":
result = gOutput & "/" & result result = gOutput & "/" & result