Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
6f9d44e2
Commit
6f9d44e2
authored
Mar 31, 2018
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for Parameters to Coordinator + tests
parent
3ffe489a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
2 deletions
+44
-2
src/main/java/de/monticore/lang/monticar/generator/middleware/MiddlewareGenerator.java
...ng/monticar/generator/middleware/MiddlewareGenerator.java
+7
-1
src/main/resources/de/monticore/lang/monticar/generator/middleware/coordinatorTemplate.ftl
...ang/monticar/generator/middleware/coordinatorTemplate.ftl
+1
-1
src/test/java/de/monticore/lang/monticar/generator/middleware/GenerationTest.java
...re/lang/monticar/generator/middleware/GenerationTest.java
+14
-0
src/test/resources/tests/dist/ParameterInit.emam
src/test/resources/tests/dist/ParameterInit.emam
+22
-0
No files found.
src/main/java/de/monticore/lang/monticar/generator/middleware/MiddlewareGenerator.java
View file @
6f9d44e2
...
...
@@ -2,6 +2,7 @@ package de.monticore.lang.monticar.generator.middleware;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ExpandedComponentInstanceSymbol
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
de.monticore.lang.monticar.generator.cpp.converter.ComponentConverter
;
import
de.monticore.lang.monticar.generator.middleware.helpers.FileHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.NameHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.TemplateHelper
;
...
...
@@ -59,10 +60,15 @@ public class MiddlewareGenerator extends CMakeGenerator {
.
map
(
fn
->
" adapters.push_back(new "
+
fn
+
"());"
)
.
collect
(
Collectors
.
joining
(
"\n"
));
String
initParams
=
componentInstanceSymbol
.
getArguments
().
stream
()
.
map
(
ComponentConverter:
:
getExpressionParameterConversion
)
.
collect
(
Collectors
.
joining
(
","
));
String
content
=
TemplateHelper
.
getCoordinatorTemplate
()
.
replace
(
"${compName}"
,
name
)
.
replace
(
"${includes}"
,
includes
)
.
replace
(
"${addAdapters}"
,
addAdapters
);
.
replace
(
"${addAdapters}"
,
addAdapters
)
.
replace
(
"${initParams}"
,
initParams
);
FileContent
res
=
new
FileContent
();
...
...
src/main/resources/de/monticore/lang/monticar/generator/middleware/coordinatorTemplate.ftl
View file @
6f9d44e2
...
...
@@ -44,7 +44,7 @@ int main(int argc, char* argv[])
atomic<bool> done(false);
${compName} comp;
comp.init();
comp.init(
${initParams}
);
list<IAdapter_${compName}*> adapters;
${addAdapters}
...
...
src/test/java/de/monticore/lang/monticar/generator/middleware/GenerationTest.java
View file @
6f9d44e2
...
...
@@ -189,6 +189,20 @@ public class GenerationTest extends AbstractSymtabTest {
}
}
@Test
public
void
testParameterInit
()
throws
IOException
{
TaggingResolver
taggingResolver
=
createSymTabAndTaggingResolver
(
"src/test/resources/"
);
RosToEmamTagSchema
.
registerTagTypes
(
taggingResolver
);
ExpandedComponentInstanceSymbol
componentInstanceSymbol
=
taggingResolver
.<
ExpandedComponentInstanceSymbol
>
resolve
(
"tests.dist.parameterInit"
,
ExpandedComponentInstanceSymbol
.
KIND
).
orElse
(
null
);
assertNotNull
(
componentInstanceSymbol
);
DistributedTargetGenerator
distributedTargetGenerator
=
new
DistributedTargetGenerator
();
distributedTargetGenerator
.
setGenerationTargetPath
(
"./target/generated-sources-cmake/paramInit/src/"
);
distributedTargetGenerator
.
add
(
new
CPPGenImpl
(),
"cpp"
);
distributedTargetGenerator
.
generate
(
componentInstanceSymbol
,
taggingResolver
);
}
@Ignore
@Test
public
void
testsStreamTest
()
throws
IOException
{
...
...
src/test/resources/tests/dist/ParameterInit.emam
0 → 100644
View file @
6f9d44e2
package
tests
.
dist
;
component
ParameterInit
{
component
NoParamComp
{
}
component
ParamComp
(
Q
param
){
}
component
ParamCompMulti
(
Q
param1
,
Q
param2
,
Q
param3
){
}
instance
NoParamComp
noParamComp
;
instance
ParamComp
(
1.0
)
paramComp1
;
instance
ParamComp
(
2.0
)
paramComp2
;
instance
ParamCompMulti
(
1
,
2
,
3
)
paramComp3
;
instance
ParamCompMulti
(
4
,
5
,
6
)
paramComp4
;
}
\ No newline at end of file
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