ctf: make lookuprole recursive

Makes CTF too deep structs still work

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

Author: MatthewKhouzam

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/StructDefinition.java

@@ -236,11 +236,31 @@ public Definition lookupDefinition(String lookupPath, ScopedDefinition defintion
      * @since 4.4
      */
     public IDefinition lookupRole(String role) {
+        if (role == null) {
+            return null;
+        }
         for (IDefinition def : fDefinitions) {
-            IDeclaration decl = def.getDeclaration();
-            if (role != null && role.equals(decl.getRole())) {
+            if (role.equals(def.getDeclaration().getRole())) {
                 return def;
             }
+            IDefinition result = lookupRoleRecursive(def, role);
+            if (result != null) {
+                return result;
+            }
+        }
+        return null;
+    }
+
+    private IDefinition lookupRoleRecursive(IDefinition def, String role) {
+        if (def instanceof StructDefinition) {
+            return ((StructDefinition) def).lookupRole(role);
+        }
+        if (def instanceof VariantDefinition) {
+            IDefinition current = ((VariantDefinition) def).getCurrentField();
+            if (role.equals(current.getDeclaration().getRole())) {
+                return current;
+            }
+            return lookupRoleRecursive(current, role);
         }
         return null;
     }