From e82df073d15237455b1e53e35ef544aea72a69f9 Mon Sep 17 00:00:00 2001 From: djudjuu Date: Mon, 22 May 2017 11:51:45 +0200 Subject: [PATCH] minor fixes and changelog update --- Changelog.md | 1 + libsolidity/analysis/TypeChecker.cpp | 1 + libsolidity/ast/ASTJsonConverter.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index be5c18c52..650d75d89 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,5 @@ ### 0.4.12 (unreleased) + * AST: export all attributes to Json format ### 0.4.11 (2017-05-03) diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index b8221a2ce..8161a3a12 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -1246,6 +1246,7 @@ bool TypeChecker::visit(FunctionCall const& _functionCall) } else _functionCall.annotation().kind = FunctionCallKind::FunctionCall; + solAssert(_functionCall.annotation().kind != FunctionCallKind::Unset, ""); if (_functionCall.annotation().kind == FunctionCallKind::TypeConversion) { diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp index 81996678f..40c552a3d 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -634,7 +634,7 @@ bool ASTJsonConverter::visit(FunctionCall const& _node) }; if (m_legacy) { - attributes.push_back(make_pair("isStructConstructorCall", functionCallKind(_node.annotation().kind))); + attributes.push_back(make_pair("isStructConstructorCall", _node.annotation().kind == FunctionCallKind::StructConstructorCall)); attributes.push_back(make_pair("type_conversion", _node.annotation().kind == FunctionCallKind::TypeConversion)); } else