fix: redefine family in flatten mode
This commit is contained in:
parent
00f29c37c4
commit
3b0130420d
13 changed files with 42 additions and 3 deletions
|
|
@ -391,7 +391,7 @@ class ParserVariable:
|
|||
) -> None:
|
||||
"""Parse a family"""
|
||||
if obj is None:
|
||||
return
|
||||
obj = {}
|
||||
family_obj = {}
|
||||
subfamily_obj = {}
|
||||
if version != "1.0":
|
||||
|
|
@ -406,6 +406,9 @@ class ParserVariable:
|
|||
family_obj[key] = value
|
||||
else:
|
||||
subfamily_obj[key] = value
|
||||
if version != "1.0" and not family_obj and comment:
|
||||
family_obj["description"] = comment
|
||||
|
||||
if path in self.paths:
|
||||
# it's just for modify subfamily or subvariable, do not redefine
|
||||
if family_obj:
|
||||
|
|
@ -472,8 +475,6 @@ class ParserVariable:
|
|||
msg = f'dynamic family name must have "{{{{ identifier }}}}" in his name for "{path}"'
|
||||
raise DictConsistencyError(msg, 13, [filename])
|
||||
parent_dynamic = path
|
||||
if version != "1.0" and not family_obj and comment:
|
||||
family_obj["description"] = comment
|
||||
self.add_family(
|
||||
path,
|
||||
name,
|
||||
|
|
|
|||
0
tests/errors/10_family_redefine_1/errno_32
Normal file
0
tests/errors/10_family_redefine_1/errno_32
Normal file
6
tests/errors/10_family_redefine_1/rougail/00-rougail.yml
Normal file
6
tests/errors/10_family_redefine_1/rougail/00-rougail.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
family:
|
||||
|
||||
var:
|
||||
5
tests/errors/10_family_redefine_1/rougail/10-rougail.yml
Normal file
5
tests/errors/10_family_redefine_1/rougail/10-rougail.yml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
family:
|
||||
description: redefined
|
||||
0
tests/errors/10_family_redefine_2/errno_32
Normal file
0
tests/errors/10_family_redefine_2/errno_32
Normal file
6
tests/errors/10_family_redefine_2/rougail/00-rougail.yml
Normal file
6
tests/errors/10_family_redefine_2/rougail/00-rougail.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
family:
|
||||
|
||||
var:
|
||||
4
tests/errors/10_family_redefine_2/rougail/10-rougail.yml
Normal file
4
tests/errors/10_family_redefine_2/rougail/10-rougail.yml
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
family: # redefined
|
||||
0
tests/errors/10_variable_redefine_1/errno_45
Normal file
0
tests/errors/10_variable_redefine_1/errno_45
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
variable:
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
variable:
|
||||
description: redefined
|
||||
0
tests/errors/10_variable_redefine_2/errno_45
Normal file
0
tests/errors/10_variable_redefine_2/errno_45
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
variable:
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
variable: # redefined
|
||||
Loading…
Reference in a new issue