Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Anders Blomdell
pluto
Commits
2919dc96
Commit
2919dc96
authored
Apr 28, 2020
by
Anders Blomdell
Browse files
Merge branch 'master' of gitlab.control.lth.se:anders_blomdell/pluto
parents
27a0d15b
1511ec03
Changes
1
Hide whitespace changes
Inline
Side-by-side
robotlab_safety/pluto_auto.py
View file @
2919dc96
...
...
@@ -24,6 +24,13 @@ class PlutoVariables:
rh
=
[
m
.
group
(
3
).
format
(
v
,
pluto
=
self
.
by_name
[
v
][
0
])
for
v
in
self
.
by_name
if
re
.
match
(
regexp
,
v
)]
return
(
"%s=%s"
%
(
lh
,
'*'
.
join
(
rh
)))
m
=
re
.
match
(
'([^=]+)=OR\{(.*),(.*)\}'
,
expr
)
if
m
:
lh
=
m
.
group
(
1
)
regexp
=
m
.
group
(
2
).
replace
(
'*'
,
'.*'
)
rh
=
[
m
.
group
(
3
).
format
(
v
,
pluto
=
self
.
by_name
[
v
][
0
])
for
v
in
self
.
by_name
if
re
.
match
(
regexp
,
v
)]
return
(
"%s=%s"
%
(
lh
,
'+'
.
join
(
rh
)))
raise
Exception
(
'Invalid expression'
,
expr
)
...
...
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