diff options
author | chriseth <c@ethdev.com> | 2015-11-17 07:06:57 +0800 |
---|---|---|
committer | chriseth <c@ethdev.com> | 2015-11-26 20:10:12 +0800 |
commit | 30b325fdc148d5014f04fd238362e3a1df10310f (patch) | |
tree | cd8df0c1f6e5462f2349a07d8f5f7d1fd156b4cc /libsolidity/ast | |
parent | cd94aa978a77ace1296f9978bfae6d8735b5c91d (diff) | |
download | dexon-solidity-30b325fdc148d5014f04fd238362e3a1df10310f.tar.gz dexon-solidity-30b325fdc148d5014f04fd238362e3a1df10310f.tar.zst dexon-solidity-30b325fdc148d5014f04fd238362e3a1df10310f.zip |
Allow "new expressions" also for general type names.
Breaking change: If you want to send value with a contract creation, you
have to use parentheses now:
`(new ContractName).value(2 ether)(arg1, arg2)`
Diffstat (limited to 'libsolidity/ast')
-rw-r--r-- | libsolidity/ast/AST.h | 11 | ||||
-rw-r--r-- | libsolidity/ast/ASTAnnotations.h | 3 | ||||
-rw-r--r-- | libsolidity/ast/AST_accept.h | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h index 69186cb7..e2ed1853 100644 --- a/libsolidity/ast/AST.h +++ b/libsolidity/ast/AST.h @@ -1216,23 +1216,24 @@ private: }; /** - * Expression that creates a new contract, e.g. the "new SomeContract" part in "new SomeContract(1, 2)". + * Expression that creates a new contract or memory-array, + * e.g. the "new SomeContract" part in "new SomeContract(1, 2)". */ class NewExpression: public Expression { public: NewExpression( SourceLocation const& _location, - ASTPointer<Identifier> const& _contractName + ASTPointer<TypeName> const& _typeName ): - Expression(_location), m_contractName(_contractName) {} + Expression(_location), m_typeName(_typeName) {} virtual void accept(ASTVisitor& _visitor) override; virtual void accept(ASTConstVisitor& _visitor) const override; - Identifier const& contractName() const { return *m_contractName; } + TypeName const& typeName() const { return *m_typeName; } private: - ASTPointer<Identifier> m_contractName; + ASTPointer<TypeName> m_typeName; }; /** diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h index bb59ceae..b9667302 100644 --- a/libsolidity/ast/ASTAnnotations.h +++ b/libsolidity/ast/ASTAnnotations.h @@ -111,6 +111,9 @@ struct UserDefinedTypeNameAnnotation: TypeNameAnnotation { /// Referenced declaration, set during reference resolution stage. Declaration const* referencedDeclaration = nullptr; + /// Stores a reference to the current contract. + /// This is needed because types of base contracts change depending on the context. + ContractDefinition const* contractScope = nullptr; }; struct VariableDeclarationStatementAnnotation: StatementAnnotation diff --git a/libsolidity/ast/AST_accept.h b/libsolidity/ast/AST_accept.h index 12a26ea7..99d1bf6a 100644 --- a/libsolidity/ast/AST_accept.h +++ b/libsolidity/ast/AST_accept.h @@ -634,14 +634,14 @@ void FunctionCall::accept(ASTConstVisitor& _visitor) const void NewExpression::accept(ASTVisitor& _visitor) { if (_visitor.visit(*this)) - m_contractName->accept(_visitor); + m_typeName->accept(_visitor); _visitor.endVisit(*this); } void NewExpression::accept(ASTConstVisitor& _visitor) const { if (_visitor.visit(*this)) - m_contractName->accept(_visitor); + m_typeName->accept(_visitor); _visitor.endVisit(*this); } |