cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1798 from ethereum/compilerstack-typo

Browse Source 
Rename ErrorMesage to ErrorMessage
This commit is contained in:
chriseth 2017-03-17 10:22:20 +01:00 committed by GitHub
commit 2f2ad42cbc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/interface/CompilerStack.cpp
View File

@ -527,13 +527,13 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast, std::string
result = m_readFile(importPath); result = m_readFile(importPath);
if (result.success) if (result.success)
newSources[importPath] = result.contentsOrErrorMesage; newSources[importPath] = result.contentsOrErrorMessage;
else else
{ {
auto err = make_shared<Error>(Error::Type::ParserError); auto err = make_shared<Error>(Error::Type::ParserError);
*err << *err <<
errinfo_sourceLocation(import->location()) << 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)); m_errors.push_back(std::move(err));
continue; continue;
} }

2
libsolidity/interface/CompilerStack.h
View File

@ -80,7 +80,7 @@ public:
struct ReadFileResult struct ReadFileResult
{ {
bool success; bool success;
std::string contentsOrErrorMesage; std::string contentsOrErrorMessage;
}; };
/// File reading callback. /// File reading callback.

6
solc/jsonCompiler.cpp
View File

@ -143,18 +143,18 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
if (!contents_c && !error_c) if (!contents_c && !error_c)
{ {
result.success = false; result.success = false;
result.contentsOrErrorMesage = "File not found."; result.contentsOrErrorMessage = "File not found.";
} }
if (contents_c) if (contents_c)
{ {
result.success = true; result.success = true;
result.contentsOrErrorMesage = string(contents_c); result.contentsOrErrorMessage = string(contents_c);
free(contents_c); free(contents_c);
} }
if (error_c) if (error_c)
{ {
result.success = false; result.success = false;
result.contentsOrErrorMesage = string(error_c); result.contentsOrErrorMessage = string(error_c);
free(error_c); free(error_c);
} }
return result; return result;