Skip to content

Commit b3230b0

Browse files
molecula451nikola-matic
molecula451
authored and
nikola-matic
committed
deprecate using namespace std
test: updat filereader test deprecate namespace std deprecate namespace std deprecate namespace std deprecate namespace std deprecate namespace std deprecate namespace std deprecate namespace std deprecate namespace std deprecated std namespace deprecated std namespace deprecated std namespace deprecated std namespace deprecated std namespace deprecated std namespace deprecated std namespace deprecated std namespace deprecated std namespace depecrate namespace std deprecated namespace std check ci clean line Co-authored-by: Nikola Matić <[email protected]> purge line pure line deprecate std deprecate std deprecate std deprecate std deprecate std deprecate deprecate std bye namespace
1 parent df03f14 commit b3230b0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+926
-963
lines changed

‎scripts/check_style.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ NAMESPACE_STD_FREE_FILES=(
3838
libyul/backends/evm/*
3939
libyul/optimiser/*
4040
solc/*
41+
test/contracts/*
42+
test/libevmasm/*
43+
test/liblangutil/*
44+
test/libsolutil/*
45+
test/libsolidity/*
46+
test/libsolidity/analysis/*
47+
test/libsolidity/interface/*
4148
)
4249

4350
(

‎test/contracts/AuctionRegistrar.cpp

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include <string>
3333
#include <optional>
3434

35-
using namespace std;
3635
using namespace solidity;
3736
using namespace solidity::util;
3837
using namespace solidity::test;
@@ -235,47 +234,47 @@ class AuctionRegistrarTestFramework: public SolidityExecutionFramework
235234
{
236235
public:
237236
RegistrarInterface(SolidityExecutionFramework& _framework): ContractInterface(_framework) {}
238-
void reserve(string const& _name)
237+
void reserve(std::string const& _name)
239238
{
240239
callString("reserve", _name);
241240
}
242-
h160 owner(string const& _name)
241+
h160 owner(std::string const& _name)
243242
{
244243
return callStringReturnsAddress("owner", _name);
245244
}
246-
void setAddress(string const& _name, h160 const& _address, bool _primary)
245+
void setAddress(std::string const& _name, h160 const& _address, bool _primary)
247246
{
248247
callStringAddressBool("setAddress", _name, _address, _primary);
249248
}
250-
h160 addr(string const& _name)
249+
h160 addr(std::string const& _name)
251250
{
252251
return callStringReturnsAddress("addr", _name);
253252
}
254-
string name(h160 const& _addr)
253+
std::string name(h160 const& _addr)
255254
{
256255
return callAddressReturnsString("name", _addr);
257256
}
258-
void setSubRegistrar(string const& _name, h160 const& _address)
257+
void setSubRegistrar(std::string const& _name, h160 const& _address)
259258
{
260259
callStringAddress("setSubRegistrar", _name, _address);
261260
}
262-
h160 subRegistrar(string const& _name)
261+
h160 subRegistrar(std::string const& _name)
263262
{
264263
return callStringReturnsAddress("subRegistrar", _name);
265264
}
266-
void setContent(string const& _name, h256 const& _content)
265+
void setContent(std::string const& _name, h256 const& _content)
267266
{
268267
callStringBytes32("setContent", _name, _content);
269268
}
270-
h256 content(string const& _name)
269+
h256 content(std::string const& _name)
271270
{
272271
return callStringReturnsBytes32("content", _name);
273272
}
274-
void transfer(string const& _name, h160 const& _target)
273+
void transfer(std::string const& _name, h160 const& _target)
275274
{
276275
return callStringAddress("transfer", _name, _target);
277276
}
278-
void disown(string const& _name)
277+
void disown(std::string const& _name)
279278
{
280279
return callString("disown", _name);
281280
}
@@ -298,7 +297,7 @@ BOOST_AUTO_TEST_CASE(reserve)
298297
{
299298
// Test that reserving works for long strings
300299
deployRegistrar();
301-
vector<string> names{"abcabcabcabcabc", "defdefdefdefdef", "ghighighighighighighighighighighighighighighi"};
300+
std::vector<std::string> names{"abcabcabcabcabc", "defdefdefdefdef", "ghighighighighighighighighighighighighighighi"};
302301

303302
RegistrarInterface registrar(*this);
304303

@@ -317,7 +316,7 @@ BOOST_AUTO_TEST_CASE(double_reserve_long)
317316
{
318317
// Test that it is not possible to re-reserve from a different address.
319318
deployRegistrar();
320-
string name = "abcabcabcabcabcabcabcabcabcabca";
319+
std::string name = "abcabcabcabcabcabcabcabcabcabca";
321320
RegistrarInterface registrar(*this);
322321
registrar.reserve(name);
323322
BOOST_CHECK_EQUAL(registrar.owner(name), m_sender);
@@ -333,10 +332,10 @@ BOOST_AUTO_TEST_CASE(properties)
333332
// Test setting and retrieving the various properties works.
334333
deployRegistrar();
335334
RegistrarInterface registrar(*this);
336-
string names[] = {"abcaeouoeuaoeuaoeu", "defncboagufra,fui", "ghagpyajfbcuajouhaeoi"};
335+
std::string names[] = {"abcaeouoeuaoeuaoeu", "defncboagufra,fui", "ghagpyajfbcuajouhaeoi"};
337336
size_t addr = 0x9872543;
338337
size_t count = 1;
339-
for (string const& name: names)
338+
for (std::string const& name: names)
340339
{
341340
m_sender = account(0);
342341
sendEther(account(count), u256(20) * ether);
@@ -369,7 +368,7 @@ BOOST_AUTO_TEST_CASE(properties)
369368
BOOST_AUTO_TEST_CASE(transfer)
370369
{
371370
deployRegistrar();
372-
string name = "abcaoeguaoucaeoduceo";
371+
std::string name = "abcaoeguaoucaeoduceo";
373372
RegistrarInterface registrar(*this);
374373
registrar.reserve(name);
375374
registrar.setContent(name, h256(u256(123)));
@@ -381,7 +380,7 @@ BOOST_AUTO_TEST_CASE(transfer)
381380
BOOST_AUTO_TEST_CASE(disown)
382381
{
383382
deployRegistrar();
384-
string name = "abcaoeguaoucaeoduceo";
383+
std::string name = "abcaoeguaoucaeoduceo";
385384

386385
RegistrarInterface registrar(*this);
387386
registrar.reserve(name);
@@ -408,7 +407,7 @@ BOOST_AUTO_TEST_CASE(disown)
408407
BOOST_AUTO_TEST_CASE(auction_simple)
409408
{
410409
deployRegistrar();
411-
string name = "x";
410+
std::string name = "x";
412411

413412
RegistrarInterface registrar(*this);
414413
// initiate auction
@@ -426,7 +425,7 @@ BOOST_AUTO_TEST_CASE(auction_simple)
426425
BOOST_AUTO_TEST_CASE(auction_bidding)
427426
{
428427
deployRegistrar();
429-
string name = "x";
428+
std::string name = "x";
430429

431430
unsigned startTime = 0x776347e2;
432431
m_evmcHost->tx_context.block_timestamp = startTime;

‎test/contracts/Wallet.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838

3939
#include <test/libsolidity/SolidityExecutionFramework.h>
4040

41-
using namespace std;
4241
using namespace solidity::test;
4342
using namespace solidity::util;
4443

@@ -445,7 +444,7 @@ class WalletTestFramework: public SolidityExecutionFramework
445444
protected:
446445
void deployWallet(
447446
u256 const& _value = 0,
448-
vector<h160> const& _owners = vector<h160>{},
447+
std::vector<h160> const& _owners = std::vector<h160>{},
449448
u256 _required = 1,
450449
u256 _dailyLimit = 0
451450
)
@@ -535,7 +534,7 @@ BOOST_AUTO_TEST_CASE(remove_owner)
535534

536535
BOOST_AUTO_TEST_CASE(initial_owners)
537536
{
538-
vector<h160> owners{
537+
std::vector<h160> owners{
539538
h160("0x42c56279432962a17176998a4747d1b4d6ed4367"),
540539
h160("0xd4d4669f5ba9f4c27d38ef02a358c339b5560c47"),
541540
h160("0xe6716f9544a56c530d868e4bfbacb172315bdead"),

‎test/libevmasm/Assembler.cpp

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#include <string>
3535
#include <tuple>
3636

37-
using namespace std;
3837
using namespace solidity::langutil;
3938
using namespace solidity::evmasm;
39+
using namespace std::string_literals;
4040

4141
namespace solidity::frontend::test
4242
{
@@ -55,34 +55,34 @@ BOOST_AUTO_TEST_SUITE(Assembler)
5555

5656
BOOST_AUTO_TEST_CASE(all_assembly_items)
5757
{
58-
map<string, unsigned> indices = {
58+
std::map<std::string, unsigned> indices = {
5959
{ "root.asm", 0 },
6060
{ "sub.asm", 1 },
6161
{ "verbatim.asm", 2 }
6262
};
6363
EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
6464
Assembly _assembly{evmVersion, false, {}};
65-
auto root_asm = make_shared<string>("root.asm");
65+
auto root_asm = std::make_shared<std::string>("root.asm");
6666
_assembly.setSourceLocation({1, 3, root_asm});
6767

6868
Assembly _subAsm{evmVersion, false, {}};
69-
auto sub_asm = make_shared<string>("sub.asm");
69+
auto sub_asm = std::make_shared<std::string>("sub.asm");
7070
_subAsm.setSourceLocation({6, 8, sub_asm});
7171

7272
Assembly _verbatimAsm(evmVersion, true, "");
73-
auto verbatim_asm = make_shared<string>("verbatim.asm");
73+
auto verbatim_asm = std::make_shared<std::string>("verbatim.asm");
7474
_verbatimAsm.setSourceLocation({8, 18, verbatim_asm});
7575

7676
// PushImmutable
7777
_subAsm.appendImmutable("someImmutable");
7878
_subAsm.append(AssemblyItem(PushTag, 0));
7979
_subAsm.append(Instruction::INVALID);
80-
shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
80+
std::shared_ptr<Assembly> _subAsmPtr = std::make_shared<Assembly>(_subAsm);
8181

8282
_verbatimAsm.appendVerbatim({0xff,0xff}, 0, 0);
8383
_verbatimAsm.appendVerbatim({0x74, 0x65, 0x73, 0x74}, 0, 1);
8484
_verbatimAsm.append(Instruction::MSTORE);
85-
shared_ptr<Assembly> _verbatimAsmPtr = make_shared<Assembly>(_verbatimAsm);
85+
std::shared_ptr<Assembly> _verbatimAsmPtr = std::make_shared<Assembly>(_verbatimAsm);
8686

8787
// Tag
8888
auto tag = _assembly.newTag();
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
177177
"\n"
178178
"auxdata: 0x4266eeaa\n"
179179
);
180-
string json{
180+
std::string json{
181181
"{\".auxdata\":\"4266eeaa\",\".code\":["
182182
"{\"begin\":1,\"end\":3,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
183183
"{\"begin\":1,\"end\":3,\"name\":\"JUMPDEST\",\"source\":0},"
@@ -221,11 +221,11 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
221221
// Tests for 1, 2, 3 number of immutables.
222222
for (int numImmutables = 1; numImmutables <= 3; ++numImmutables)
223223
{
224-
BOOST_TEST_MESSAGE("NumImmutables: "s + to_string(numImmutables));
224+
BOOST_TEST_MESSAGE("NumImmutables: "s + std::to_string(numImmutables));
225225
// Tests for the cases 1, 2, 3 occurrences of an immutable reference.
226226
for (int numActualRefs = 1; numActualRefs <= 3; ++numActualRefs)
227227
{
228-
BOOST_TEST_MESSAGE("NumActualRefs: "s + to_string(numActualRefs));
228+
BOOST_TEST_MESSAGE("NumActualRefs: "s + std::to_string(numActualRefs));
229229
auto const NumExpectedMappings =
230230
(
231231
2 + // PUSH <a> PUSH <b>
@@ -238,21 +238,21 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
238238
NumSubs + // PUSH <addr> for every sub assembly
239239
1; // INVALID
240240

241-
auto assemblyName = make_shared<string>("root.asm");
242-
auto subName = make_shared<string>("sub.asm");
241+
auto assemblyName = std::make_shared<std::string>("root.asm");
242+
auto subName = std::make_shared<std::string>("sub.asm");
243243

244-
map<string, unsigned> indices = {
244+
std::map<std::string, unsigned> indices = {
245245
{ *assemblyName, 0 },
246246
{ *subName, 1 }
247247
};
248248

249-
auto subAsm = make_shared<Assembly>(evmVersion, false, string{});
249+
auto subAsm = std::make_shared<Assembly>(evmVersion, false, std::string{});
250250
for (char i = 0; i < numImmutables; ++i)
251251
{
252252
for (int r = 0; r < numActualRefs; ++r)
253253
{
254254
subAsm->setSourceLocation(SourceLocation{10*i, 10*i + 6 + r, subName});
255-
subAsm->appendImmutable(string(1, char('a' + i))); // "a", "b", ...
255+
subAsm->appendImmutable(std::string(1, char('a' + i))); // "a", "b", ...
256256
}
257257
}
258258

@@ -262,34 +262,34 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
262262
assembly.setSourceLocation({10*i, 10*i + 3+i, assemblyName});
263263
assembly.append(u256(0x71)); // immutble value
264264
assembly.append(u256(0)); // target... modules?
265-
assembly.appendImmutableAssignment(string(1, char('a' + i - 1)));
265+
assembly.appendImmutableAssignment(std::string(1, char('a' + i - 1)));
266266
}
267267

268268
assembly.appendSubroutine(subAsm);
269269

270270
checkCompilation(assembly);
271271

272-
string const sourceMappings = AssemblyItem::computeSourceMapping(assembly.items(), indices);
272+
std::string const sourceMappings = AssemblyItem::computeSourceMapping(assembly.items(), indices);
273273
auto const numberOfMappings = std::count(sourceMappings.begin(), sourceMappings.end(), ';');
274274

275275
LinkerObject const& obj = assembly.assemble();
276-
string const disassembly = disassemble(obj.bytecode, evmVersion, "\n");
276+
std::string const disassembly = disassemble(obj.bytecode, evmVersion, "\n");
277277
auto const numberOfOpcodes = std::count(disassembly.begin(), disassembly.end(), '\n');
278278

279279
#if 0 // {{{ debug prints
280280
{
281281
LinkerObject const& subObj = assembly.sub(0).assemble();
282-
string const subDisassembly = disassemble(subObj.bytecode, "\n");
283-
cout << '\n';
284-
cout << "### immutables: " << numImmutables << ", refs: " << numActualRefs << '\n';
285-
cout << " - srcmap: \"" << sourceMappings << "\"\n";
286-
cout << " - src mappings: " << numberOfMappings << '\n';
287-
cout << " - opcodes: " << numberOfOpcodes << '\n';
288-
cout << " - subs: " << assembly.numSubs() << '\n';
289-
cout << " - sub opcodes " << std::count(subDisassembly.begin(), subDisassembly.end(), '\n') << '\n';
290-
cout << " - sub srcmaps " << AssemblyItem::computeSourceMapping(subAsm->items(), indices) << '\n';
291-
cout << " - main bytecode:\n\t" << disassemble(obj.bytecode, "\n\t");
292-
cout << "\r - sub bytecode:\n\t" << disassemble(subObj.bytecode, "\n\t");
282+
std::string const subDisassembly = disassemble(subObj.bytecode, "\n");
283+
std::cout << '\n';
284+
std::cout << "### immutables: " << numImmutables << ", refs: " << numActualRefs << '\n';
285+
std::cout << " - srcmap: \"" << sourceMappings << "\"\n";
286+
std::cout << " - src mappings: " << numberOfMappings << '\n';
287+
std::cout << " - opcodes: " << numberOfOpcodes << '\n';
288+
std::cout << " - subs: " << assembly.numSubs() << '\n';
289+
std::cout << " - sub opcodes " << std::count(subDisassembly.begin(), subDisassembly.end(), '\n') << '\n';
290+
std::cout << " - sub srcmaps " << AssemblyItem::computeSourceMapping(subAsm->items(), indices) << '\n';
291+
std::cout << " - main bytecode:\n\t" << disassemble(obj.bytecode, "\n\t");
292+
std::cout << "\r - sub bytecode:\n\t" << disassemble(subObj.bytecode, "\n\t");
293293
}
294294
#endif // }}}
295295

@@ -301,22 +301,22 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
301301

302302
BOOST_AUTO_TEST_CASE(immutable)
303303
{
304-
map<string, unsigned> indices = {
304+
std::map<std::string, unsigned> indices = {
305305
{ "root.asm", 0 },
306306
{ "sub.asm", 1 }
307307
};
308308
EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
309309
Assembly _assembly{evmVersion, true, {}};
310-
auto root_asm = make_shared<string>("root.asm");
310+
auto root_asm = std::make_shared<std::string>("root.asm");
311311
_assembly.setSourceLocation({1, 3, root_asm});
312312

313313
Assembly _subAsm{evmVersion, false, {}};
314-
auto sub_asm = make_shared<string>("sub.asm");
314+
auto sub_asm = std::make_shared<std::string>("sub.asm");
315315
_subAsm.setSourceLocation({6, 8, sub_asm});
316316
_subAsm.appendImmutable("someImmutable");
317317
_subAsm.appendImmutable("someOtherImmutable");
318318
_subAsm.appendImmutable("someImmutable");
319-
shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
319+
std::shared_ptr<Assembly> _subAsmPtr = std::make_shared<Assembly>(_subAsm);
320320

321321
_assembly.append(u256(42));
322322
_assembly.append(u256(0));
@@ -330,9 +330,9 @@ BOOST_AUTO_TEST_CASE(immutable)
330330

331331
checkCompilation(_assembly);
332332

333-
string genericPush0 = evmVersion.hasPush0() ? "5f" : "6000";
333+
std::string genericPush0 = evmVersion.hasPush0() ? "5f" : "6000";
334334
// PUSH1 0x1b v/s PUSH1 0x19
335-
string dataOffset = evmVersion.hasPush0() ? "6019" : "601b" ;
335+
std::string dataOffset = evmVersion.hasPush0() ? "6019" : "601b" ;
336336

337337
BOOST_CHECK_EQUAL(
338338
_assembly.assemble().toHex(),
@@ -406,8 +406,8 @@ BOOST_AUTO_TEST_CASE(subobject_encode_decode)
406406
EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
407407
Assembly assembly{evmVersion, true, {}};
408408

409-
shared_ptr<Assembly> subAsmPtr = make_shared<Assembly>(evmVersion, false, string{});
410-
shared_ptr<Assembly> subSubAsmPtr = make_shared<Assembly>(evmVersion, false, string{});
409+
std::shared_ptr<Assembly> subAsmPtr = std::make_shared<Assembly>(evmVersion, false, std::string{});
410+
std::shared_ptr<Assembly> subSubAsmPtr = std::make_shared<Assembly>(evmVersion, false, std::string{});
411411

412412
assembly.appendSubroutine(subAsmPtr);
413413
subAsmPtr->appendSubroutine(subSubAsmPtr);
@@ -416,7 +416,7 @@ BOOST_AUTO_TEST_CASE(subobject_encode_decode)
416416
BOOST_REQUIRE_THROW(assembly.encodeSubPath({1}), solidity::evmasm::AssemblyException);
417417
BOOST_REQUIRE_THROW(assembly.decodeSubPath(1), solidity::evmasm::AssemblyException);
418418

419-
vector<size_t> subPath{0, 0};
419+
std::vector<size_t> subPath{0, 0};
420420
BOOST_CHECK(assembly.decodeSubPath(assembly.encodeSubPath(subPath)) == subPath);
421421
}
422422

0 commit comments

Comments
 (0)