diff options
| author | genotrance <dev@genotrance.com> | 2018-07-13 14:58:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 14:58:27 -0500 |
| commit | 28a803e2cbed82be136dad9670a5bbbb1983e929 (patch) | |
| tree | 2a8b30a833cd4644b50f7df008a573dfe788d582 | |
| parent | 573fe9f217da9cf3f9db0454ce06c89c8b7b19ae (diff) | |
| parent | 2e332b29af2ce5e30f740aff47011744803e52f9 (diff) | |
| download | nimgen-28a803e2cbed82be136dad9670a5bbbb1983e929.tar.gz nimgen-28a803e2cbed82be136dad9670a5bbbb1983e929.zip | |
Merge pull request #25 from data-man/multireplace
Use multiReplace in some places
| -rw-r--r-- | src/nimgen/c2nim.nim | 2 | ||||
| -rw-r--r-- | src/nimgen/file.nim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nimgen/c2nim.nim b/src/nimgen/c2nim.nim index 28a3b77..4d721b4 100644 --- a/src/nimgen/c2nim.nim +++ b/src/nimgen/c2nim.nim @@ -48,7 +48,7 @@ proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) = for prag in c2nimConfig.pragma: outpragma &= "{." & prag & ".}\n" - let fname = file.splitFile().name.replace(re"[\.\-]", "_") + let fname = file.splitFile().name.multiReplace([(".", "_"), ("-", "_")]) if c2nimConfig.dynlib.len() != 0: let diff --git a/src/nimgen/file.nim b/src/nimgen/file.nim index b46f7be..d78c692 100644 --- a/src/nimgen/file.nim +++ b/src/nimgen/file.nim @@ -6,7 +6,7 @@ import globals # File loction proc getNimout*(file: string, rename=true): string = - result = file.splitFile().name.replace(re"[\-\.]", "_") & ".nim" + result = file.splitFile().name.multiReplace([("-", "_"), (".", "_")]) & ".nim" if gOutput != "": result = gOutput & "/" & result |