diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp index 4eaa558713a7..fcfd0f44bf59 100644 --- a/libsolidity/ast/ASTJsonExporter.cpp +++ b/libsolidity/ast/ASTJsonExporter.cpp @@ -1006,13 +1006,13 @@ bool ASTJsonExporter::visit(Identifier const& _node) Json overloads = Json::array(); for (auto const& dec: _node.annotation().overloadedDeclarations) overloads.emplace_back(nodeId(*dec)); - setJsonNode(_node, "Identifier", { + std::vector> attributes = { std::make_pair("name", _node.name()), std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)), std::make_pair("overloadedDeclarations", overloads), - std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type)), - std::make_pair("argumentTypes", typePointerToJson(_node.annotation().arguments)) - }); + }; + appendExpressionAttributes(attributes, _node.annotation()); + setJsonNode(_node, "Identifier", std::move(attributes)); return false; } diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json index bce13b38e589..5b89b05c29c5 100644 --- a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json +++ b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json @@ -150,6 +150,10 @@ "lValueRequested": false, "leftHandSide": { "id": 6, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json index 3e8c7955a281..bd12d32c9dfb 100644 --- a/test/libsolidity/ASTJSON/address_payable.json +++ b/test/libsolidity/ASTJSON/address_payable.json @@ -119,6 +119,10 @@ "initialValue": { "baseExpression": { "id": 13, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "m", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -132,6 +136,10 @@ "id": 15, "indexExpression": { "id": 14, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "arg", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -165,6 +173,10 @@ "lValueRequested": false, "leftHandSide": { "id": 17, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "r", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -179,6 +191,10 @@ "operator": "=", "rightHandSide": { "id": 18, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "arg", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -238,6 +254,10 @@ "arguments": [ { "id": 25, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -304,6 +324,10 @@ "leftHandSide": { "baseExpression": { "id": 28, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "m", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -317,6 +341,10 @@ "id": 30, "indexExpression": { "id": 29, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json index f94345ffcd92..20361b57a10e 100644 --- a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json +++ b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json @@ -236,6 +236,10 @@ { "expression": { "id": 4, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -303,6 +307,10 @@ "components": [ { "id": 10, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "free2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -356,6 +364,10 @@ { "expression": { "id": 14, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -483,6 +495,10 @@ { "expression": { "id": 25, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -550,6 +566,10 @@ "components": [ { "id": 31, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "free2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -697,6 +717,10 @@ { "expression": { "id": 42, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -764,6 +788,10 @@ "components": [ { "id": 48, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "free2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -817,6 +845,10 @@ { "expression": { "id": 52, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json index cbbc962c027a..ba664379e729 100644 --- a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json +++ b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json @@ -278,6 +278,10 @@ { "expression": { "id": 31, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "free1", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -295,6 +299,10 @@ { "expression": { "id": 33, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "inr1", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -313,6 +321,10 @@ "expression": { "expression": { "id": 35, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -384,6 +396,10 @@ "components": [ { "id": 43, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "free2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -436,6 +452,10 @@ "components": [ { "id": 47, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "inr2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -742,6 +762,10 @@ "expression": { "expression": { "id": 80, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -774,6 +798,10 @@ { "expression": { "id": 84, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "inr1", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -791,6 +819,10 @@ { "expression": { "id": 86, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "free1", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -809,6 +841,10 @@ "expression": { "expression": { "id": 88, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -842,6 +878,10 @@ "expression": { "expression": { "id": 92, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -914,6 +954,10 @@ { "expression": { "id": 100, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -981,6 +1025,10 @@ "components": [ { "id": 106, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "inr2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1033,6 +1081,10 @@ "components": [ { "id": 110, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "free2", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1086,6 +1138,10 @@ { "expression": { "id": 114, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1154,6 +1210,10 @@ { "expression": { "id": 120, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1299,6 +1359,10 @@ "expression": { "argumentTypes": [], "id": 133, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "access", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1335,6 +1399,10 @@ "expression": { "argumentTypes": [], "id": 136, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "expression", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/constant_identifier.json b/test/libsolidity/ASTJSON/constant_identifier.json new file mode 100644 index 000000000000..f292ab4ffc52 --- /dev/null +++ b/test/libsolidity/ASTJSON/constant_identifier.json @@ -0,0 +1,241 @@ +{ + "absolutePath": "a", + "exportedSymbols": { + "C": [ + 17 + ], + "X": [ + 3 + ] + }, + "id": 18, + "nodeType": "SourceUnit", + "nodes": [ + { + "constant": true, + "id": 3, + "mutability": "constant", + "name": "X", + "nameLocation": "14:1:1", + "nodeType": "VariableDeclaration", + "scope": 18, + "src": "0:22:1", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 1, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "0:4:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": { + "hexValue": "31323334", + "id": 2, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "18:4:1", + "typeDescriptions": { + "typeIdentifier": "t_rational_1234_by_1", + "typeString": "int_const 1234" + }, + "value": "1234" + }, + "visibility": "internal" + }, + { + "abstract": false, + "baseContracts": [], + "canonicalName": "C", + "contractDependencies": [], + "contractKind": "contract", + "fullyImplemented": true, + "id": 17, + "linearizedBaseContracts": [ + 17 + ], + "name": "C", + "nameLocation": "33:1:1", + "nodeType": "ContractDefinition", + "nodes": [ + { + "constant": true, + "id": 6, + "mutability": "constant", + "name": "Y", + "nameLocation": "55:1:1", + "nodeType": "VariableDeclaration", + "scope": 17, + "src": "41:22:1", + "stateVariable": true, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 4, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "41:4:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": { + "hexValue": "35363738", + "id": 5, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "59:4:1", + "typeDescriptions": { + "typeIdentifier": "t_rational_5678_by_1", + "typeString": "int_const 5678" + }, + "value": "5678" + }, + "visibility": "internal" + }, + { + "body": { + "id": 15, + "nodeType": "Block", + "src": "104:29:1", + "statements": [ + { + "expression": { + "commonType": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "id": 13, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "leftExpression": { + "id": 11, + "isConstant": true, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "name": "X", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3, + "src": "121:1:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "BinaryOperation", + "operator": "+", + "rightExpression": { + "id": 12, + "isConstant": true, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "name": "Y", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 6, + "src": "125:1:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "121:5:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "functionReturnParameters": 10, + "id": 14, + "nodeType": "Return", + "src": "114:12:1" + } + ] + }, + "functionSelector": "26121ff0", + "id": 16, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "f", + "nameLocation": "78:1:1", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 7, + "nodeType": "ParameterList", + "parameters": [], + "src": "79:2:1" + }, + "returnParameters": { + "id": 10, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 9, + "mutability": "mutable", + "name": "", + "nameLocation": "-1:-1:-1", + "nodeType": "VariableDeclaration", + "scope": 16, + "src": "98:4:1", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 8, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "98:4:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "visibility": "internal" + } + ], + "src": "97:6:1" + }, + "scope": 17, + "src": "69:64:1", + "stateMutability": "nonpayable", + "virtual": false, + "visibility": "public" + } + ], + "scope": 18, + "src": "24:111:1", + "usedErrors": [], + "usedEvents": [] + } + ], + "src": "0:136:1" +} diff --git a/test/libsolidity/ASTJSON/constant_identifier.sol b/test/libsolidity/ASTJSON/constant_identifier.sol new file mode 100644 index 000000000000..061714d8480f --- /dev/null +++ b/test/libsolidity/ASTJSON/constant_identifier.sol @@ -0,0 +1,9 @@ +uint constant X = 1234; +contract C { + uint constant Y = 5678; + function f() public returns (uint) { + return X + Y; + } +} + +// ---- diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.json b/test/libsolidity/ASTJSON/documentation_local_variable.json index 1e22c91616b2..97cd9858e8a0 100644 --- a/test/libsolidity/ASTJSON/documentation_local_variable.json +++ b/test/libsolidity/ASTJSON/documentation_local_variable.json @@ -157,6 +157,10 @@ "lValueRequested": false, "leftExpression": { "id": 13, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -259,6 +263,10 @@ "src": "256:3:1", "subExpression": { "id": 16, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.json b/test/libsolidity/ASTJSON/documentation_on_statements.json index 350d7868672f..673246c185a1 100644 --- a/test/libsolidity/ASTJSON/documentation_on_statements.json +++ b/test/libsolidity/ASTJSON/documentation_on_statements.json @@ -71,6 +71,10 @@ "lValueRequested": false, "leftHandSide": { "id": 17, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -123,6 +127,10 @@ "lValueRequested": false, "leftExpression": { "id": 11, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -225,6 +233,10 @@ "src": "151:3:1", "subExpression": { "id": 14, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -250,6 +262,10 @@ { "expression": { "id": 23, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/documentation_triple.json b/test/libsolidity/ASTJSON/documentation_triple.json index bc3c3d8878cd..5c9dab9ecf24 100644 --- a/test/libsolidity/ASTJSON/documentation_triple.json +++ b/test/libsolidity/ASTJSON/documentation_triple.json @@ -78,6 +78,10 @@ "lValueRequested": false, "leftHandSide": { "id": 18, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -130,6 +134,10 @@ "lValueRequested": false, "leftExpression": { "id": 12, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -233,6 +241,10 @@ "src": "137:3:1", "subExpression": { "id": 15, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -259,6 +271,10 @@ "documentation": "tes \"t4\" ", "expression": { "id": 24, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/emit_event_from_module_via_member_access.json b/test/libsolidity/ASTJSON/emit_event_from_module_via_member_access.json index a33847450bc2..25c3e368694a 100644 --- a/test/libsolidity/ASTJSON/emit_event_from_module_via_member_access.json +++ b/test/libsolidity/ASTJSON/emit_event_from_module_via_member_access.json @@ -548,6 +548,10 @@ } ], "id": 30, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -737,6 +741,10 @@ ], "expression": { "id": 42, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "A", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -942,6 +950,10 @@ "expression": { "expression": { "id": 56, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "A", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/enum_value_declaration.json b/test/libsolidity/ASTJSON/enum_value_declaration.json index 324911fa90f8..ed5d9ad50c20 100644 --- a/test/libsolidity/ASTJSON/enum_value_declaration.json +++ b/test/libsolidity/ASTJSON/enum_value_declaration.json @@ -45,6 +45,10 @@ "expression": { "expression": { "id": 9, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "A", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/error_from_module_via_member_access.json b/test/libsolidity/ASTJSON/error_from_module_via_member_access.json index db9062891a9b..9fed9067a5f2 100644 --- a/test/libsolidity/ASTJSON/error_from_module_via_member_access.json +++ b/test/libsolidity/ASTJSON/error_from_module_via_member_access.json @@ -238,6 +238,10 @@ } ], "id": 18, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "ErrorBContract", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -331,6 +335,10 @@ ], "expression": { "id": 26, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "A", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -440,6 +448,10 @@ "expression": { "expression": { "id": 36, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "A", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/event_aggregated_contract.json b/test/libsolidity/ASTJSON/event_aggregated_contract.json index d1bf17c75b29..e35055805bc5 100644 --- a/test/libsolidity/ASTJSON/event_aggregated_contract.json +++ b/test/libsolidity/ASTJSON/event_aggregated_contract.json @@ -53,6 +53,10 @@ "expression": { "argumentTypes": [], "id": 5, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "e", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -188,6 +192,10 @@ "lValueRequested": false, "leftHandSide": { "id": 16, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -269,6 +277,10 @@ "argumentTypes": [], "expression": { "id": 23, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/event_emited_in_base_contract.json b/test/libsolidity/ASTJSON/event_emited_in_base_contract.json index 40bb3bae44aa..a999d2d4caed 100644 --- a/test/libsolidity/ASTJSON/event_emited_in_base_contract.json +++ b/test/libsolidity/ASTJSON/event_emited_in_base_contract.json @@ -131,6 +131,10 @@ ], "expression": { "id": 8, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json index 92de58cf8b2a..0aaa3905c4e8 100644 --- a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json +++ b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json @@ -106,6 +106,10 @@ { "expression": { "id": 13, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -140,6 +144,10 @@ ], "expression": { "id": 10, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "C", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/indirect_event.json b/test/libsolidity/ASTJSON/indirect_event.json index 691e814e51ef..1427e8ca1423 100644 --- a/test/libsolidity/ASTJSON/indirect_event.json +++ b/test/libsolidity/ASTJSON/indirect_event.json @@ -54,6 +54,10 @@ "expression": { "argumentTypes": [], "id": 5, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "E", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -162,6 +166,10 @@ "argumentTypes": [], "expression": { "id": 15, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, "name": "L", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -213,6 +221,10 @@ "expression": { "argumentTypes": [], "id": 20, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "H", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier.json b/test/libsolidity/ASTJSON/long_type_name_identifier.json index d3e76eaac4c0..73bcee68816b 100644 --- a/test/libsolidity/ASTJSON/long_type_name_identifier.json +++ b/test/libsolidity/ASTJSON/long_type_name_identifier.json @@ -110,6 +110,10 @@ "id": 12, "initialValue": { "id": 11, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/source_location.json b/test/libsolidity/ASTJSON/source_location.json index 526069063b3f..307ecf162aef 100644 --- a/test/libsolidity/ASTJSON/source_location.json +++ b/test/libsolidity/ASTJSON/source_location.json @@ -95,6 +95,10 @@ "src": "47:3:1", "subExpression": { "id": 7, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": true, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json index 9db7b6a98357..cb196af47553 100644 --- a/test/libsolidity/ASTJSON/used_errors.json +++ b/test/libsolidity/ASTJSON/used_errors.json @@ -40,6 +40,10 @@ "expression": { "argumentTypes": [], "id": 5, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "X", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -138,6 +142,10 @@ "expression": { "argumentTypes": [], "id": 14, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, "name": "f", "nodeType": "Identifier", "overloadedDeclarations": [], diff --git a/test/libsolidity/ASTJSON/user_defined_operator.json b/test/libsolidity/ASTJSON/user_defined_operator.json index b39d2e07ea10..ef4364fc2842 100644 --- a/test/libsolidity/ASTJSON/user_defined_operator.json +++ b/test/libsolidity/ASTJSON/user_defined_operator.json @@ -388,6 +388,10 @@ "src": "225:2:1", "subExpression": { "id": 42, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -407,6 +411,10 @@ "operator": "-", "rightExpression": { "id": 44, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [],