Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
languages
EmbeddedMontiArc
Commits
0fcfdaff
Commit
0fcfdaff
authored
Oct 28, 2017
by
Alexander Ryndin
Browse files
fixed param resolution
parent
a857a690
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/de/monticore/lang/embeddedmontiarc/ComponentParametersSubstitutionsBuilder.java
View file @
0fcfdaff
...
...
@@ -127,8 +127,8 @@ public final class ComponentParametersSubstitutionsBuilder extends EmbeddedMonti
public
void
visit
(
ASTSubComponent
node
)
{
ComponentInstanceSymbol
subComp
=
(
ComponentInstanceSymbol
)
node
.
getSymbol
().
get
();
currentChild
=
subComp
;
child
Configuration
Parameters
.
clear
();
child
Configuration
Parameters
.
addAll
(
child
FormalType
Parameters
.
clear
();
child
FormalType
Parameters
.
addAll
(
subComp
.
getComponentType
()
.
getReferencedSymbol
()
.
getFormalTypeParameters
()
...
...
@@ -316,7 +316,7 @@ public final class ComponentParametersSubstitutionsBuilder extends EmbeddedMonti
baseType
=
ScalarStructFieldType
.
INTEGRAL
;
break
;
}
if
(
baseType
==
null
&&
isParentHas
Configuration
Parameter
(
typeName
))
{
if
(
baseType
==
null
&&
isParentHas
Type
Parameter
(
typeName
))
{
baseType
=
new
FormalTypeParameterFieldType
(
typeName
);
}
if
(
baseType
==
null
)
{
...
...
@@ -347,6 +347,6 @@ public final class ComponentParametersSubstitutionsBuilder extends EmbeddedMonti
}
private
boolean
isParentHasConfigurationParameter
(
String
name
)
{
return
formalType
ParametersSubstitutions
.
getParent
FormalType
Parameter
Name
s
().
contains
(
name
);
return
configuration
ParametersSubstitutions
.
getParent
Configuration
Parameters
().
contains
Key
(
name
);
}
}
src/main/java/de/monticore/lang/embeddedmontiarc/LiteralParameterSubstitution.java
View file @
0fcfdaff
...
...
@@ -36,7 +36,7 @@ public final class LiteralParameterSubstitution<T> {
}
@Nonnull
public
final
Object
getLiteralValue
()
{
public
final
T
getLiteralValue
()
{
return
this
.
literalValue
;
}
...
...
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