Skip to content

️Use ResourcePosition in syntax_line and syntax_column #564

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

Merged
toddjonker merged 1 commit into from
Sep 1, 2026
Merged

️Use ResourcePosition in syntax_line and syntax_column #564

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
10 changes: 5 additions & 5 deletions runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import static dev.ionfusion.fusion.FusionSyntax.checkSyntaxArg;

import dev.ionfusion.runtime.base.FusionException;
import dev.ionfusion.runtime.base.SourceLocation;
import dev.ionfusion.runtime.base.ResourcePosition;


class SyntaxColumnProc
Expand All @@ -17,11 +17,11 @@ class SyntaxColumnProc
Object doApply(Evaluator eval, Object arg)
throws FusionException
{
SyntaxValue stx = checkSyntaxArg(eval, this, 0, arg);
SourceLocation location = stx.getLocation();
if (location != null)
SyntaxValue stx = checkSyntaxArg(eval, this, 0, arg);
Comment thread
toddjonker marked this conversation as resolved.
ResourcePosition pos = stx.getPosition();
if (pos != null)
{
return makeInt(eval, location.getColumn());
return makeInt(eval, pos.getColumn());
}
return FusionNumber.ZERO_INT;
}
Expand Down
10 changes: 5 additions & 5 deletions runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import static dev.ionfusion.fusion.FusionSyntax.checkSyntaxArg;

import dev.ionfusion.runtime.base.FusionException;
import dev.ionfusion.runtime.base.SourceLocation;
import dev.ionfusion.runtime.base.ResourcePosition;


class SyntaxLineProc
Expand All @@ -17,11 +17,11 @@ class SyntaxLineProc
Object doApply(Evaluator eval, Object arg)
throws FusionException
{
SyntaxValue stx = checkSyntaxArg(eval, this, 0, arg);
SourceLocation location = stx.getLocation();
if (location != null)
SyntaxValue stx = checkSyntaxArg(eval, this, 0, arg);
ResourcePosition pos = stx.getPosition();
if (pos != null)
{
return makeInt(eval, location.getLine());
return makeInt(eval, pos.getLine());
}
return FusionNumber.ZERO_INT;
}
Expand Down
Loading