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
openmole
openmole
Commits
0271fa41
Commit
0271fa41
authored
Jun 30, 2019
by
Romain Reuillon
Browse files
[Core] fix: only delegate the delegate part of a composed dsl container
parent
f24a77db
Changes
2
Hide whitespace changes
Inline
Side-by-side
openmole/core/org.openmole.core.workflow/src/main/scala/org/openmole/core/workflow/composition/package.scala
View file @
0271fa41
...
@@ -214,6 +214,12 @@ package composition {
...
@@ -214,6 +214,12 @@ package composition {
case
TaskNodeDSL
(
n
)
⇒
Vector
(
n
)
case
TaskNodeDSL
(
n
)
⇒
Vector
(
n
)
}
}
def
delegate
(
t
:
DSL
)
=
t
match
{
case
c
:
DSLContainer
[
_
]
⇒
c
.
delegate
case
t
⇒
tasks
(
t
).
map
(
_
.
task
)
}
}
}
/* -------------------- Transition DSL ---------------------- */
/* -------------------- Transition DSL ---------------------- */
...
...
openmole/plugins/org.openmole.plugin.tool.pattern/src/main/scala/org/openmole/plugin/tool/pattern/package.scala
View file @
0271fa41
...
@@ -31,7 +31,7 @@ package object pattern {
...
@@ -31,7 +31,7 @@ package object pattern {
val
firstEvaluation
=
EmptyTask
()
set
((
inputs
,
outputs
)
+=
(
inputVals
:
_
*
))
val
firstEvaluation
=
EmptyTask
()
set
((
inputs
,
outputs
)
+=
(
inputVals
:
_
*
))
val
lastEvaluation
=
EmptyTask
()
set
((
inputs
,
outputs
)
+=
(
outputVals
:
_
*
))
val
lastEvaluation
=
EmptyTask
()
set
((
inputs
,
outputs
)
+=
(
outputVals
:
_
*
))
val
puzzle
=
Strain
(
firstEvaluation
)
--
Capsule
(
evaluation
)
--
lastEvaluation
val
puzzle
=
Strain
(
firstEvaluation
)
--
Capsule
(
evaluation
)
--
lastEvaluation
DSLContainer
(
puzzle
,
delegate
=
DSL
.
tasks
(
evaluation
)
.
map
(
_
.
task
)
)
DSLContainer
(
puzzle
,
delegate
=
DSL
.
delegate
(
evaluation
))
}
}
}
}
Write
Preview
Supports
Markdown
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