diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java index 3e5658d2..d6242748 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java @@ -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 @@ -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); + ResourcePosition pos = stx.getPosition(); + if (pos != null) { - return makeInt(eval, location.getColumn()); + return makeInt(eval, pos.getColumn()); } return FusionNumber.ZERO_INT; } diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java index 678b147e..0f6d3028 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java @@ -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 @@ -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; }