diff options
| author | Araq <rumpf_a@web.de> | 2018-08-23 11:30:55 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-08-23 11:30:55 +0200 |
| commit | 30597e643fe8818ef1bb6cc93a5c573f92a28ea9 (patch) | |
| tree | ea6de7aabdbfc5db583e2dfbaf9f792c8240a63e /compiler/modulepaths.nim | |
| parent | cb9e9297fba72c812913376311ca4b7ebd7e007f (diff) | |
| parent | 55a86497491586dc1b5ad2f6303d53992b999ab5 (diff) | |
| download | Nim-30597e643fe8818ef1bb6cc93a5c573f92a28ea9.tar.gz | |
fixes merge conflict
Diffstat (limited to 'compiler/modulepaths.nim')
| -rw-r--r-- | compiler/modulepaths.nim | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim index e5cbf3a2c..118002fcf 100644 --- a/compiler/modulepaths.nim +++ b/compiler/modulepaths.nim @@ -126,13 +126,6 @@ proc getModuleName*(conf: ConfigRef; n: PNode): string = of nkInfix: let n0 = n[0] let n1 = n[1] - if n0.kind == nkIdent and n0.ident.s == "as": - # XXX hack ahead: - n.kind = nkImportAs - n.sons[0] = n.sons[1] - n.sons[1] = n.sons[2] - n.sons.setLen(2) - return getModuleName(conf, n.sons[0]) when false: if n1.kind == nkPrefix and n1[0].kind == nkIdent and n1[0].ident.s == "$": if n0.kind == nkIdent and n0.ident.s == "/": |