Infra/rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

frozen_if_ => hidden_if_

Browse Source
This commit is contained in:
Emmanuel Garette
2020-07-07 18:33:19 +02:00
parent ef948fa109
commit b12bf443a6
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/rougail/annotator.py
View File

@ -287,7 +287,7 @@ class SpaceAnnotator(object):
else:
self.eosfunc = None
if HIGH_COMPATIBILITY:
self.has_frozen_if_in_condition = []
self.has_hidden_if_in_condition = []
self.convert_variable()
self.convert_auto_freeze()
self.convert_groups()
@ -539,7 +539,7 @@ class SpaceAnnotator(object):
for variable in family.variable.values():
if variable.auto_freeze:
new_condition = self.objectspace.condition()
new_condition.name = 'auto_frozen_if_in'
new_condition.name = 'auto_hidden_if_in'
new_condition.namespace = variables.name
new_condition.source = FREEZE_AUTOFREEZE_VARIABLE
new_param = self.objectspace.param()
@ -994,7 +994,7 @@ class SpaceAnnotator(object):
variable.disabled = True
if condition.name in ['mandatory_if_in']:
variable.mandatory = True
if condition.name in ['frozen_if_in', 'frozen_if_not_in']:
if condition.name in ['hidden_if_in', 'hidden_if_not_in']:
variable.hidden = False
if HIGH_COMPATIBILITY:
fallback_variables.append(name)
@ -1014,7 +1014,7 @@ class SpaceAnnotator(object):
variable.disabled = True
if condition.name in ['mandatory_if_in']:
variable.mandatory = True
if condition.name in ['frozen_if_in', 'frozen_if_not_in']:
if condition.name in ['hidden_if_in', 'hidden_if_not_in']:
variable.hidden = False
fallback_lists.append(listvar)
remove_conditions.append(idx)
@ -1063,8 +1063,8 @@ class SpaceAnnotator(object):
# elif condition.name == 'hidden_if_not_in':
# condition.name = 'disabled_if_not_in'
for condition in self.space.constraints.condition:
if condition.name not in ['disabled_if_in', 'disabled_if_not_in', 'frozen_if_in', 'auto_frozen_if_in',
'frozen_if_not_in', 'mandatory_if_in', 'mandatory_if_not_in']:
if condition.name not in ['disabled_if_in', 'disabled_if_not_in', 'hidden_if_in', 'auto_hidden_if_in',
'hidden_if_not_in', 'mandatory_if_in', 'mandatory_if_not_in']:
raise CreoleDictConsistencyError(_('unknown condition {}').format(condition.name))
def check_params(self):
@ -1109,7 +1109,7 @@ class SpaceAnnotator(object):
variable.disabled = True
force_remove_targets.setdefault(condition.name,
[]).append(target.name)
elif condition.name == 'frozen_if_not_in':
elif condition.name == 'hidden_if_not_in':
variable.hidden = True
force_remove_targets.setdefault(condition.name,
[]).append(target.name)
@ -1141,13 +1141,13 @@ class SpaceAnnotator(object):
if name in fallback_variables:
remove_targets.append(target_idx)
continue
if condition.name in ['frozen_if_in', 'frozen_if_not_in']:
if condition.name in ['hidden_if_in', 'hidden_if_not_in']:
variable.hidden = False
if condition.name in ['mandatory_if_in', 'mandatory_if_not_in']:
variable.mandatory = False
if HIGH_COMPATIBILITY and condition.name in ['frozen_if_in',
'frozen_if_not_in']:
self.has_frozen_if_in_condition.append(name)
if HIGH_COMPATIBILITY and condition.name in ['hidden_if_in',
'hidden_if_not_in']:
self.has_hidden_if_in_condition.append(name)
if condition.name in ['mandatory_if_in', 'mandatory_if_not_in']:
self.force_not_mandatory.append(target.name)
@ -1189,10 +1189,10 @@ class SpaceAnnotator(object):
elif condition.name == 'disabled_if_not_in':
actions = ['disabled']
inverse = True
elif condition.name == 'frozen_if_in':
elif condition.name == 'hidden_if_in':
actions = ['frozen', 'hidden', 'force_default_on_freeze']
inverse = False
elif condition.name == 'frozen_if_not_in':
elif condition.name == 'hidden_if_not_in':
actions = ['frozen', 'hidden', 'force_default_on_freeze']
inverse = True
elif condition.name == 'mandatory_if_in':
@ -1201,7 +1201,7 @@ class SpaceAnnotator(object):
elif condition.name == 'mandatory_if_not_in':
actions = ['mandatory']
inverse = True
elif condition.name == 'auto_frozen_if_in':
elif condition.name == 'auto_hidden_if_in':
actions = ['auto_frozen']
inverse = True
for param in condition.param: