Skip to content

Commit 4c20e18

Browse files
aarltaarlt
committed
[solc] CommandLineInterface.cpp: Remove optional parameter in solAssert(..) usage.
1 parent 1ad3954 commit 4c20e18

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎solc/CommandLineInterface.cpp

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void CommandLineInterface::handleBinary(string const& _contract)
164164
solAssert(
165165
m_options.input.mode == InputMode::Compiler ||
166166
m_options.input.mode == InputMode::CompilerWithASTImport ||
167-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
167+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
168168
);
169169

170170
if (m_options.compiler.outputs.binary)
@@ -194,7 +194,7 @@ void CommandLineInterface::handleOpcode(string const& _contract)
194194
solAssert(
195195
m_options.input.mode == InputMode::Compiler ||
196196
m_options.input.mode == InputMode::CompilerWithASTImport ||
197-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
197+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
198198
);
199199

200200
if (!m_options.output.dir.empty())
@@ -212,7 +212,7 @@ void CommandLineInterface::handleIR(string const& _contractName)
212212
solAssert(
213213
m_options.input.mode == InputMode::Compiler ||
214214
m_options.input.mode == InputMode::CompilerWithASTImport ||
215-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
215+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
216216
);
217217

218218
if (!m_options.compiler.outputs.ir)
@@ -232,7 +232,7 @@ void CommandLineInterface::handleIROptimized(string const& _contractName)
232232
solAssert(
233233
m_options.input.mode == InputMode::Compiler ||
234234
m_options.input.mode == InputMode::CompilerWithASTImport ||
235-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
235+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
236236
);
237237

238238
if (!m_options.compiler.outputs.irOptimized)
@@ -252,7 +252,7 @@ void CommandLineInterface::handleEwasm(string const& _contractName)
252252
solAssert(
253253
m_options.input.mode == InputMode::Compiler ||
254254
m_options.input.mode == InputMode::CompilerWithASTImport ||
255-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
255+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
256256
);
257257

258258
if (!m_options.compiler.outputs.ewasm)
@@ -279,7 +279,7 @@ void CommandLineInterface::handleBytecode(string const& _contract)
279279
solAssert(
280280
m_options.input.mode == InputMode::Compiler ||
281281
m_options.input.mode == InputMode::CompilerWithASTImport ||
282-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
282+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
283283
);
284284

285285
if (m_options.compiler.outputs.opcodes)
@@ -293,7 +293,7 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
293293
solAssert(
294294
m_options.input.mode == InputMode::Compiler ||
295295
m_options.input.mode == InputMode::CompilerWithASTImport ||
296-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
296+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
297297
);
298298

299299
if (!m_options.compiler.outputs.signatureHashes)
@@ -329,7 +329,7 @@ void CommandLineInterface::handleMetadata(string const& _contract)
329329
solAssert(
330330
m_options.input.mode == InputMode::Compiler ||
331331
m_options.input.mode == InputMode::CompilerWithASTImport ||
332-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
332+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
333333
);
334334

335335
if (!m_options.compiler.outputs.metadata)
@@ -347,7 +347,7 @@ void CommandLineInterface::handleABI(string const& _contract)
347347
solAssert(
348348
m_options.input.mode == InputMode::Compiler ||
349349
m_options.input.mode == InputMode::CompilerWithASTImport ||
350-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
350+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
351351
);
352352

353353
if (!m_options.compiler.outputs.abi)
@@ -365,7 +365,7 @@ void CommandLineInterface::handleStorageLayout(string const& _contract)
365365
solAssert(
366366
m_options.input.mode == InputMode::Compiler ||
367367
m_options.input.mode == InputMode::CompilerWithASTImport ||
368-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
368+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
369369
);
370370

371371
if (!m_options.compiler.outputs.storageLayout)
@@ -383,7 +383,7 @@ void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contra
383383
solAssert(
384384
m_options.input.mode == InputMode::Compiler ||
385385
m_options.input.mode == InputMode::CompilerWithASTImport ||
386-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
386+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
387387
);
388388

389389
bool enabled = false;
@@ -430,7 +430,7 @@ void CommandLineInterface::handleGasEstimation(string const& _contract)
430430
solAssert(
431431
m_options.input.mode == InputMode::Compiler ||
432432
m_options.input.mode == InputMode::CompilerWithASTImport ||
433-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
433+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
434434
);
435435

436436
Json::Value estimates = m_compiler->gasEstimates(_contract);
@@ -473,7 +473,7 @@ void CommandLineInterface::handleGasEstimation(string const& _contract)
473473

474474
void CommandLineInterface::readInputFiles()
475475
{
476-
solAssert(!m_standardJsonInput.has_value(), "");
476+
solAssert(!m_standardJsonInput.has_value());
477477

478478
if (
479479
m_options.input.mode == InputMode::Help ||
@@ -545,8 +545,8 @@ void CommandLineInterface::readInputFiles()
545545
string fileContent = readFileAsString(infile);
546546
if (m_options.input.mode == InputMode::StandardJson)
547547
{
548-
solAssert(!m_standardJsonInput.has_value(), "");
549-
m_standardJsonInput = std::move(fileContent);
548+
solAssert(!m_standardJsonInput.has_value());
549+
m_standardJsonInput = move(fileContent);
550550
}
551551
else
552552
{
@@ -559,7 +559,7 @@ void CommandLineInterface::readInputFiles()
559559
{
560560
if (m_options.input.mode == InputMode::StandardJson)
561561
{
562-
solAssert(!m_standardJsonInput.has_value(), "");
562+
solAssert(!m_standardJsonInput.has_value());
563563
m_standardJsonInput = readUntilEnd(m_sin);
564564
}
565565
else
@@ -576,7 +576,7 @@ void CommandLineInterface::readInputFiles()
576576

577577
map<string, Json::Value> CommandLineInterface::parseAstFromInput()
578578
{
579-
solAssert(m_options.input.mode == InputMode::CompilerWithASTImport, "");
579+
solAssert(m_options.input.mode == InputMode::CompilerWithASTImport);
580580

581581
map<string, Json::Value> sourceJsons;
582582
map<string, string> tmpSources;
@@ -606,8 +606,8 @@ map<string, Json::Value> CommandLineInterface::parseAstFromInput()
606606

607607
map<string, Json::Value> CommandLineInterface::parseEvmAssemblyJsonFromInput()
608608
{
609-
solAssert(m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, "");
610-
solAssert(m_fileReader.sourceUnits().size() == 1, "");
609+
solAssert(m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport);
610+
solAssert(m_fileReader.sourceUnits().size() == 1);
611611

612612
map<string, Json::Value> sourceJsons;
613613

@@ -627,7 +627,7 @@ void CommandLineInterface::createFile(string const& _fileName, string const& _da
627627
{
628628
namespace fs = boost::filesystem;
629629

630-
solAssert(!m_options.output.dir.empty(), "");
630+
solAssert(!m_options.output.dir.empty());
631631

632632
// NOTE: create_directories() raises an exception if the path consists solely of '.' or '..'
633633
// (or equivalent such as './././.'). Paths like 'a/b/.' and 'a/b/..' are fine though.
@@ -707,7 +707,7 @@ void CommandLineInterface::processInput()
707707
break;
708708
case InputMode::StandardJson:
709709
{
710-
solAssert(m_standardJsonInput.has_value(), "");
710+
solAssert(m_standardJsonInput.has_value());
711711

712712
StandardCompiler compiler(m_fileReader.reader(), m_options.formatting.json);
713713
sout() << compiler.compile(std::move(m_standardJsonInput.value())) << endl;
@@ -750,7 +750,7 @@ void CommandLineInterface::compile()
750750
solAssert(
751751
m_options.input.mode == InputMode::Compiler ||
752752
m_options.input.mode == InputMode::CompilerWithASTImport ||
753-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
753+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
754754
);
755755

756756
m_compiler = make_unique<CompilerStack>(m_fileReader.reader());
@@ -872,7 +872,7 @@ void CommandLineInterface::handleCombinedJSON()
872872
solAssert(
873873
m_options.input.mode == InputMode::Compiler ||
874874
m_options.input.mode == InputMode::CompilerWithASTImport ||
875-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
875+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
876876
);
877877

878878
if (!m_options.compiler.combinedJsonRequests.has_value())
@@ -968,7 +968,7 @@ void CommandLineInterface::handleAst()
968968
solAssert(
969969
m_options.input.mode == InputMode::Compiler ||
970970
m_options.input.mode == InputMode::CompilerWithASTImport ||
971-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
971+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
972972
);
973973

974974
if (!m_options.compiler.outputs.astCompactJson)
@@ -1010,7 +1010,7 @@ void CommandLineInterface::serveLSP()
10101010

10111011
void CommandLineInterface::link()
10121012
{
1013-
solAssert(m_options.input.mode == InputMode::Linker, "");
1013+
solAssert(m_options.input.mode == InputMode::Linker);
10141014

10151015
// Map from how the libraries will be named inside the bytecode to their addresses.
10161016
map<string, h160> librariesReplacements;
@@ -1073,7 +1073,7 @@ void CommandLineInterface::link()
10731073

10741074
void CommandLineInterface::writeLinkedFiles()
10751075
{
1076-
solAssert(m_options.input.mode == InputMode::Linker, "");
1076+
solAssert(m_options.input.mode == InputMode::Linker);
10771077

10781078
for (auto const& src: m_fileReader.sourceUnits())
10791079
if (src.first == g_stdinFileName)
@@ -1107,14 +1107,14 @@ string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _
11071107

11081108
void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine)
11091109
{
1110-
solAssert(m_options.input.mode == InputMode::Assembler, "");
1110+
solAssert(m_options.input.mode == InputMode::Assembler);
11111111

11121112
bool successful = true;
11131113
map<string, yul::YulStack> yulStacks;
11141114
for (auto const& src: m_fileReader.sourceUnits())
11151115
{
11161116
// --no-optimize-yul option is not accepted in assembly mode.
1117-
solAssert(!m_options.optimizer.noOptimizeYul, "");
1117+
solAssert(!m_options.optimizer.noOptimizeYul);
11181118

11191119
auto& stack = yulStacks[src.first] = yul::YulStack(
11201120
m_options.output.evmVersion,
@@ -1194,7 +1194,7 @@ void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulS
11941194
serr() << "No binary representation found." << endl;
11951195
}
11961196

1197-
solAssert(_targetMachine == yul::YulStack::Machine::Ewasm || _targetMachine == yul::YulStack::Machine::EVM, "");
1197+
solAssert(_targetMachine == yul::YulStack::Machine::Ewasm || _targetMachine == yul::YulStack::Machine::EVM);
11981198
if (
11991199
(_targetMachine == yul::YulStack::Machine::EVM && m_options.compiler.outputs.asm_) ||
12001200
(_targetMachine == yul::YulStack::Machine::Ewasm && m_options.compiler.outputs.ewasm)
@@ -1214,7 +1214,7 @@ void CommandLineInterface::outputCompilationResults()
12141214
solAssert(
12151215
m_options.input.mode == InputMode::Compiler ||
12161216
m_options.input.mode == InputMode::CompilerWithASTImport ||
1217-
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport, ""
1217+
m_options.input.mode == InputMode::CompilerWithEvmAssemblyJsonImport
12181218
);
12191219

12201220
handleCombinedJSON();

0 commit comments

Comments
 (0)