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
3ffe489a
Commit
3ffe489a
authored
Mar 16, 2018
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: generated files for instance arrays had [ and ] in name
parent
2046703d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
17 deletions
+30
-17
src/main/java/de/monticore/lang/monticar/generator/middleware/DistributedTargetGenerator.java
...icar/generator/middleware/DistributedTargetGenerator.java
+6
-7
src/main/java/de/monticore/lang/monticar/generator/middleware/MiddlewareGenerator.java
...ng/monticar/generator/middleware/MiddlewareGenerator.java
+4
-4
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/NameHelper.java
...ang/monticar/generator/middleware/helpers/NameHelper.java
+14
-0
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/RosHelper.java
...lang/monticar/generator/middleware/helpers/RosHelper.java
+1
-1
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/CPPGenImpl.java
.../lang/monticar/generator/middleware/impls/CPPGenImpl.java
+2
-2
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/DummyMiddlewareGenImpl.java
...ar/generator/middleware/impls/DummyMiddlewareGenImpl.java
+3
-3
No files found.
src/main/java/de/monticore/lang/monticar/generator/middleware/DistributedTargetGenerator.java
View file @
3ffe489a
...
...
@@ -2,10 +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.middleware.helpers.ClusterHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.FileHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.RosHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.TemplateHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.*
;
import
de.monticore.lang.monticar.generator.middleware.impls.GeneratorImpl
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
org.apache.commons.io.FileUtils
;
...
...
@@ -35,10 +32,12 @@ public class DistributedTargetGenerator extends CMakeGenerator {
List
<
ExpandedComponentInstanceSymbol
>
clusterSubcomponents
=
ClusterHelper
.
getClusterSubcomponents
(
componentInstanceSymbol
);
if
(
clusterSubcomponents
.
size
()
>
0
)
{
clusterSubcomponents
.
forEach
(
clusterECIS
->
{
generatorMap
.
put
(
clusterECIS
,
createFullGenerator
(
clusterECIS
.
getFullName
().
replace
(
"."
,
"_"
)));
String
nameTargetLanguage
=
NameHelper
.
getNameTargetLanguage
(
clusterECIS
.
getFullName
());
generatorMap
.
put
(
clusterECIS
,
createFullGenerator
(
nameTargetLanguage
));
});
}
else
{
generatorMap
.
put
(
componentInstanceSymbol
,
createFullGenerator
(
componentInstanceSymbol
.
getFullName
().
replace
(
"."
,
"_"
)));
String
nameTargetLanguage
=
NameHelper
.
getNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
generatorMap
.
put
(
componentInstanceSymbol
,
createFullGenerator
(
nameTargetLanguage
));
}
List
<
File
>
files
=
new
ArrayList
<>();
...
...
@@ -46,7 +45,7 @@ public class DistributedTargetGenerator extends CMakeGenerator {
for
(
ExpandedComponentInstanceSymbol
comp
:
generatorMap
.
keySet
())
{
files
.
addAll
(
generatorMap
.
get
(
comp
).
generate
(
comp
,
taggingResolver
));
//add empty generator to subDirs so that CMakeLists.txt will be generated correctly
subDirs
.
add
(
comp
.
getFullName
().
replace
(
"."
,
"_"
));
subDirs
.
add
(
NameHelper
.
getNameTargetLanguage
(
comp
.
getFullName
()
));
}
subDirs
.
add
(
"rosMsg"
);
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/MiddlewareGenerator.java
View file @
3ffe489a
...
...
@@ -3,9 +3,9 @@ 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.middleware.helpers.FileHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.NameHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.TemplateHelper
;
import
de.monticore.lang.monticar.generator.middleware.impls.GeneratorImpl
;
import
de.monticore.lang.monticar.generator.roscpp.helper.NameHelper
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
java.io.File
;
...
...
@@ -31,7 +31,7 @@ public class MiddlewareGenerator extends CMakeGenerator {
private
FileContent
generateIAdapter
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
)
{
FileContent
res
=
new
FileContent
();
String
name
=
NameHelper
.
get
Component
NameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
name
=
NameHelper
.
getNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
res
.
setFileName
(
"IAdapter_"
+
name
+
".h"
);
res
.
setFileContent
(
TemplateHelper
.
getIAdapterTemplate
().
replace
(
"${compName}"
,
name
));
return
res
;
...
...
@@ -41,7 +41,7 @@ public class MiddlewareGenerator extends CMakeGenerator {
private
FileContent
generateCoordinator
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
,
List
<
File
>
files
)
{
String
name
=
NameHelper
.
get
Component
NameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
name
=
NameHelper
.
getNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
List
<
String
>
filesNames
=
files
.
stream
()
.
map
(
File:
:
getName
)
.
collect
(
Collectors
.
toList
());
...
...
@@ -74,7 +74,7 @@ public class MiddlewareGenerator extends CMakeGenerator {
private
FileContent
generateCoordinatorCMakeList
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
,
List
<
File
>
files
)
{
FileContent
res
=
new
FileContent
();
String
name
=
NameHelper
.
get
Component
NameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
name
=
NameHelper
.
getNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
targets
=
files
.
stream
()
.
map
(
File:
:
getName
)
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/NameHelper.java
0 → 100644
View file @
3ffe489a
package
de.monticore.lang.monticar.generator.middleware.helpers
;
public
class
NameHelper
{
private
NameHelper
(){
}
public
static
String
getNameTargetLanguage
(
String
name
){
return
name
.
replace
(
'.'
,
'_'
)
.
replace
(
'['
,
'_'
)
.
replace
(
']'
,
'_'
);
}
}
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/RosHelper.java
View file @
3ffe489a
...
...
@@ -53,7 +53,7 @@ public class RosHelper {
}
//target port name is unique: each in port can only have one connection!
String
topicName
=
connectorSymbol
.
getTargetPort
().
getFullName
().
replace
(
"."
,
"_"
).
replace
(
"["
,
"_"
).
replace
(
"]"
,
"_"
);
String
topicName
=
NameHelper
.
getNameTargetLanguage
(
connectorSymbol
.
getTargetPort
().
getFullName
()
);
RosMsg
rosTypeA
=
GeneratorRosMsg
.
getRosType
(
"struct_msgs"
,
connectorSymbol
.
getTargetPort
().
getTypeReference
());
RosMsg
rosTypeB
=
GeneratorRosMsg
.
getRosType
(
"struct_msgs"
,
connectorSymbol
.
getSourcePort
().
getTypeReference
());
if
(!
rosTypeA
.
equals
(
rosTypeB
))
{
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/CPPGenImpl.java
View file @
3ffe489a
...
...
@@ -3,8 +3,8 @@ package de.monticore.lang.monticar.generator.middleware.impls;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ExpandedComponentInstanceSymbol
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
de.monticore.lang.monticar.generator.cpp.GeneratorCPP
;
import
de.monticore.lang.monticar.generator.middleware.helpers.NameHelper
;
import
de.monticore.lang.monticar.generator.middleware.helpers.TemplateHelper
;
import
de.monticore.lang.monticar.generator.roscpp.helper.NameHelper
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
java.io.File
;
...
...
@@ -38,7 +38,7 @@ public class CPPGenImpl implements GeneratorImpl {
private
FileContent
generateCMake
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
)
{
FileContent
cmake
=
new
FileContent
();
cmake
.
setFileName
(
"CMakeLists.txt"
);
String
name
=
NameHelper
.
get
Component
NameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
name
=
NameHelper
.
getNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
cmake
.
setFileContent
(
TemplateHelper
.
getCmakeCppTemplate
().
replace
(
"${compName}"
,
name
));
return
cmake
;
}
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/impls/DummyMiddlewareGenImpl.java
View file @
3ffe489a
...
...
@@ -4,8 +4,8 @@ import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.Expanded
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.PortSymbol
;
import
de.monticore.lang.monticar.generator.FileContent
;
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
;
import
de.monticore.lang.monticar.generator.roscpp.helper.NameHelper
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
java.io.File
;
...
...
@@ -29,7 +29,7 @@ public class DummyMiddlewareGenImpl implements GeneratorImpl {
private
FileContent
generateAdapter
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
)
{
String
name
=
NameHelper
.
get
Component
NameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
name
=
NameHelper
.
getNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
content
=
TemplateHelper
.
getDummyAdapterTemplate
()
.
replace
(
"${compName}"
,
name
);
...
...
@@ -56,7 +56,7 @@ public class DummyMiddlewareGenImpl implements GeneratorImpl {
private
FileContent
generateCMake
(
ExpandedComponentInstanceSymbol
componentInstanceSymbol
)
{
FileContent
res
=
new
FileContent
();
String
name
=
NameHelper
.
get
Component
NameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
name
=
NameHelper
.
getNameTargetLanguage
(
componentInstanceSymbol
.
getFullName
());
String
content
=
TemplateHelper
.
getDummyCmakeTemplate
()
.
replace
(
"${compName}"
,
name
);
...
...
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