C++: use underlyingElement & unresolveElement for get{Element,Field}Expr

This commit is contained in:
Nick Rolfe
2018-08-30 13:33:04 +01:00
committed by Nick Rolfe
parent d8d3bfd857
commit 2130622028

View File

@@ -173,7 +173,8 @@ class ClassAggregateLiteral extends AggregateLiteral {
*/
Expr getFieldExpr(Field field) {
field = classType.getAField() and
aggregate_field_init(this, result, field)
aggregate_field_init(underlyingElement(this), unresolveElement(result),
unresolveElement(field))
}
/**
@@ -230,7 +231,8 @@ class ArrayAggregateLiteral extends AggregateLiteral {
* element `elementIndex`, if present.
*/
Expr getElementExpr(int elementIndex) {
aggregate_array_init(this, result, elementIndex)
aggregate_array_init(underlyingElement(this), unresolveElement(result),
elementIndex)
}
/**