Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EmbeddedMontiArc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
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
languages
EmbeddedMontiArc
Commits
8d982b24
Commit
8d982b24
authored
Sep 11, 2018
by
Ferdinand Alexander Mehlan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
major changes according to new specification
parent
bd9d7783
Pipeline
#72694
failed with stage
in 2 minutes and 5 seconds
Changes
85
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
85 changed files
with
1490 additions
and
329 deletions
+1490
-329
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ComponentWithTypeParametersHasInstance.java
...ontiarc/cocos/ComponentWithTypeParametersHasInstance.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ReferencedSubComponentExists.java
.../embeddedmontiarc/cocos/ReferencedSubComponentExists.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/SimpleConnectorSourceExists.java
...g/embeddedmontiarc/cocos/SimpleConnectorSourceExists.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/SubComponentsConnected.java
...e/lang/embeddedmontiarc/cocos/SubComponentsConnected.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcLanguage.java
...beddedmontiarc/_symboltable/EmbeddedMontiArcLanguage.java
+2
-2
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcModelNameCalculator.java
...arc/_symboltable/EmbeddedMontiArcModelNameCalculator.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcSymbolTableCreator.java
...iarc/_symboltable/EmbeddedMontiArcSymbolTableCreator.java
+2
-3
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcSymbolTableHelper.java
...tiarc/_symboltable/EmbeddedMontiArcSymbolTableHelper.java
+2
-2
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/CnCModelSymbol.java
...mbeddedmontiarc/_symboltable/cncModel/CnCModelSymbol.java
+29
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentInstantiationSymbol.java
...c/_symboltable/cncModel/ComponentInstantiationSymbol.java
+66
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentInterfaceSymbol.java
...tiarc/_symboltable/cncModel/ComponentInterfaceSymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentSymbol.java
...beddedmontiarc/_symboltable/cncModel/ComponentSymbol.java
+53
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentTypeSymbol.java
...edmontiarc/_symboltable/cncModel/ComponentTypeSymbol.java
+10
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ConnectorSymbol.java
...beddedmontiarc/_symboltable/cncModel/ConnectorSymbol.java
+56
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAComponentInstantiationSymbolOld.java
...boltable/cncModel/EMAComponentInstantiationSymbolOld.java
+14
-11
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAComponentSymbolOld.java
...montiarc/_symboltable/cncModel/EMAComponentSymbolOld.java
+13
-14
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAComponentSymbolReference.java
...rc/_symboltable/cncModel/EMAComponentSymbolReference.java
+0
-214
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAConnectorSymbol.java
...dedmontiarc/_symboltable/cncModel/EMAConnectorSymbol.java
+2
-1
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAPortInstantiationSymbol.java
...arc/_symboltable/cncModel/EMAPortInstantiationSymbol.java
+61
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAPortSymbolOld.java
...eddedmontiarc/_symboltable/cncModel/EMAPortSymbolOld.java
+13
-11
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EffectorSymbol.java
...mbeddedmontiarc/_symboltable/cncModel/EffectorSymbol.java
+54
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/PortInstantiationSymbol.java
...ntiarc/_symboltable/cncModel/PortInstantiationSymbol.java
+50
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/PortSymbol.java
...rc/embeddedmontiarc/_symboltable/cncModel/PortSymbol.java
+52
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/RangeSubPortSymbol.java
...dedmontiarc/_symboltable/cncModel/RangeSubPortSymbol.java
+20
-17
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/TypeSymbol.java
...rc/embeddedmontiarc/_symboltable/cncModel/TypeSymbol.java
+4
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/EnumParameterBindingSymbol.java
...ltable/cncModel/parameter/EnumParameterBindingSymbol.java
+23
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/EnumTypeParameterSymbol.java
...mboltable/cncModel/parameter/EnumTypeParameterSymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/GeneralParameterBindingSymbol.java
...ble/cncModel/parameter/GeneralParameterBindingSymbol.java
+22
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/GeneralTypeParameterSymbol.java
...ltable/cncModel/parameter/GeneralTypeParameterSymbol.java
+20
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/MatrixParameterBindingSymbol.java
...able/cncModel/parameter/MatrixParameterBindingSymbol.java
+22
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/MatrixParameterSymbol.java
...symboltable/cncModel/parameter/MatrixParameterSymbol.java
+34
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/NumericTypeParameterBindingSymbol.java
...cncModel/parameter/NumericTypeParameterBindingSymbol.java
+22
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/NumericTypeParameterSymbol.java
...ltable/cncModel/parameter/NumericTypeParameterSymbol.java
+24
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/QuantityParameterBindingSymbol.java
...le/cncModel/parameter/QuantityParameterBindingSymbol.java
+22
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/QuantityParameterSymbol.java
...mboltable/cncModel/parameter/QuantityParameterSymbol.java
+19
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/StructParameterBindingSymbol.java
...able/cncModel/parameter/StructParameterBindingSymbol.java
+23
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/parameter/StructTypeParameterSymbol.java
...oltable/cncModel/parameter/StructTypeParameterSymbol.java
+25
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/AccelerationSymbol.java
...rc/_symboltable/cncModel/quantity/AccelerationSymbol.java
+30
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/AmountOfSubstanceSymbol.java
...ymboltable/cncModel/quantity/AmountOfSubstanceSymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/AngleSymbol.java
...dmontiarc/_symboltable/cncModel/quantity/AngleSymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/AngularAccelerationSymbol.java
...boltable/cncModel/quantity/AngularAccelerationSymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/AngularVelocitySymbol.java
..._symboltable/cncModel/quantity/AngularVelocitySymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/AreaSymbol.java
...edmontiarc/_symboltable/cncModel/quantity/AreaSymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/CatalyticActivitySymbol.java
...ymboltable/cncModel/quantity/CatalyticActivitySymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/DataAmountSymbol.java
...iarc/_symboltable/cncModel/quantity/DataAmountSymbol.java
+28
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/DataRateSymbol.java
...ntiarc/_symboltable/cncModel/quantity/DataRateSymbol.java
+30
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/quantity/DimensionlessSymbol.java
...c/_symboltable/cncModel/quantity/DimensionlessSymbol.java
+32
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/AlgebraicPropertySymbol.java
...c/_symboltable/cncModel/type/AlgebraicPropertySymbol.java
+8
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/BooleanSymbol.java
...dedmontiarc/_symboltable/cncModel/type/BooleanSymbol.java
+10
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/BooleanTypeSymbol.java
...ontiarc/_symboltable/cncModel/type/BooleanTypeSymbol.java
+14
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/EnumItemSymbol.java
...edmontiarc/_symboltable/cncModel/type/EnumItemSymbol.java
+16
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/EnumTypeSymbol.java
...edmontiarc/_symboltable/cncModel/type/EnumTypeSymbol.java
+19
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/MatrixSymbol.java
...ddedmontiarc/_symboltable/cncModel/type/MatrixSymbol.java
+26
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/NaturalNumberSymbol.java
...tiarc/_symboltable/cncModel/type/NaturalNumberSymbol.java
+4
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/NumberSymbol.java
...ddedmontiarc/_symboltable/cncModel/type/NumberSymbol.java
+16
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/NumericTypeSymbol.java
...ontiarc/_symboltable/cncModel/type/NumericTypeSymbol.java
+43
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/ParameterBindingSymbol.java
...rc/_symboltable/cncModel/type/ParameterBindingSymbol.java
+8
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/ParameterSymbol.java
...dmontiarc/_symboltable/cncModel/type/ParameterSymbol.java
+12
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/PositiveNumber.java
...edmontiarc/_symboltable/cncModel/type/PositiveNumber.java
+19
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/PositiveParameterSymbol.java
...c/_symboltable/cncModel/type/PositiveParameterSymbol.java
+12
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/QuantitySymbol.java
...edmontiarc/_symboltable/cncModel/type/QuantitySymbol.java
+14
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/RangeSymbol.java
...eddedmontiarc/_symboltable/cncModel/type/RangeSymbol.java
+25
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/StructSymbol.java
...ddedmontiarc/_symboltable/cncModel/type/StructSymbol.java
+17
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/StructTypeSymbol.java
...montiarc/_symboltable/cncModel/type/StructTypeSymbol.java
+19
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/UnitSymbol.java
...beddedmontiarc/_symboltable/cncModel/type/UnitSymbol.java
+53
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/type/ValueSymbol.java
...eddedmontiarc/_symboltable/cncModel/type/ValueSymbol.java
+6
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAComponentInstanceBuilder.java
...ltable/instanceStructure/EMAComponentInstanceBuilder.java
+2
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAComponentInstanceSymbolCreator.java
.../instanceStructure/EMAComponentInstanceSymbolCreator.java
+1
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAConnectorInstanceSymbol.java
...oltable/instanceStructure/EMAConnectorInstanceSymbol.java
+1
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAPortInstanceSymbol.java
..._symboltable/instanceStructure/EMAPortInstanceSymbol.java
+1
-20
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAPortInstantiationKind.java
...mboltable/instanceStructure/EMAPortInstantiationKind.java
+9
-10
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/InstanceInformation.java
...c/_symboltable/instanceStructure/InstanceInformation.java
+1
-0
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/types/TypesPrinterImpl.java
...ddedmontiarc/embeddedmontiarc/types/TypesPrinterImpl.java
+2
-2
src/main/java/de/monticore/lang/embeddedmontiarc/helper/ConstantPortHelper.java
...core/lang/embeddedmontiarc/helper/ConstantPortHelper.java
+0
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAComponentBuilder.java
...ore/lang/embeddedmontiarc/helper/EMAComponentBuilder.java
+5
-3
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAConnectorBuilder.java
...ore/lang/embeddedmontiarc/helper/EMAConnectorBuilder.java
+3
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAConnectorKind.java
...ticore/lang/embeddedmontiarc/helper/EMAConnectorKind.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAConnectorResolvingFilter.java
.../embeddedmontiarc/helper/EMAConnectorResolvingFilter.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAJavaHelper.java
...monticore/lang/embeddedmontiarc/helper/EMAJavaHelper.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAPortBuilder.java
...onticore/lang/embeddedmontiarc/helper/EMAPortBuilder.java
+2
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAPortHelper.java
...monticore/lang/embeddedmontiarc/helper/EMAPortHelper.java
+6
-3
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMAPortKind.java
...e/monticore/lang/embeddedmontiarc/helper/EMAPortKind.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/EMATypeHelper.java
...monticore/lang/embeddedmontiarc/helper/EMATypeHelper.java
+2
-2
src/main/java/de/monticore/lang/embeddedmontiarc/helper/SymbolPrinter.java
...monticore/lang/embeddedmontiarc/helper/SymbolPrinter.java
+1
-1
src/main/java/de/monticore/lang/embeddedmontiarc/helper/TypeCompatibilityChecker.java
...ang/embeddedmontiarc/helper/TypeCompatibilityChecker.java
+1
-1
No files found.
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ComponentWithTypeParametersHasInstance.java
View file @
8d982b24
...
...
@@ -22,7 +22,7 @@ package de.monticore.lang.embeddedmontiarc.cocos;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
instanceStructure
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
cncModel
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol
;
import
de.se_rwth.commons.logging.Log
;
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ReferencedSubComponentExists.java
View file @
8d982b24
...
...
@@ -49,7 +49,7 @@ public class ReferencedSubComponentExists implements EmbeddedMontiArcASTSubCompo
.<
EMAComponentSymbol
>
resolve
(
referenceName
,
EMAComponentSymbol
.
KIND
);
if
(!
componentSymbol
.
isPresent
())
{
Log
.
error
(
String
.
format
(
"0x069B7 Type \"%s\" could not be resolved"
,
referenceName
),
Log
.
error
(
String
.
format
(
"0x069B7 Type
Symbol
\"%s\" could not be resolved"
,
referenceName
),
node
.
get_SourcePositionStart
());
}
}
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/SimpleConnectorSourceExists.java
View file @
8d982b24
...
...
@@ -26,7 +26,7 @@ import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbolReference
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAConnectorSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
instanceStructure
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
cncModel
.EMAComponentInstantiationSymbol
;
import
de.se_rwth.commons.logging.Log
;
import
java.util.Optional
;
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/cocos/SubComponentsConnected.java
View file @
8d982b24
...
...
@@ -22,7 +22,7 @@ package de.monticore.lang.embeddedmontiarc.cocos;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
instanceStructure
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
cncModel
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAConnectorSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortSymbol
;
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcLanguage.java
View file @
8d982b24
...
...
@@ -21,12 +21,12 @@
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable
;
import
de.monticore.ast.ASTNode
;
import
de.monticore.lang.embeddedmontiarc.
embeddedmontiarc._symboltable.cncModel
.EMAConnectorResolvingFilter
;
import
de.monticore.lang.embeddedmontiarc.
helper
.EMAConnectorResolvingFilter
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAConnectorSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortArraySymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
instanceStructure
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
cncModel
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAConnectorInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAPortInstanceSymbol
;
import
de.monticore.lang.monticar.ts.MCASTTypeSymbol
;
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcModelNameCalculator.java
View file @
8d982b24
...
...
@@ -33,7 +33,7 @@ import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortArraySymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
instanceStructure
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
cncModel
.EMAComponentInstantiationSymbol
;
import
de.monticore.symboltable.SymbolKind
;
import
de.se_rwth.commons.Joiners
;
import
de.se_rwth.commons.Splitters
;
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcSymbolTableCreator.java
View file @
8d982b24
...
...
@@ -31,7 +31,6 @@ import de.monticore.lang.embeddedmontiarc.helper.ArcTypePrinter;
import
de.monticore.lang.embeddedmontiarc.helper.EMAJavaHelper
;
import
de.monticore.lang.monticar.ValueSymbol
;
import
de.monticore.lang.monticar.common2._ast.ASTCommonMatrixType
;
import
de.monticore.lang.monticar.common2._ast.ASTQualifiedNameWithArray
;
import
de.monticore.lang.monticar.resolution._ast.ASTUnitNumberExpression
;
import
de.monticore.lang.monticar.ts.MCTypeSymbol
;
import
de.monticore.lang.monticar.ts.MontiCarSymbolFactory
;
...
...
@@ -49,7 +48,7 @@ import de.se_rwth.commons.logging.Log;
import
java.util.*
;
import
static
de
.
monticore
.
lang
.
embeddedmontiarc
.
embeddedmontiarc
.
_symboltable
.
cncModel
.
EMAPortHelper
.*;
import
static
de
.
monticore
.
lang
.
embeddedmontiarc
.
helper
.
EMAPortHelper
.*;
import
static
de
.
monticore
.
lang
.
embeddedmontiarc
.
helper
.
EMATypeHelper
.
addTypeArgumentsToTypeSymbol
;
import
static
de
.
monticore
.
lang
.
embeddedmontiarc
.
helper
.
EMATypeHelper
.
initTypeRef
;
import
static
de
.
monticore
.
lang
.
embeddedmontiarc
.
embeddedmontiarc
.
_symboltable
.
instanceStructure
.
EMAComponentInstanceSymbolCreator
.
getGlobalScope
;
...
...
@@ -251,7 +250,7 @@ public class EmbeddedMontiArcSymbolTableCreator extends EmbeddedMontiArcSymbolTa
* ArcTypePrinter.printSubComponentName(node); else */
referencedCompName
=
ArcTypePrinter
.
printTypeWithoutTypeArgumentsAndDimension
(
node
.
getType
());
Log
.
debug
(
node
.
getType
().
toString
(),
"Type"
);
Log
.
debug
(
node
.
getType
().
toString
(),
"Type
Symbol
"
);
// String refCompPackage = Names.getQualifier(referencedCompName);
String
simpleCompName
=
Names
.
getSimpleName
(
referencedCompName
);
Log
.
debug
(
referencedCompName
,
"referencedCompName"
);
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcSymbolTableHelper.java
View file @
8d982b24
...
...
@@ -24,8 +24,8 @@ import com.google.common.collect.Lists;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.*
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbolReference
;
import
de.monticore.lang.embeddedmontiarc.
embeddedmontiarc._symboltable.cncModel
.EMAPortHelper
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
instanceStructure
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.
helper
.EMAPortHelper
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
cncModel
.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.InstanceInformation
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.InstancingRegister
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc.types.TypesHelper
;
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/CnCModelSymbol.java
0 → 100644
View file @
8d982b24
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
;
import
de.monticore.symboltable.CommonSymbol
;
import
de.monticore.symboltable.SymbolKind
;
import
java.util.Collections
;
import
java.util.Set
;
public
class
CnCModelSymbol
extends
CommonSymbol
{
public
CnCModelSymbol
(
String
name
,
SymbolKind
kind
)
{
super
(
name
,
kind
);
}
public
ComponentInstantiationSymbol
getMain
()
{
return
null
;
}
public
Set
<
EffectorSymbol
>
getEffectors
()
{
return
Collections
.
emptySet
();
}
public
Set
<
ConnectorSymbol
>
getConnectors
()
{
return
Collections
.
emptySet
();
}
public
Set
<
ComponentSymbol
>
getComponents
()
{
return
Collections
.
emptySet
();
}
}
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentInstantiationSymbol.java
0 → 100644
View file @
8d982b24
/**
*
* ******************************************************************************
* MontiCAR Modeling Family, www.se-rwth.de
* Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
* All rights reserved.
*
* This project is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
;
import
java.util.*
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbolReference
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAConnectorSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.type.NaturalNumberSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.type.ParameterBindingSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationKind
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAElementInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.InstanceInformation
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.InstancingRegister
;
import
de.monticore.lang.embeddedmontiarc.helper.SymbolPrinter
;
import
de.monticore.lang.monticar.ValueSymbol
;
import
de.monticore.symboltable.CommonScopeSpanningSymbol
;
import
de.monticore.symboltable.CommonSymbol
;
import
de.monticore.symboltable.SymbolKind
;
import
de.monticore.symboltable.types.TypeSymbol
;
import
de.monticore.symboltable.types.references.TypeReference
;
/**
* Represents an instance of a component.
*
* @author Robert Heim
*/
public
class
ComponentInstantiationSymbol
extends
CommonSymbol
{
public
static
final
EMAComponentInstantiationKind
KIND
=
EMAComponentInstantiationKind
.
INSTANCE
;
public
ComponentInstantiationSymbol
(
String
name
,
SymbolKind
kind
)
{
super
(
name
,
kind
);
}
public
NaturalNumberSymbol
getDimension
()
{
return
null
;
}
public
Set
<
ParameterBindingSymbol
>
getValues
()
{
return
null
;
}
public
ComponentTypeSymbol
getType
()
{
return
null
;
}
}
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentInterfaceSymbol.java
0 → 100644
View file @
8d982b24
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.type.ParameterSymbol
;
import
de.monticore.symboltable.CommonScopeSpanningSymbol
;
import
de.monticore.symboltable.SymbolKind
;
import
java.util.Set
;
public
class
ComponentInterfaceSymbol
extends
CommonScopeSpanningSymbol
implements
ComponentTypeSymbol
{
public
ComponentInterfaceSymbol
(
String
name
,
SymbolKind
kind
)
{
super
(
name
,
kind
);
}
@Override
public
Set
<
ComponentInstantiationSymbol
>
getImplements
()
{
return
null
;
}
public
Set
<
PortSymbol
>
getPorts
()
{
return
null
;
}
public
Set
<
ParameterSymbol
>
getParameters
()
{
return
null
;
}
}
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentSymbol.java
0 → 100644
View file @
8d982b24
/**
*
* ******************************************************************************
* MontiCAR Modeling Family, www.se-rwth.de
* Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
* All rights reserved.
*
* This project is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.type.ParameterSymbol
;
import
de.monticore.symboltable.CommonScopeSpanningSymbol
;
import
de.monticore.symboltable.SymbolKind
;
import
java.util.Set
;
public
class
ComponentSymbol
extends
CommonScopeSpanningSymbol
implements
ComponentTypeSymbol
{
public
ComponentSymbol
(
String
name
,
SymbolKind
kind
)
{
super
(
name
,
kind
);
}
@Override
public
Set
<
ComponentInstantiationSymbol
>
getImplements
()
{
return
null
;
}
public
Set
<
PortSymbol
>
getPorts
()
{
return
null
;
}
public
Set
<
ParameterSymbol
>
getParameters
()
{
return
null
;
}
public
Set
<
ComponentInstantiationSymbol
>
getSubs
()
{
return
null
;
}
}
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ComponentTypeSymbol.java
0 → 100644
View file @
8d982b24
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
;
import
de.monticore.symboltable.Symbol
;
import
java.util.Set
;
public
interface
ComponentTypeSymbol
extends
Symbol
{
Set
<
ComponentInstantiationSymbol
>
getImplements
();
}
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/ConnectorSymbol.java
0 → 100644
View file @
8d982b24
/**
*
* ******************************************************************************
* MontiCAR Modeling Family, www.se-rwth.de
* Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
* All rights reserved.
*
* This project is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.type.RangeSymbol
;
import
de.monticore.symboltable.CommonSymbol
;
import
de.monticore.symboltable.SymbolKind
;
import
java.util.Optional
;
public
class
ConnectorSymbol
extends
CommonSymbol
{
public
ConnectorSymbol
(
String
name
,
SymbolKind
kind
)
{
super
(
name
,
kind
);
}
public
PortInstantiationSymbol
getSourcePort
()
{
return
null
;
}
public
PortInstantiationSymbol
getTargetPort
()
{
return
null
;
}
public
RangeSubPortSymbol
getSourceIndices
()
{
// If not present then 1:1
return
null
;
}
public
RangeSubPortSymbol
getTargetIndices
()
{
// If not present then 1:1
return
null
;
}
}
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/
instanceStructure/EMAComponentInstantiationSymbol
.java
→
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/
cncModel/EMAComponentInstantiationSymbolOld
.java
View file @
8d982b24
...
...
@@ -18,27 +18,30 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.Optional
;
package
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbolReference
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAConnectorSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationKind
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAElementInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.InstanceInformation
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.InstancingRegister
;
import
de.monticore.lang.embeddedmontiarc.helper.SymbolPrinter
;
import
de.monticore.lang.monticar.ValueSymbol
;
import
de.monticore.symboltable.CommonS
copeSpanningS
ymbol
;
import
de.monticore.symboltable.CommonSymbol
;
import
de.monticore.symboltable.types.TypeSymbol
;
import
de.monticore.symboltable.types.references.TypeReference
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.Optional
;
/**
* Represents an instance of a component.
*
* @author Robert Heim
*/
public
class
EMAComponentInstantiationSymbol
extends
CommonScopeSpanning
Symbol
implements
EMAElementInstanceSymbol
{
public
class
EMAComponentInstantiationSymbol
Old
extends
Common
Symbol
implements
EMAElementInstanceSymbol
{
public
static
final
EMAComponentInstantiationKind
KIND
=
EMAComponentInstantiationKind
.
INSTANCE
;
...
...
@@ -52,12 +55,12 @@ public class EMAComponentInstantiationSymbol extends CommonScopeSpanningSymbol i
private
String
value
=
""
;
/**
* Constructor for de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
instanceStructure
.EMAComponentInstantiationSymbol
* Constructor for de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.
cncModel
.EMAComponentInstantiationSymbol
*
* @param name
* @param componentType the referenced component definition
*/
public
EMAComponentInstantiationSymbol
(
String
name
,
EMAComponentSymbolReference
componentType
)
{
public
EMAComponentInstantiationSymbol
Old
(
String
name
,
EMAComponentSymbolReference
componentType
)
{
super
(
name
,
KIND
);
this
.
componentType
=
componentType
;
...
...
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAComponentSymbol.java
→
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAComponentSymbol
Old
.java
View file @
8d982b24
...
...
@@ -23,9 +23,8 @@ package de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncMode
import
com.google.common.collect.ImmutableList
;
import
de.monticore.expressionsbasis._ast.ASTExpression
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ComponentKind
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationSymbol
;
import
de.monticore.lang.embeddedmontiarc.embeddedmontiarc.types.EMAVariable
;
import
de.monticore.lang.embeddedmontiarc.helper.EMAComponentBuilder
;
import
de.monticore.lang.embeddedmontiarc.helper.SymbolPrinter
;
import
de.monticore.lang.monticar.common2._ast.ASTParameter
;
import
de.monticore.lang.monticar.si._symboltable.ResolutionDeclarationSymbol
;
...
...
@@ -52,7 +51,7 @@ import static de.monticore.symboltable.Symbols.sortSymbolsByPosition;
*
* @author Robert Heim
*/
public
class
EMAComponentSymbol
extends
CommonScopeSpanningSymbol
implements
EMAElementSymbol
{
public
class
EMAComponentSymbol
Old
extends
CommonScopeSpanningSymbol
implements
EMAElementSymbol
{
public
static
final
ComponentKind
KIND
=
new
ComponentKind
();
...
...
@@ -67,7 +66,7 @@ public class EMAComponentSymbol extends CommonScopeSpanningSymbol implements EMA
// when "this" not actually is a component, but a reference to a component, this optional
// attribute is set by the symbol-table creator to the referenced component and must be used for
// implementation.
private
Optional
<
EMAComponentSymbol
>
referencedComponent
=
Optional
.
empty
();
private
Optional
<
EMAComponentSymbol
Old
>
referencedComponent
=
Optional
.
empty
();
private
List
<
ImportStatement
>
imports
=
new
ArrayList
<>();
...
...
@@ -77,25 +76,25 @@ public class EMAComponentSymbol extends CommonScopeSpanningSymbol implements EMA
private
List
<
ASTExpression
>
arguments
=
new
ArrayList
<>();
public
EMAComponentSymbol
(
String
name
)
{
public
EMAComponentSymbol
Old
(
String
name
)
{
super
(
name
,
KIND
);
}
public
EMAComponentSymbol
(
String
name
,
SymbolKind
kind
)
{
public
EMAComponentSymbol
Old
(
String
name
,
SymbolKind
kind
)
{
super
(
name
,
kind
);
}
/**
* @return referencedComponent
*/
public
Optional
<
EMAComponentSymbol
>
getReferencedComponent
()
{
public
Optional
<
EMAComponentSymbol
Old
>
getReferencedComponent
()
{
return
this
.
referencedComponent
;
}
/**
* @param referencedComponent the referencedComponent to set
*/
public
void
setReferencedComponent
(
Optional
<
EMAComponentSymbol
>
referencedComponent
)
{
public
void
setReferencedComponent
(
Optional
<
EMAComponentSymbol
Old
>
referencedComponent
)
{
// to fix port instancing
this
.
referencedComponent
=
referencedComponent
;
}
...
...
@@ -212,16 +211,16 @@ public class EMAComponentSymbol extends CommonScopeSpanningSymbol implements EMA
/**
* @return innerComponents
*/
public
Collection
<
EMAComponentSymbol
>
getInnerComponents
()
{
public
Collection
<
EMAComponentSymbol
Old
>
getInnerComponents
()
{
return
referencedComponent
.
orElse
(
this
).
getSpannedScope
()
.<
EMAComponentSymbol
>
resolveLocally
(
EMAComponentSymbol
.
KIND
);
.<
EMAComponentSymbol
Old
>
resolveLocally
(
EMAComponentSymbolOld
.
KIND
);
}
/**
* @param name inner component name
* @return inner component with the given name, empty Optional, if it does not exist
*/
public
Optional
<
EMAComponentSymbol
>
getInnerComponent
(
String
name
)
{
public
Optional
<
EMAComponentSymbol
Old
>
getInnerComponent
(
String
name
)
{
// no check for reference required
return
getInnerComponents
().
stream
()
.
filter
(
c
->
c
.
getName
().
equals
(
name
))
...
...
@@ -232,7 +231,7 @@ public class EMAComponentSymbol extends CommonScopeSpanningSymbol implements EMA
* @param visibility visibility
* @return inner components with the given visibility
*/
public
Collection
<
EMAComponentSymbol
>
getInnerComponents
(
AccessModifier
visibility
)
{
public
Collection
<
EMAComponentSymbol
Old
>
getInnerComponents
(
AccessModifier
visibility
)
{
// no check for reference require
return
getInnerComponents
().
stream
()
.
filter
(
s
->
s
.
getAccessModifier
().
includes
(
visibility
))
...
...
@@ -664,7 +663,7 @@ public class EMAComponentSymbol extends CommonScopeSpanningSymbol implements EMA
// TODO implement me
}
public
Optional
<
EMAComponentSymbol
>
getParent
()
{
return
(
Optional
<
EMAComponentSymbol
>)
getEnclosingScope
().
getSpanningSymbol
();
public
Optional
<
EMAComponentSymbol
Old
>
getParent
()
{
return
(
Optional
<
EMAComponentSymbol
Old
>)
getEnclosingScope
().
getSpanningSymbol
();
}
}
src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/cncModel/EMAComponentSymbolReference.java
deleted
100644 → 0
View file @
bd9d7783
/**
*
* ******************************************************************************
* MontiCAR Modeling Family, www.se-rwth.de
* Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
* All rights reserved.
*
* This project is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public