github/open62541
7
0
Fork 0
mirror of https://github.com/open62541/open62541.git synced 2025-06-03 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nc): Inherit the valueRank correctly

Browse Source
This commit is contained in:
Noel Graf 2021-11-01 13:17:00 +01:00 committed by Julius Pfrommer
parent 0b3fde00c3
commit 1e020024e8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
View File

@ -109,9 +109,7 @@ START_TEST(readValueRank) {
UA_Variant dims;
// scalar
UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &rank);
ck_assert_int_eq(rank, -1);
UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &rank);
ck_assert_int_eq(rank, -1);
ck_assert_int_eq(rank, -2);
UA_Variant_init(&dims);
UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &dims);
ck_assert_int_eq(dims.arrayLength, 0);

10
tools/nodeset_compiler/backend_open62541_nodes.py
View File

@ -148,11 +148,10 @@ def setNodeValueRankRecursive(node, nodeset):
setNodeValueRankRecursive(typeDefNode, nodeset)
if typeDefNode.valueRank is not None and typeDefNode.valueRank > -1:
if typeDefNode.valueRank is not None:
node.valueRank = typeDefNode.valueRank
else:
# Default value
node.valueRank = -1
raise RuntimeError("Node {}: the ValueRank of the parent node is None.".format(str(node.id)))
else:
if node.parent is None:
raise RuntimeError("Node {}: does not have a parent. Probably the parent node was blacklisted?".format(str(node.id)))
@ -161,11 +160,10 @@ def setNodeValueRankRecursive(node, nodeset):
setNodeValueRankRecursive(node.parent, nodeset)
if node.parent.valueRank is not None and node.parent.valueRank > -1:
if node.parent.valueRank is not None:
node.valueRank = node.parent.valueRank
else:
# Default value
node.valueRank = -1
raise RuntimeError("Node {}: the ValueRank of the parent node is None.".format(str(node.id)))
def generateCommonVariableCode(node, nodeset):