Skip to content

ctf: improve scope creation #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatthewKhouzam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ctf: improve scope creation #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions ...tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/scope/LexicalScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

package org.eclipse.tracecompass.ctf.core.event.scope;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
Expand All @@ -28,7 +28,7 @@ public class LexicalScope implements ILexicalScope {
private int hash = 0;
private final @NonNull String fName;
private final @NonNull String fPath;
private final Map<String, ILexicalScope> fChildren = new ConcurrentHashMap<>();
private final Map<String, ILexicalScope> fChildren = new HashMap<>();

/**
* Hidden constructor for the root node only
Expand All @@ -40,6 +40,22 @@ protected LexicalScope() {
fName = ""; //$NON-NLS-1$
}

/**
* Create a scope
* @param parent
* The parent node, can be null, but shouldn't
* @param name
* the name of the field
* @return the scope
*/
public static @NonNull ILexicalScope create(ILexicalScope parent, @NonNull String name) {
ILexicalScope child = parent.getChild(name);
if( child == null) {
child = new LexicalScope(parent, name);
}
return child;
}

/**
* The scope constructor
*
Expand Down
12 changes: 2 additions & 10 deletions ....tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/Declaration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,10 @@ public ILexicalScope getPath(IDefinitionScope definitionScope, @NonNull String f
if (definitionScope != null) {
final ILexicalScope parentPath = definitionScope.getScopePath();
if (parentPath != null) {
ILexicalScope myScope = parentPath.getChild(fieldName);
if (myScope == null) {
myScope = new LexicalScope(parentPath, fieldName);
}
return myScope;
return LexicalScope.create(parentPath, fieldName);
}
}
ILexicalScope child = ILexicalScope.ROOT.getChild(fieldName);
if (child != null) {
return child;
}
return new LexicalScope(ILexicalScope.ROOT, fieldName);
return LexicalScope.create(ILexicalScope.ROOT, fieldName);
}

/**
Expand Down
Loading