aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md1
-rw-r--r--libsolidity/analysis/TypeChecker.cpp1
-rw-r--r--libsolidity/ast/ASTJsonConverter.cpp2
3 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md
index be5c18c5..650d75d8 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 b8221a2c..8161a3a1 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 81996678..40c552a3 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