Commit 0fcfdaff authored by Alexander Ryndin's avatar Alexander Ryndin
Browse files

fixed param resolution

parent a857a690
......@@ -127,8 +127,8 @@ public final class ComponentParametersSubstitutionsBuilder extends EmbeddedMonti
public void visit(ASTSubComponent node) {
ComponentInstanceSymbol subComp = (ComponentInstanceSymbol) node.getSymbol().get();
currentChild = subComp;
childConfigurationParameters.clear();
childConfigurationParameters.addAll(
childFormalTypeParameters.clear();
childFormalTypeParameters.addAll(
subComp.getComponentType()
.getReferencedSymbol()
.getFormalTypeParameters()
......@@ -316,7 +316,7 @@ public final class ComponentParametersSubstitutionsBuilder extends EmbeddedMonti
baseType = ScalarStructFieldType.INTEGRAL;
break;
}
if (baseType == null && isParentHasConfigurationParameter(typeName)) {
if (baseType == null && isParentHasTypeParameter(typeName)) {
baseType = new FormalTypeParameterFieldType(typeName);
}
if (baseType == null) {
......@@ -347,6 +347,6 @@ public final class ComponentParametersSubstitutionsBuilder extends EmbeddedMonti
}
private boolean isParentHasConfigurationParameter(String name) {
return formalTypeParametersSubstitutions.getParentFormalTypeParameterNames().contains(name);
return configurationParametersSubstitutions.getParentConfigurationParameters().containsKey(name);
}
}
......@@ -36,7 +36,7 @@ public final class LiteralParameterSubstitution<T> {
}
@Nonnull
public final Object getLiteralValue() {
public final T getLiteralValue() {
return this.literalValue;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment