Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/ionfusion/fusion/Binding.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ abstract class Binding
/**
* @return null if {@link FreeBinding}.
*/
abstract BindingSite getBindingSite();
abstract BindingSite bindingSite();

/**
* Determines whether this is a {@link FreeBinding} with the given name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public BaseSymbol getName()


@Override
BindingSite getBindingSite()
BindingSite bindingSite()
{
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ static boolean unsafeFreeIdentifierEqual(Evaluator eval,
static BindingSite unsafeIdentifierBinding(Evaluator eval, Object id)
throws FusionException
{
return ((SyntaxSymbol) id).resolve().getBindingSite();
return ((SyntaxSymbol) id).resolve().bindingSite();
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@ static final class LocalBinding
static final LocalBinding[] EMPTY_ARRAY = new LocalBinding[0];

private final SyntaxSymbol myIdentifier;
private final BindingSite mySite;

private LocalBinding(SyntaxSymbol identifier)
{
myIdentifier = identifier;
mySite = makeLocalBindingSite(identifier.getPosition());
}

@Override
Expand All @@ -50,9 +48,9 @@ BaseSymbol getName()
}

@Override
BindingSite getBindingSite()
BindingSite bindingSite()
{
return mySite;
return makeLocalBindingSite(myIdentifier.getPosition());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ static abstract class ProvidedBinding
{
private final BaseSymbol myName;
private final ResourcePosition myLoc;
private BindingSite mySite;

ProvidedBinding(BaseSymbol name, ResourcePosition sourceLocation)
{
Expand All @@ -45,13 +44,9 @@ static abstract class ProvidedBinding
final BaseSymbol getName() { return myName; }

@Override
BindingSite getBindingSite()
BindingSite bindingSite()
{
if (mySite == null)
{
mySite = makeExportBindingSite(myLoc, inside().getBindingSite());
}
return mySite;
return makeExportBindingSite(myLoc, inside().bindingSite());
}

@Override
Expand Down Expand Up @@ -99,7 +94,7 @@ static final class DefinedProvidedBinding
DefinedProvidedBinding(ModuleDefinedBinding binding)
{
this(binding.getName(),
binding.getBindingSite().getPosition(),
binding.bindingSite().getPosition(),
binding);
}

Expand Down
17 changes: 6 additions & 11 deletions runtime/src/main/java/dev/ionfusion/fusion/Namespace.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ abstract class NsDefinedBinding
{
private final BaseSymbol myName;
private final String myDebugName;
private final BindingSite mySite;
private final ResourcePosition myPosition;
final int myAddress;

NsDefinedBinding(SyntaxSymbol identifier, int address)
{
myName = identifier.getName();
myDebugName = identifier.debugString();
mySite = makeDefineBindingSite(identifier.getPosition());
myPosition = identifier.getPosition();
myAddress = address;
}

Expand All @@ -117,9 +117,9 @@ final BaseSymbol getName()
}

@Override
BindingSite getBindingSite()
BindingSite bindingSite()
{
return mySite;
return makeDefineBindingSite(myPosition);
}

final String getDebugName()
Expand Down Expand Up @@ -170,7 +170,6 @@ abstract static class RequiredBinding
private final String myDebugName;
private final ResourcePosition myPosition;
private final ProvidedBinding myProvide;
private BindingSite mySite;

RequiredBinding(SyntaxSymbol identifier, ProvidedBinding provide)
{
Expand All @@ -188,13 +187,9 @@ final BaseSymbol getName()
}

@Override
BindingSite getBindingSite()
BindingSite bindingSite()
{
if (mySite == null)
{
mySite = makeImportBindingSite(myPosition, myProvide.getBindingSite());
}
return mySite;
return makeImportBindingSite(myPosition, myProvide.bindingSite());
}

final String getDebugName()
Expand Down
Loading