aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/ast
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-08-01 17:32:23 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-08-01 17:47:10 +0800
commit6d37f30d76cb8af83a292535bf2a736406b3f1c8 (patch)
tree12ee0efa9e80802f3ad82809e8495cefe2e526bb /libsolidity/ast
parent93f90eb292de6396462dd244213457b948852168 (diff)
downloaddexon-solidity-6d37f30d76cb8af83a292535bf2a736406b3f1c8.tar
dexon-solidity-6d37f30d76cb8af83a292535bf2a736406b3f1c8.tar.gz
dexon-solidity-6d37f30d76cb8af83a292535bf2a736406b3f1c8.tar.bz2
dexon-solidity-6d37f30d76cb8af83a292535bf2a736406b3f1c8.tar.lz
dexon-solidity-6d37f30d76cb8af83a292535bf2a736406b3f1c8.tar.xz
dexon-solidity-6d37f30d76cb8af83a292535bf2a736406b3f1c8.tar.zst
dexon-solidity-6d37f30d76cb8af83a292535bf2a736406b3f1c8.zip
Rename Bare to Barecall
Diffstat (limited to 'libsolidity/ast')
-rw-r--r--libsolidity/ast/Types.cpp10
-rw-r--r--libsolidity/ast/Types.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 3f8da501..3712eb15 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -477,7 +477,7 @@ MemberList::MemberMap IntegerType::nativeMembers(ContractDefinition const*) cons
if (isAddress())
return {
{"balance", make_shared<IntegerType >(256)},
- {"call", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::Bare, true, false, true)},
+ {"call", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareCall, true, false, true)},
{"callcode", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareCallCode, true, false, true)},
{"delegatecall", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareDelegateCall, true)},
{"send", make_shared<FunctionType>(strings{"uint"}, strings{"bool"}, FunctionType::Kind::Send)},
@@ -2178,7 +2178,7 @@ string FunctionType::identifier() const
case Kind::External: id += "external"; break;
case Kind::CallCode: id += "callcode"; break;
case Kind::DelegateCall: id += "delegatecall"; break;
- case Kind::Bare: id += "bare"; break;
+ case Kind::BareCall: id += "barecall"; break;
case Kind::BareCallCode: id += "barecallcode"; break;
case Kind::BareDelegateCall: id += "baredelegatecall"; break;
case Kind::Creation: id += "creation"; break;
@@ -2346,7 +2346,7 @@ unsigned FunctionType::sizeOnStack() const
unsigned size = 0;
if (kind == Kind::External || kind == Kind::CallCode || kind == Kind::DelegateCall)
size = 2;
- else if (kind == Kind::Bare || kind == Kind::BareCallCode || kind == Kind::BareDelegateCall)
+ else if (kind == Kind::BareCall || kind == Kind::BareCallCode || kind == Kind::BareDelegateCall)
size = 1;
else if (kind == Kind::Internal)
size = 1;
@@ -2405,7 +2405,7 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const*) con
case Kind::ECRecover:
case Kind::SHA256:
case Kind::RIPEMD160:
- case Kind::Bare:
+ case Kind::BareCall:
case Kind::BareCallCode:
case Kind::BareDelegateCall:
{
@@ -2509,7 +2509,7 @@ bool FunctionType::isBareCall() const
{
switch (m_kind)
{
- case Kind::Bare:
+ case Kind::BareCall:
case Kind::BareCallCode:
case Kind::BareDelegateCall:
case Kind::ECRecover:
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 1db46355..5d2bdca0 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -838,7 +838,7 @@ public:
External, ///< external call using CALL
CallCode, ///< external call using CALLCODE, i.e. not exchanging the storage
DelegateCall, ///< external call using DELEGATECALL, i.e. not exchanging the storage
- Bare, ///< CALL without function hash
+ BareCall, ///< CALL without function hash
BareCallCode, ///< CALLCODE without function hash
BareDelegateCall, ///< DELEGATECALL without function hash
Creation, ///< external call using CREATE