aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2018-08-07 19:47:37 +0800
committerGitHub <noreply@github.com>2018-08-07 19:47:37 +0800
commit21ceac090adce9a936c217cc68584ae2964acd72 (patch)
tree08cde608a9bc25d1a9bb19ff9751ddb5e2da1648
parentc6278fbae1e1dac33ebfad7e8d42e071c9e78914 (diff)
parentfba7b7c204de14605432ef9669c737eb833cac13 (diff)
downloaddexon-solidity-21ceac090adce9a936c217cc68584ae2964acd72.tar
dexon-solidity-21ceac090adce9a936c217cc68584ae2964acd72.tar.gz
dexon-solidity-21ceac090adce9a936c217cc68584ae2964acd72.tar.bz2
dexon-solidity-21ceac090adce9a936c217cc68584ae2964acd72.tar.lz
dexon-solidity-21ceac090adce9a936c217cc68584ae2964acd72.tar.xz
dexon-solidity-21ceac090adce9a936c217cc68584ae2964acd72.tar.zst
dexon-solidity-21ceac090adce9a936c217cc68584ae2964acd72.zip
Merge pull request #4592 from asifmallik/fixBackslashBugFinal
Fix backslash bug
-rw-r--r--Changelog.md1
-rw-r--r--solc/CommandLineInterface.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md
index 18944408..b82c3f00 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -79,6 +79,7 @@ Compiler Features:
Bugfixes:
* Tests: Fix chain parameters to make ipc tests work with newer versions of cpp-ethereum.
* Code Generator: Fix allocation of byte arrays (zeroed out too much memory).
+ * Commandline Interface: Correctly handle paths with backslashes on windows.
* Fix NatSpec json output for `@notice` and `@dev` tags on contract definitions.
* References Resolver: Enforce ``storage`` as data location for mappings.
* References Resolver: Report error instead of assertion fail when FunctionType has an undeclared type as parameter.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 55086e9f..14793759 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -424,7 +424,7 @@ bool CommandLineInterface::readInputFilesAndConfigureRemappings()
continue;
}
- m_sourceCodes[infile.string()] = dev::readFileAsString(infile.string());
+ m_sourceCodes[infile.generic_string()] = dev::readFileAsString(infile.string());
path = boost::filesystem::canonical(infile).string();
}
m_allowedDirectories.push_back(boost::filesystem::path(path).remove_filename());
@@ -709,7 +709,7 @@ bool CommandLineInterface::processInput()
return ReadCallback::Result{false, "Not a valid file."};
auto contents = dev::readFileAsString(canonicalPath.string());
- m_sourceCodes[path.string()] = contents;
+ m_sourceCodes[path.generic_string()] = contents;
return ReadCallback::Result{true, contents};
}
catch (Exception const& _exception)