ctf: allow declaration scopes to check if the declaration is overlapping

MatthewKhouzam · MatthewKhouzam · commit c3db7a0294e0 · 2025-12-11T13:04:47.000-05:00
Needed for expanding aliases

Change-Id: I97039e706002602347cb6d06fbcfecbbd084b55d
Signed-off-by: Matthew Khouzam &lt;matthew.khouzam@ericsson.com&gt;
diff --git a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/metadata/DeclarationScope.java b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/metadata/DeclarationScope.java
@@ -197,7 +197,8 @@ public void registerType(String name, IDeclaration declaration)
      */
     public void registerIdentifier(String name, IDeclaration declaration) throws ParseException {
         /* Check if the type has been defined in the current scope */
-        if (fIdentifiers.containsKey(name)) {
+        IDeclaration iDeclaration = fIdentifiers.get(declaration);
+        if (iDeclaration != null && !Objects.equals(iDeclaration, declaration)) {
             throw new ParseException("Identifier has already been defined:" + name); //$NON-NLS-1$
         }
 

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,8 @@ public void registerType(String name, IDeclaration declaration)`
`197`	`197`	`*/`
`198`	`198`	`public void registerIdentifier(String name, IDeclaration declaration) throws ParseException {`
`199`	`199`	`/* Check if the type has been defined in the current scope */`
`200`		`- if (fIdentifiers.containsKey(name)) {`
	`200`	`+ IDeclaration iDeclaration = fIdentifiers.get(declaration);`
	`201`	`+ if (iDeclaration != null && !Objects.equals(iDeclaration, declaration)) {`
`201`	`202`	`throw new ParseException("Identifier has already been defined:" + name); //$NON-NLS-1$`
`202`	`203`	`}`
`203`	`204`