From f5e8535ce83c79d66e32e1ebe2d5f1a945f61c77 Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Tue, 10 Jul 2018 13:53:53 +0900 Subject: Fix windows paths --- nimgen.nim | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nimgen.nim b/nimgen.nim index 6baea3b..94fa48c 100644 --- a/nimgen.nim +++ b/nimgen.nim @@ -225,8 +225,7 @@ proc search(file: string): string = quit(1) # Only keep relative directory - result = result.replace(gProjectDir & $DirSep, "") - return result.replace(re"[\\/]", $DirSep) + return result.multiReplace([("\\", $DirSep), ("//", $DirSep), (gProjectDir & $DirSep, "")]) # ### # Loading / unloading @@ -389,7 +388,7 @@ proc getIncls(file: string, inline=false): seq[string] = # OSError if the file does not exist let finc = expandFileName(curPath / addInc) - fname = extractFileName(finc).search() + fname = finc.replace(curPath & $DirSep, "") if fname.len() > 0: # only add if the file is non-empty -- cgit v1.2.3