aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-03-17 17:22:20 +0800
committerGitHub <noreply@github.com>2017-03-17 17:22:20 +0800
commit2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb (patch)
treed8e609aedf87c4063c2f6ffc488b75881069e962
parent58334cf4ac1cf61e5296b82ada48a2eb690ed369 (diff)
parente0ff70778a3de88e25cc4c4f879799d6b73a4a61 (diff)
downloaddexon-solidity-2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb.tar
dexon-solidity-2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb.tar.gz
dexon-solidity-2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb.tar.bz2
dexon-solidity-2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb.tar.lz
dexon-solidity-2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb.tar.xz
dexon-solidity-2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb.tar.zst
dexon-solidity-2f2ad42cbc0d0d0de2e48133aa75b67ba35d6bfb.zip
Merge pull request #1798 from ethereum/compilerstack-typo
Rename ErrorMesage to ErrorMessage
-rw-r--r--libsolidity/interface/CompilerStack.cpp4
-rw-r--r--libsolidity/interface/CompilerStack.h2
-rw-r--r--solc/jsonCompiler.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 6b0024ad..effc8309 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -527,13 +527,13 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast, std::string
result = m_readFile(importPath);
if (result.success)
- newSources[importPath] = result.contentsOrErrorMesage;
+ newSources[importPath] = result.contentsOrErrorMessage;
else
{
auto err = make_shared<Error>(Error::Type::ParserError);
*err <<
errinfo_sourceLocation(import->location()) <<
- errinfo_comment("Source \"" + importPath + "\" not found: " + result.contentsOrErrorMesage);
+ errinfo_comment("Source \"" + importPath + "\" not found: " + result.contentsOrErrorMessage);
m_errors.push_back(std::move(err));
continue;
}
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index eddfea68..65850683 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -80,7 +80,7 @@ public:
struct ReadFileResult
{
bool success;
- std::string contentsOrErrorMesage;
+ std::string contentsOrErrorMessage;
};
/// File reading callback.
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index 6ebd1a55..45322117 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -143,18 +143,18 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
if (!contents_c && !error_c)
{
result.success = false;
- result.contentsOrErrorMesage = "File not found.";
+ result.contentsOrErrorMessage = "File not found.";
}
if (contents_c)
{
result.success = true;
- result.contentsOrErrorMesage = string(contents_c);
+ result.contentsOrErrorMessage = string(contents_c);
free(contents_c);
}
if (error_c)
{
result.success = false;
- result.contentsOrErrorMesage = string(error_c);
+ result.contentsOrErrorMessage = string(error_c);
free(error_c);
}
return result;