ctf: fix variants can have integer selectors

Change-Id: Ie8752173c78caf0d0f5cef3cb1a5d2aa58c1e8d8
Signed-off-by: Matthew Khouzam <[email protected]>

Author: MatthewKhouzam

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/variant/VariantParser.java

@@ -22,6 +22,7 @@
 import org.eclipse.tracecompass.ctf.core.event.metadata.DeclarationScope;
 import org.eclipse.tracecompass.ctf.core.event.types.EnumDeclaration;
 import org.eclipse.tracecompass.ctf.core.event.types.IDeclaration;
+import org.eclipse.tracecompass.ctf.core.event.types.IntegerDeclaration;
 import org.eclipse.tracecompass.ctf.core.event.types.VariantDeclaration;
 import org.eclipse.tracecompass.ctf.core.trace.CTFTrace;
 import org.eclipse.tracecompass.ctf.parser.CTFParser;
@@ -266,7 +267,7 @@ public VariantDeclaration parse(ICTFMetadataNode variant, ICommonTreeParserParam
         if (variant instanceof JsonStructureFieldMemberMetadataNode) {
             JsonObject fieldClass = ((JsonStructureFieldMemberMetadataNode) variant).getFieldClass().getAsJsonObject();
             if (fieldClass.has(SELECTOR_FIELD_LOCATION)) {
-                JsonArray location = fieldClass.get(SELECTOR_FIELD_LOCATION).getAsJsonArray();
+                JsonArray location = (fieldClass.get(SELECTOR_FIELD_LOCATION).getAsJsonObject().get(JsonMetadataStrings.PATH)).getAsJsonArray();
                 variantTag = location.get(location.size() - 1).getAsString();
                 hasTag = true;
             }
@@ -361,13 +362,17 @@ public VariantDeclaration parse(ICTFMetadataNode variant, ICommonTreeParserParam
             if (decl == null) {
                 throw new ParseException("Variant tag not found: " + variantTag); //$NON-NLS-1$
             }
-            if (!(decl instanceof EnumDeclaration)) {
-                throw new ParseException("Variant tag must be an enum: " + variantTag); //$NON-NLS-1$
-            }
-            EnumDeclaration tagDecl = (EnumDeclaration) decl;
-            if (!intersects(tagDecl.getLabels(), variantDeclaration.getFields().keySet())) {
-                throw new ParseException("Variant contains no values of the tag, impossible to use: " + variantName); //$NON-NLS-1$
+            if (decl instanceof EnumDeclaration) {
+                EnumDeclaration tagDecl = (EnumDeclaration) decl;
+                if (!intersects(tagDecl.getLabels(), variantDeclaration.getFields().keySet())) {
+                    throw new ParseException("Variant contains no values of the tag, impossible to use: " + variantName); //$NON-NLS-1$
+                }
+            } else if (decl instanceof IntegerDeclaration) {
+                // do nothing
+            } else {
+                throw new ParseException("Variant tag must be an enum: " + variantTag);//$NON-NLS-1$
             }
+
         }
 
         return variantDeclaration;

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/utils/JsonMetadataStrings.java

@@ -173,6 +173,11 @@ private JsonMetadataStrings() {
      */
     public static final String VARIANT = "variant"; //$NON-NLS-1$
 
+    /**
+     * Type string for a structure field class
+     */
+    public static final String PATH = "path"; //$NON-NLS-1$
+
     /**
      * Type string for a structure field class
      */