aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-05-02 21:49:13 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-05-02 21:49:13 +0800
commit2871663cadca8355764c64bc921b2fc6126efb2c (patch)
treecf7c9b680dfd22ae6030ac484d63ca9063bfc2fa
parentf42a9a9408cf92258104e0839b700640f5edd06c (diff)
downloaddexon-solidity-2871663cadca8355764c64bc921b2fc6126efb2c.tar
dexon-solidity-2871663cadca8355764c64bc921b2fc6126efb2c.tar.gz
dexon-solidity-2871663cadca8355764c64bc921b2fc6126efb2c.tar.bz2
dexon-solidity-2871663cadca8355764c64bc921b2fc6126efb2c.tar.lz
dexon-solidity-2871663cadca8355764c64bc921b2fc6126efb2c.tar.xz
dexon-solidity-2871663cadca8355764c64bc921b2fc6126efb2c.tar.zst
dexon-solidity-2871663cadca8355764c64bc921b2fc6126efb2c.zip
Remove why3 from standard compiler
-rw-r--r--docs/using-the-compiler.rst11
-rw-r--r--libsolidity/interface/StandardCompiler.cpp24
2 files changed, 4 insertions, 31 deletions
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index b74da213..890604b1 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -121,7 +121,6 @@ Input Description
// abi - ABI
// ast - AST of all source files (not supported atm)
// legacyAST - legacy AST of all source files
- // why3 - Why3 translated output
// devdoc - Developer documentation (natspec)
// userdoc - User documentation (natspec)
// metadata - Metadata
@@ -154,9 +153,9 @@ Input Description
"*": {
"*": [ "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
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",
// Mandatory ("error" or "warning")
severity: "error",
@@ -272,7 +271,5 @@ Output Description
}
}
}
- },
- // Why3 output (string)
- why3: ""
+ }
}
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 2b5e861b..db0cbd16 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -425,30 +425,6 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
}
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;
}