Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vecs
FIJI Public
Commits
ab15755b
Commit
ab15755b
authored
Aug 16, 2017
by
Stefan Tauner
Browse files
Settings: use existing dep_ref parameter instead of determing its value again
parent
3f1749ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
bin/FIJI/Settings.pm
View file @
ab15755b
...
...
@@ -559,11 +559,6 @@ sub validate_value {
if
(
defined
(
$map_ref
->
{
$k
}
->
{'
type
'}))
{
my
$orig
=
$
{
$v_ref
};
# @FIXME: check if the constant is depending on another constant, that needs to be enabled.
# my $dependency = @{$map_ref->{$k}->{'depends_on'}};
# if (defined($dependency) && defined(@{$map_ref->{$dependency}->{'value'}}
# }
if
(
$map_ref
->
{
$k
}
->
{'
type
'}
eq
'
net
')
{
return
"
Netlist not available
"
if
!
defined
(
$nl_ref
);
...
...
@@ -636,11 +631,6 @@ sub validate_value {
if
(
defined
(
$map_ref
->
{
$k
}
->
{'
values
'}))
{
my
$values_ref
=
$map_ref
->
{
$k
}
->
{'
values
'};
my
$dep_val
;
if
(
defined
(
$map_ref
->
{
$k
}
->
{'
depends_on
'}))
{
$dep_val
=
$consts_ref
->
{
$map_ref
->
{
$k
}
->
{'
depends_on
'}};
}
if
(
ref
(
$values_ref
)
eq
'
ARRAY
')
{
# Look for given value in allowed values
...
...
@@ -648,7 +638,7 @@ sub validate_value {
return
"
${
$
v_ref}
is not allowed. Allowed values are:
"
.
join
("
,
",
@
{
$map_ref
->
{
$k
}
->
{'
values
'}});
}
}
elsif
(
ref
(
$values_ref
)
eq
'
CODE
')
{
if
(
!
$values_ref
->
(
$
{
$v_ref
},
$consts_ref
->
{
$k
},
$dep_
val
))
{
if
(
!
$values_ref
->
(
$
{
$v_ref
},
$consts_ref
->
{
$k
},
$map_ref
,
$consts_ref
,
$
$dep_
ref
))
{
return
"
${
$
v_ref}
is not allowed
";
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment