diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-15 11:45:14 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-17 20:59:23 +0100 |
| commit | f9bddfa12d233d9ef01299869f4d491d62a0828e (patch) | |
| tree | 1ffdf0e7a013e43d849bf26ce454af1fd2c93b01 /src/qml/parser/qqmljs.g | |
| parent | 2248ee16e0f143221803e644d2c4c5ac47a72d63 (diff) | |
Clean up property attributes (1/2)
Instead of directly accessing the attribute related members of
UiPublicMember, we access them via a function.
Moreover, we remove some redundancy: A property is
readonly/default/required if and only if the corresponding token is
valid. Thus we can drop the boolean members.
Change-Id: I22f15b2b037e857d2f9d3167cb761cba9516a135
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/parser/qqmljs.g')
| -rw-r--r-- | src/qml/parser/qqmljs.g | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index 8ce3d8cb1c..c3ceeb24b3 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -1315,8 +1315,7 @@ UiObjectMember: T_READONLY UiObjectMemberListPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isReadonlyMember = true; - node->readonlyToken = loc(1); + node->m_readonlyToken = loc(1); sym(1).Node = node; } break; ./ @@ -1340,8 +1339,7 @@ UiObjectMember: T_DEFAULT UiObjectMemberPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isDefaultMember = true; - node->defaultToken = loc(1); + node->m_defaultToken = loc(1); sym(1).Node = node; } break; ./ @@ -1351,8 +1349,7 @@ UiObjectMember: T_REQUIRED UiObjectMemberListPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isRequired = true; - node->requiredToken = loc(1); + node->m_requiredToken = loc(1); sym(1).Node = node; } break; ./ @@ -1361,10 +1358,8 @@ UiObjectMember: T_DEFAULT T_REQUIRED UiObjectMemberListPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(3).UiPublicMember; - node->isRequired = true; - node->requiredToken = loc(2); - node->isDefaultMember = true; - node->defaultToken = loc(1); + node->m_requiredToken = loc(2); + node->m_defaultToken = loc(1); sym(1).Node = node; } break; ./ @@ -1373,10 +1368,8 @@ UiObjectMember: T_REQUIRED T_DEFAULT UiObjectMemberListPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(3).UiPublicMember; - node->isRequired = true; - node->requiredToken = loc(1); - node->isDefaultMember = true; - node->defaultToken = loc(2); + node->m_requiredToken = loc(1); + node->m_defaultToken = loc(2); sym(1).Node = node; } break; ./ @@ -1385,8 +1378,7 @@ UiObjectMember: T_DEFAULT UiObjectMemberListPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isDefaultMember = true; - node->defaultToken = loc(1); + node->m_defaultToken = loc(1); sym(1).Node = node; } break; ./ @@ -1395,10 +1387,8 @@ UiObjectMember: T_DEFAULT T_REQUIRED UiObjectMemberPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(3).UiPublicMember; - node->isDefaultMember = true; - node->defaultToken = loc(1); - node->isRequired = true; - node->requiredToken = loc(2); + node->m_defaultToken = loc(1); + node->m_requiredToken = loc(2); sym(1).Node = node; } break; ./ @@ -1408,10 +1398,8 @@ UiObjectMember: T_REQUIRED T_DEFAULT UiObjectMemberPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(3).UiPublicMember; - node->isDefaultMember = true; - node->defaultToken = loc(2); - node->isRequired = true; - node->requiredToken = loc(1); + node->m_defaultToken = loc(2); + node->m_requiredToken = loc(1); sym(1).Node = node; } break; ./ @@ -1438,8 +1426,7 @@ UiObjectMember: T_REQUIRED UiObjectMemberPropertyNoInitialiser; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->requiredToken = loc(1); - node->isRequired = true; + node->m_requiredToken = loc(1); sym(1).Node = node; } break; ./ @@ -1462,8 +1449,7 @@ UiObjectMember: T_READONLY UiObjectMemberWithScriptStatement; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isReadonlyMember = true; - node->readonlyToken = loc(1); + node->m_readonlyToken = loc(1); sym(1).Node = node; } break; ./ @@ -1472,8 +1458,7 @@ UiObjectMember: T_DEFAULT UiObjectMemberWithScriptStatement; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isDefaultMember = true; - node->defaultToken = loc(1); + node->m_defaultToken = loc(1); sym(1).Node = node; } break; ./ @@ -1510,8 +1495,7 @@ UiObjectMember: T_READONLY UiObjectMemberWithArray; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isReadonlyMember = true; - node->readonlyToken = loc(1); + node->m_readonlyToken = loc(1); sym(1).Node = node; } break; ./ @@ -1545,8 +1529,7 @@ UiObjectMember: T_READONLY UiObjectMemberExpressionStatementLookahead; /. case $rule_number: { AST::UiPublicMember *node = sym(2).UiPublicMember; - node->isReadonlyMember = true; - node->readonlyToken = loc(1); + node->m_readonlyToken = loc(1); sym(1).Node = node; } break; ./ |