ctf: add struct support

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

Author: MatthewKhouzam

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/metadata/DeclarationScope.java

@@ -17,6 +17,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -171,7 +172,12 @@ public void setName(String name) {
     public void registerType(String name, IDeclaration declaration)
             throws ParseException {
         /* Check if the type has been defined in the current scope */
-        if (fTypes.containsKey(name)) {
+        if (name == null || name.isEmpty()) {
+            // don't register anonymous types
+            return;
+        }
+        IDeclaration originalDeclaration = fTypes.get(name);
+        if (originalDeclaration != null && !Objects.equals(declaration, originalDeclaration)) {
             throw new ParseException("Type has already been defined:" + name); //$NON-NLS-1$
         }
 

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

@@ -24,12 +24,14 @@
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonFieldClassAliasMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonStructureFieldMemberMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ParseException;
+import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.dynamicarray.DynamicLengthArrayParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.dynamicstring.DynamicLengthStringParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.enumeration.EnumParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.integer.IntegerDeclarationParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.staticarray.StaticLengthArrayParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.staticstring.StaticLengthStringParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.string.StringDeclarationParser;
+import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.struct.StructParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.variant.VariantParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.types.ICTFMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.utils.JsonMetadataStrings;
@@ -173,6 +175,10 @@ public IDeclaration parse(ICTFMetadataNode typealias, ICommonTreeParserParameter
                     targetDeclaration = StaticLengthStringParser.INSTANCE.parse(typealias, new StaticLengthStringParser.Param(trace));
                 } else if (JsonMetadataStrings.STATIC_LENGTH_ARRAY.equals(type)) {
                     targetDeclaration = StaticLengthArrayParser.INSTANCE.parse(typealias, new StaticLengthArrayParser.Param(trace, scope));
+                } else if (JsonMetadataStrings.DYNAMIC_LENGTH_ARRAY.equals(type)) {
+                    targetDeclaration = DynamicLengthArrayParser.INSTANCE.parse(typealias, new DynamicLengthArrayParser.Param(trace, scope));
+                } else if (JsonMetadataStrings.STRUCTURE.equals(type)) {
+                    targetDeclaration = StructParser.INSTANCE.parse(typealias, new StructParser.Param(trace, null, scope));
                 } else {
                     throw new ParseException("Invalid field class: " + type); //$NON-NLS-1$
                 }

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java

@@ -22,11 +22,13 @@
 import org.eclipse.tracecompass.ctf.parser.CTFParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.AbstractScopedCommonTreeParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.CTFAntlrMetadataNode;
+import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonStructureFieldMemberMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonStructureFieldMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ParseException;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.AlignmentParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.types.ICTFMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.types.StructDeclarationFlattener;
+import org.eclipse.tracecompass.internal.ctf.core.utils.JsonMetadataStrings;
 
 /**
  *
@@ -185,14 +187,29 @@ public StructDeclaration parse(ICTFMetadataNode struct, ICommonTreeParserParamet
                 structName = identifier.getText();
                 hasName = true;
             }
-        } else {
-            if (((JsonStructureFieldMetadataNode) struct).getMinimumAlignment() != 0) {
+        } else if (struct instanceof JsonStructureFieldMetadataNode) {
+            JsonStructureFieldMetadataNode structNode = (JsonStructureFieldMetadataNode) struct;
+            if (structNode.getMinimumAlignment() != 0) {
                 structAlign = AlignmentParser.INSTANCE.parse(struct, null);
             }
-            if (((JsonStructureFieldMetadataNode) struct).getMemberClasses() != null) {
+            if (structNode.getMemberClasses() != null) {
                 hasBody = true;
                 structBody = struct;
             }
+        } else if (struct instanceof JsonStructureFieldMemberMetadataNode) {
+            ICTFMetadataNode innerNode = struct.getChild(JsonMetadataStrings.STRUCT);
+            if (innerNode instanceof JsonStructureFieldMetadataNode) {
+                JsonStructureFieldMetadataNode structNode = (JsonStructureFieldMetadataNode) struct;
+                if (structNode.getMinimumAlignment() != 0) {
+                    structAlign = AlignmentParser.INSTANCE.parse(struct, null);
+                }
+                if (structNode.getMemberClasses() != null) {
+                    hasBody = true;
+                    structBody = struct;
+
+                }
+            }
+
         }
         /*
          * If a struct has just a body and no name (just like the song,

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

@@ -201,6 +201,10 @@ private JsonMetadataStrings() {
      */
     public static final String STRUCTURE = "structure"; //$NON-NLS-1$
 
+    /**
+     * Type string for an internal structure field class
+     */
+    public static final String STRUCT = "struct"; //$NON-NLS-1$
     /**
      * Encodings map
      */
@@ -223,8 +227,14 @@ private JsonMetadataStrings() {
      */
     public static final String STATIC_LENGTH_ARRAY = "static-length-array"; //$NON-NLS-1$
 
+    /**
+     * Dynamic length array
+     */
+    public static final String DYNAMIC_LENGTH_ARRAY = "dynamic-length-array"; //$NON-NLS-1$
+
     /**
      * Element field class
      */
     public static final String ELEMENT_FIELD_CLASS = "element-field-class"; //$NON-NLS-1$
+
 }