cerc-io/solidity
15
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

Remove leftovers of compact-format and interface from --combined-json

Browse Source
This commit is contained in:
Kamil Śliwak 2021-09-30 16:17:36 +02:00
parent 6d806359be
commit 7915f32852
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/ASTImportTest.sh
View File

@ -45,9 +45,9 @@ function testImportExportEquivalence {
! [[ -e stderr.txt ]] || { echo "stderr.txt already exists. Refusing to overwrite."; exit 1; }
# save exported json as expected result (silently)
$SOLC --combined-json ast,compact-format --pretty-json "$nth_input_file" "${all_input_files[@]}" > expected.json 2> /dev/null
$SOLC --combined-json ast --pretty-json "$nth_input_file" "${all_input_files[@]}" > expected.json 2> /dev/null
# import it, and export it again as obtained result (silently)
if ! $SOLC --import-ast --combined-json ast,compact-format --pretty-json expected.json > obtained.json 2> stderr.txt
if ! $SOLC --import-ast --combined-json ast --pretty-json expected.json > obtained.json 2> stderr.txt
then
# For investigating, use exit 1 here so the script stops at the
# first failing test

2
scripts/common_cmdline.sh
View File

@ -20,7 +20,7 @@
# ------------------------------------------------------------------------------
YULARGS=(--strict-assembly)
FULLARGS=(--optimize --ignore-missing --combined-json "abi,asm,ast,bin,bin-runtime,compact-format,devdoc,hashes,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
FULLARGS=(--optimize --ignore-missing --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,hashes,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
OLDARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
function compileFull()
{

2
solc/CommandLineInterface.h
View File

@ -95,7 +95,7 @@ private:
/// Tries to read @ m_sourceCodes as a JSONs holding ASTs
/// such that they can be imported into the compiler (importASTs())
/// (produced by --combined-json ast,compact-format <file.sol>
/// (produced by --combined-json ast <file.sol>
/// or standard-json output
std::map<std::string, Json::Value> parseAstFromInput();

6
solc/CommandLineParser.cpp
View File

@ -63,7 +63,6 @@ static string const g_strAstCompactJson = "ast-compact-json";
static string const g_strBinary = "bin";
static string const g_strBinaryRuntime = "bin-runtime";
static string const g_strCombinedJson = "combined-json";
static string const g_strCompactJSON = "compact-format";
static string const g_strErrorRecovery = "error-recovery";
static string const g_strEVM = "evm";
static string const g_strEVMVersion = "evm-version";
@ -75,7 +74,6 @@ static string const g_strGas = "gas";
static string const g_strHelp = "help";
static string const g_strImportAst = "import-ast";
static string const g_strInputFile = "input-file";
static string const g_strInterface = "interface";
static string const g_strYul = "yul";
static string const g_strYulDialect = "yul-dialect";
static string const g_strIR = "ir";
@ -146,12 +144,10 @@ static set<string> const g_combinedJsonArgs
g_strAst,
g_strBinary,
g_strBinaryRuntime,
g_strCompactJSON,
g_strFunDebug,
g_strFunDebugRuntime,
g_strGeneratedSources,
g_strGeneratedSourcesRuntime,
g_strInterface,
g_strMetadata,
g_strNatspecUser,
g_strNatspecDev,
@ -627,7 +623,7 @@ General Information)").c_str(),
g_strImportAst.c_str(),
("Import ASTs to be compiled, assumes input holds the AST in compact JSON format. "
"Supported Inputs is the output of the --" + g_strStandardJSON + " or the one produced by "
"--" + g_strCombinedJson + " " + g_strAst + "," + g_strCompactJSON).c_str()
"--" + g_strCombinedJson + " " + g_strAst).c_str()
)
;
desc.add(alternativeInputModes);

2
test/cmdlineTests/ast_json_import_wrong_evmVersion/args
View File

@ -1 +1 @@
--evm-version=homestead --import-ast --combined-json ast,compact-format --pretty-json
--evm-version=homestead --import-ast --combined-json ast --pretty-json

2
test/stopAfterParseTests.sh
View File

@ -18,7 +18,7 @@ cd "$FILETMP" || exit 1
function testFile()
{
set +e
ALLOUTPUT=$($SOLC --combined-json ast,compact-format --pretty-json "$@" --stop-after parsing 2>&1)
ALLOUTPUT=$($SOLC --combined-json ast --pretty-json "$@" --stop-after parsing 2>&1)
local RESULT=$?
set -e
if test ${RESULT} -ne 0; then