diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-06-13 01:38:17 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-06-14 16:31:28 +0800 |
| commit | e1d0bfe1ca594d25f3db443a7f87d3b1f3ef4e2d (patch) | |
| tree | 7d129625443fea5a033561f32974329617fb4058 | |
| parent | e0d95a66411834537f4a50ec86617a12e839d769 (diff) | |
| download | dexon-solidity-e1d0bfe1ca594d25f3db443a7f87d3b1f3ef4e2d.tar.gz dexon-solidity-e1d0bfe1ca594d25f3db443a7f87d3b1f3ef4e2d.tar.zst dexon-solidity-e1d0bfe1ca594d25f3db443a7f87d3b1f3ef4e2d.zip | |
JuliaType -> YulType
| -rw-r--r-- | libsolidity/inlineasm/AsmScope.cpp | 4 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmScope.h | 14 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmScopeFiller.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libsolidity/inlineasm/AsmScope.cpp b/libsolidity/inlineasm/AsmScope.cpp index 64d5bd9a..af81b301 100644 --- a/libsolidity/inlineasm/AsmScope.cpp +++ b/libsolidity/inlineasm/AsmScope.cpp @@ -32,7 +32,7 @@ bool Scope::registerLabel(string const& _name) return true; } -bool Scope::registerVariable(string const& _name, JuliaType const& _type) +bool Scope::registerVariable(string const& _name, YulType const& _type) { if (exists(_name)) return false; @@ -42,7 +42,7 @@ bool Scope::registerVariable(string const& _name, JuliaType const& _type) return true; } -bool Scope::registerFunction(string const& _name, std::vector<JuliaType> const& _arguments, std::vector<JuliaType> const& _returns) +bool Scope::registerFunction(string const& _name, std::vector<YulType> const& _arguments, std::vector<YulType> const& _returns) { if (exists(_name)) return false; diff --git a/libsolidity/inlineasm/AsmScope.h b/libsolidity/inlineasm/AsmScope.h index 447d6490..c8c63f8f 100644 --- a/libsolidity/inlineasm/AsmScope.h +++ b/libsolidity/inlineasm/AsmScope.h @@ -62,27 +62,27 @@ struct GenericVisitor<>: public boost::static_visitor<> { struct Scope { - using JuliaType = std::string; + using YulType = std::string; using LabelID = size_t; - struct Variable { JuliaType type; }; + struct Variable { YulType type; }; struct Label { }; struct Function { - std::vector<JuliaType> arguments; - std::vector<JuliaType> returns; + std::vector<YulType> arguments; + std::vector<YulType> returns; }; using Identifier = boost::variant<Variable, Label, Function>; using Visitor = GenericVisitor<Variable const, Label const, Function const>; using NonconstVisitor = GenericVisitor<Variable, Label, Function>; - bool registerVariable(std::string const& _name, JuliaType const& _type); + bool registerVariable(std::string const& _name, YulType const& _type); bool registerLabel(std::string const& _name); bool registerFunction( std::string const& _name, - std::vector<JuliaType> const& _arguments, - std::vector<JuliaType> const& _returns + std::vector<YulType> const& _arguments, + std::vector<YulType> const& _returns ); /// Looks up the identifier in this or super scopes and returns a valid pointer if found diff --git a/libsolidity/inlineasm/AsmScopeFiller.cpp b/libsolidity/inlineasm/AsmScopeFiller.cpp index 86f3809c..2d15c820 100644 --- a/libsolidity/inlineasm/AsmScopeFiller.cpp +++ b/libsolidity/inlineasm/AsmScopeFiller.cpp @@ -75,10 +75,10 @@ bool ScopeFiller::operator()(assembly::VariableDeclaration const& _varDecl) bool ScopeFiller::operator()(assembly::FunctionDefinition const& _funDef) { bool success = true; - vector<Scope::JuliaType> arguments; + vector<Scope::YulType> arguments; for (auto const& _argument: _funDef.parameters) arguments.push_back(_argument.type); - vector<Scope::JuliaType> returns; + vector<Scope::YulType> returns; for (auto const& _return: _funDef.returnVariables) returns.push_back(_return.type); if (!m_currentScope->registerFunction(_funDef.name, arguments, returns)) |