ctf: make CTF1 parsing more rigid

Do not accept double typealiases with the same value.

Change-Id: I2affb15f6faf83cd0292a7310febbad8ae657513
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

@@ -178,7 +178,7 @@ public void registerType(String name, IDeclaration declaration)
         }
         IDeclaration originalDeclaration = fTypes.get(name);
         if (originalDeclaration != null && !Objects.equals(declaration, originalDeclaration)) {
-            throw new ParseException("Type has already been defined:" + name); //$NON-NLS-1$
+            throw new ParseException("Type has already been defined: " + name); //$NON-NLS-1$
         }
 
         /* Add it to the register. */

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

@@ -210,6 +210,9 @@ public IDeclaration parse(ICTFMetadataNode typealias, ICommonTreeParserParameter
             }
 
             aliasString = TypeAliasAliasParser.INSTANCE.parse(alias, null);
+            if (scope.lookupType(aliasString)!= null) {
+                throw new ParseException("Type has already been defined: " + aliasString); //$NON-NLS-1$
+            }
         }
 
         scope.registerType(aliasString, targetDeclaration);

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

@@ -26,6 +26,8 @@
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TypeDeclaratorParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.types.ICTFMetadataNode;
 
+import com.google.common.base.Objects;
+
 /**
  * Structures follow the ISO/C standard for structures
  *
@@ -92,8 +94,9 @@ public StructDeclaration parse(ICTFMetadataNode declaration, ICommonTreeParserPa
         StringBuilder identifierSB = new StringBuilder();
         IDeclaration decl = null;
         String fieldName = null;
-
+        boolean ctf1 = false;
         if (declaration instanceof CTFAntlrMetadataNode) {
+            ctf1= true;
             /* Get the type specifier list node */
             ICTFMetadataNode typeSpecifierListNode = declaration.getFirstChildWithType(CTFParser.tokenNames[CTFParser.TYPE_SPECIFIER_LIST]);
 
@@ -129,12 +132,15 @@ public StructDeclaration parse(ICTFMetadataNode declaration, ICommonTreeParserPa
 
         scope.registerIdentifier(fieldName, decl);
         IDeclaration current = struct.getField(fieldName);
-        if (decl != null && current != null && !decl.equals(current)) {
+        if (decl == null) {
+            throw new ParseException("struct: Cannot add null field " + fieldName); //$NON-NLS-1$
+        }
+        if (current != null && (ctf1 || !Objects.equal(decl, current))) {
             throw new ParseException("struct: duplicate field " //$NON-NLS-1$
                     + fieldName);
         }
 
-        if (fieldName != null && decl != null) {
+        if (fieldName != null) {
             struct.addField(fieldName, decl);
         }