cerc-io/solidity
10
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 #2210 from ethereum/jsonio-remove-why3

Browse Source 
Remove why3 from standard compiler
This commit is contained in:
chriseth 2017-05-02 16:43:15 +02:00 committed by GitHub
commit 084ab4123f
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/using-the-compiler.rst
View File

@ -121,7 +121,6 @@ Input Description
// abi - ABI // abi - ABI
// ast - AST of all source files (not supported atm) // ast - AST of all source files (not supported atm)
// legacyAST - legacy AST of all source files // legacyAST - legacy AST of all source files
// why3 - Why3 translated output
// devdoc - Developer documentation (natspec) // devdoc - Developer documentation (natspec)
// userdoc - User documentation (natspec) // userdoc - User documentation (natspec)
// metadata - Metadata // metadata - Metadata
@ -154,9 +153,9 @@ Input Description
"*": { "*": {
"*": [ "evm.sourceMap" ] "*": [ "evm.sourceMap" ]
}, },
// Enable the legacy AST and Why3 output of every single file. // Enable the legacy AST output of every single file.
"*": { "*": {
"": [ "legacyAST", "why3" ] "": [ "legacyAST" ]
} }
} }
} }
@ -180,7 +179,7 @@ Output Description
], ],
// Mandatory: Error type, such as "TypeError", "InternalCompilerError", "Exception", etc // Mandatory: Error type, such as "TypeError", "InternalCompilerError", "Exception", etc
type: "TypeError", type: "TypeError",
// Mandatory: Component where the error originated, such as "general", "why3", "ewasm", etc. // Mandatory: Component where the error originated, such as "general", "ewasm", etc.
component: "general", component: "general",
// Mandatory ("error" or "warning") // Mandatory ("error" or "warning")
severity: "error", severity: "error",
@ -272,7 +271,5 @@ Output Description
} }
} }
} }
}, }
// Why3 output (string)
why3: ""
} }

24
libsolidity/interface/StandardCompiler.cpp
View File

@ -425,30 +425,6 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
} }
output["contracts"] = contractsOutput; output["contracts"] = contractsOutput;
{
ErrorList formalErrors;
if (m_compilerStack.prepareFormalAnalysis(&formalErrors))
output["why3"] = m_compilerStack.formalTranslation();
for (auto const& error: formalErrors)
{
auto err = dynamic_pointer_cast<Error const>(error);
errors.append(formatErrorWithException(
*error,
err->type() == Error::Type::Warning,
err->typeName(),
"general",
"",
scannerFromSourceName
));
}
// FIXME!!
if (!formalErrors.empty())
output["errors"] = errors;
}
return output; return output;
} }