jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #10042 (allow spaces in import) (#10504)

Browse source 
This allows spaces in imports, by using the following syntax:
* `import "directory with spaces" / subdir / file`, or
* `import "directory with spaces/subdir/file"`
This commit is contained in:
Miran 2019-01-31 08:20:00 +01:00 • committed by Andreas Rumpf
commit fa058773db
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/modulepaths.nim
View file

@ -114,7 +114,6 @@ proc getModuleName*(conf: ConfigRef; n: PNode): string =
try: try:
result = result =
pathSubs(conf, n.strVal, toFullPath(conf, n.info).splitFile().dir) pathSubs(conf, n.strVal, toFullPath(conf, n.info).splitFile().dir)
.replace(" ")
except ValueError: except ValueError:
localError(conf, n.info, "invalid path: " & n.strVal) localError(conf, n.info, "invalid path: " & n.strVal)
result = n.strVal result = n.strVal

1
tests/dir with space/more spaces/mspace.nim Normal file
View file

@ -0,0 +1 @@
proc tenTimes*(x: int): int = 10*x

4
tests/dir with space/tspace.nim
View file

@ -2,5 +2,9 @@ discard """
output: "Successful" output: "Successful"
""" """
# Test for the compiler to be able to compile a Nim file with spaces in the directory name. # Test for the compiler to be able to compile a Nim file with spaces in the directory name.
# Also test if import of a directory with a space works.
import "more spaces" / mspace
assert tenTimes(5) == 50
echo("Successful") echo("Successful")