From 5aaa47fbd89d3e771da967242b75003f099df08c Mon Sep 17 00:00:00 2001 From: Bence Levente Varga Date: Fri, 27 Mar 2020 17:49:13 +0100 Subject: [PATCH] Fix compilation error if ASN1 enum def contains reference Fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=560016 Signed-off-by: Bence Levente Varga --- .../designer/AST/ASN1/types/ASN1_Enumerated_Type.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/types/ASN1_Enumerated_Type.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/types/ASN1_Enumerated_Type.java index 1559ac085..6b411003a 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/types/ASN1_Enumerated_Type.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/ASN1/types/ASN1_Enumerated_Type.java @@ -571,7 +571,7 @@ public final class ASN1_Enumerated_Type extends ASN1Type implements ITypeWithCom } else { //FIXME get_eis_index_byName final EnumItem enumItem = getEnumItemWithName(identifier); - final int index = (int) ((Integer_Value) enumItem.getValue()).getValue(); + final int index = (int) ((Integer_Value) enumItem.getValue().getValueRefdLast(timestamp, null)).getValue(); jsonAttribute.enum_texts.get(i).index = index; for (int j = 0; j < i; j++) { if (jsonAttribute.enum_texts.get(j).index == index) { @@ -831,8 +831,9 @@ public final class ASN1_Enumerated_Type extends ASN1Type implements ITypeWithCom for (int i = 0; i < items.size(); i++) { final EnumItem tempItem = items.get(i); final Identifier tempId = tempItem.getId(); - - fields.add(new Enum_field(tempId.getName(), tempId.getDisplayName(), ((Integer_Value)tempItem.getValue()).getValue())); + final Integer_Value tempValue = (Integer_Value)tempItem.getValue().getValueRefdLast(CompilationTimeStamp.getBaseTimestamp(), null); + + fields.add(new Enum_field(tempId.getName(), tempId.getDisplayName(), tempValue.getValue())); } final Enum_Defs e_defs = new Enum_Defs( fields, ownName, displayName, getGenNameTemplate(aData, source), hasRaw, hasJson); -- GitLab