Source located function, class and arguments

aNNiMON · aNNiMON · commit d3dd8feb108b · 2024-01-12T20:52:30.000+01:00
diff --git a/ownlang-core/src/main/java/com/annimon/ownlang/exceptions/ArgumentsMismatchException.java b/ownlang-core/src/main/java/com/annimon/ownlang/exceptions/ArgumentsMismatchException.java
@@ -1,5 +1,7 @@
 package com.annimon.ownlang.exceptions;
 
+import com.annimon.ownlang.util.Range;
+
 public final class ArgumentsMismatchException extends OwnLangRuntimeException {
 
     public ArgumentsMismatchException() {
@@ -8,4 +10,8 @@ public ArgumentsMismatchException() {
     public ArgumentsMismatchException(String message) {
         super(message);
     }
+
+    public ArgumentsMismatchException(String message, Range range) {
+        super(message, range);
+    }
 }
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/lib/ClassMethod.java b/ownlang-parser/src/main/java/com/annimon/ownlang/lib/ClassMethod.java
@@ -2,13 +2,14 @@
 
 import com.annimon.ownlang.parser.ast.Arguments;
 import com.annimon.ownlang.parser.ast.Statement;
+import com.annimon.ownlang.util.Range;
 
 public class ClassMethod extends UserDefinedFunction {
     
     public final ClassInstanceValue classInstance;
     
-    public ClassMethod(Arguments arguments, Statement body, ClassInstanceValue classInstance) {
-        super(arguments, body);
+    public ClassMethod(Arguments arguments, Statement body, ClassInstanceValue classInstance, Range range) {
+        super(arguments, body, range);
         this.classInstance = classInstance;
     }
     
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/lib/UserDefinedFunction.java b/ownlang-parser/src/main/java/com/annimon/ownlang/lib/UserDefinedFunction.java
@@ -5,21 +5,30 @@
 import com.annimon.ownlang.parser.ast.Arguments;
 import com.annimon.ownlang.parser.ast.ReturnStatement;
 import com.annimon.ownlang.parser.ast.Statement;
+import com.annimon.ownlang.util.Range;
+import com.annimon.ownlang.util.SourceLocation;
 
 /**
  *
  * @author aNNiMON
  */
-public class UserDefinedFunction implements Function {
+public class UserDefinedFunction implements Function, SourceLocation {
     
     public final Arguments arguments;
     public final Statement body;
-    
-    public UserDefinedFunction(Arguments arguments, Statement body) {
+    private final Range range;
+
+    public UserDefinedFunction(Arguments arguments, Statement body, Range range) {
         this.arguments = arguments;
         this.body = body;
+        this.range = range;
     }
-    
+
+    @Override
+    public Range getRange() {
+        return range;
+    }
+
     @Override
     public int getArgsCount() {
         return arguments.size();
@@ -35,13 +44,15 @@ public Value execute(Value[] values) {
         final int size = values.length;
         final int requiredArgsCount = arguments.getRequiredArgumentsCount();
         if (size < requiredArgsCount) {
-            throw new ArgumentsMismatchException(String.format(
-                    "Arguments count mismatch. Required %d, got %d", requiredArgsCount, size));
+            String error = String.format(
+                    "Arguments count mismatch. Required %d, got %d", requiredArgsCount, size);
+            throw new ArgumentsMismatchException(error, arguments.getRange());
         }
         final int totalArgsCount = getArgsCount();
         if (size > totalArgsCount) {
-            throw new ArgumentsMismatchException(String.format(
-                    "Arguments count mismatch. Total %d, got %d", totalArgsCount, size));
+            String error = String.format(
+                    "Arguments count mismatch. Total %d, got %d", totalArgsCount, size);
+            throw new ArgumentsMismatchException(error, arguments.getRange());
         }
 
         try {
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/parser/Parser.java b/ownlang-parser/src/main/java/com/annimon/ownlang/parser/Parser.java
@@ -290,16 +290,18 @@ private ForeachMapStatement foreachMapStatement() {
 
     private FunctionDefineStatement functionDefine() {
         // def name(arg1, arg2 = value) { ... }  ||  def name(args) = expr
+        final var startTokenIndex = index - 1;
         final String name = consume(TokenType.WORD).text();
         final Arguments arguments = arguments();
         final Statement body = statementBody();
-        return new FunctionDefineStatement(name, arguments, body);
+        return new FunctionDefineStatement(name, arguments, body, getRange(startTokenIndex, index - 1));
     }
 
     private Arguments arguments() {
         // (arg1, arg2, arg3 = expr1, arg4 = expr2)
         final Arguments arguments = new Arguments();
         boolean startsOptionalArgs = false;
+        final var startTokenIndex = index;
         consume(TokenType.LPAREN);
         while (!match(TokenType.RPAREN)) {
             final String name = consume(TokenType.WORD).text();
@@ -313,6 +315,7 @@ private Arguments arguments() {
             }
             match(TokenType.COMMA);
         }
+        arguments.setRange(getRange(startTokenIndex, index - 1));
         return arguments;
     }
 
@@ -802,9 +805,10 @@ private Expression primary() {
         }
         if (match(TokenType.DEF)) {
             // anonymous function def(args) ...
+            final var startTokenIndex = index - 1;
             final Arguments arguments = arguments();
             final Statement statement = statementBody();
-            return new ValueExpression(new UserDefinedFunction(arguments, statement));
+            return new ValueExpression(new UserDefinedFunction(arguments, statement, getRange(startTokenIndex, index - 1)));
         }
         return variable();
     }
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/parser/ast/Arguments.java b/ownlang-parser/src/main/java/com/annimon/ownlang/parser/ast/Arguments.java
@@ -1,19 +1,22 @@
 package com.annimon.ownlang.parser.ast;
 
+import com.annimon.ownlang.util.Range;
+import com.annimon.ownlang.util.SourceLocation;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public final class Arguments implements Iterable<Argument> {
+public final class Arguments implements Iterable<Argument>, SourceLocation {
     
     private final List<Argument> arguments;
+    private Range range;
     private int requiredArgumentsCount;
 
     public Arguments() {
         arguments = new ArrayList<>();
         requiredArgumentsCount = 0;
     }
-    
+
     public void addRequired(String name) {
         arguments.add(new Argument(name));
         requiredArgumentsCount++;
@@ -35,6 +38,15 @@ public int size() {
         return arguments.size();
     }
 
+    public void setRange(Range range) {
+        this.range = range;
+    }
+
+    @Override
+    public Range getRange() {
+        return range;
+    }
+
     @Override
     public Iterator<Argument> iterator() {
         return arguments.iterator();
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/parser/ast/FunctionDefineStatement.java b/ownlang-parser/src/main/java/com/annimon/ownlang/parser/ast/FunctionDefineStatement.java
@@ -2,26 +2,35 @@
 
 import com.annimon.ownlang.lib.ScopeHandler;
 import com.annimon.ownlang.lib.UserDefinedFunction;
+import com.annimon.ownlang.util.Range;
+import com.annimon.ownlang.util.SourceLocation;
 
 /**
  *
  * @author aNNiMON
  */
-public final class FunctionDefineStatement implements Statement {
+public final class FunctionDefineStatement implements Statement, SourceLocation {
     
     public final String name;
     public final Arguments arguments;
     public final Statement body;
+    private final Range range;
     
-    public FunctionDefineStatement(String name, Arguments arguments, Statement body) {
+    public FunctionDefineStatement(String name, Arguments arguments, Statement body, Range range) {
         this.name = name;
         this.arguments = arguments;
         this.body = body;
+        this.range = range;
+    }
+
+    @Override
+    public Range getRange() {
+        return range;
     }
 
     @Override
     public void execute() {
-        ScopeHandler.setFunction(name, new UserDefinedFunction(arguments, body));
+        ScopeHandler.setFunction(name, new UserDefinedFunction(arguments, body, range));
     }
     
     @Override
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/parser/ast/ObjectCreationExpression.java b/ownlang-parser/src/main/java/com/annimon/ownlang/parser/ast/ObjectCreationExpression.java
@@ -38,7 +38,7 @@ public Value eval() {
                     return instantiable.newInstance(ctorArgs());
                 }
             }
-            throw new UnknownClassException(className, getRange());
+            throw new UnknownClassException(className, range);
         }
         
         // Create an instance and put evaluated fields with method declarations
@@ -49,7 +49,7 @@ public Value eval() {
             instance.addField(fieldName, f.eval());
         }
         for (FunctionDefineStatement m : cd.methods) {
-            instance.addMethod(m.name, new ClassMethod(m.arguments, m.body, instance));
+            instance.addMethod(m.name, new ClassMethod(m.arguments, m.body, instance, m.getRange()));
         }
         
         // Call a constructor
diff --git a/ownlang-parser/src/main/java/com/annimon/ownlang/parser/optimization/OptimizationVisitor.java b/ownlang-parser/src/main/java/com/annimon/ownlang/parser/optimization/OptimizationVisitor.java
@@ -174,7 +174,7 @@ public Node visit(FunctionDefineStatement s, T t) {
 
         final Node body = s.body.accept(this, t);
         if (changed || body != s.body) {
-            return new FunctionDefineStatement(s.name, newArgs, consumeStatement(body));
+            return new FunctionDefineStatement(s.name, newArgs, consumeStatement(body), s.getRange());
         }
         return s;
     }
@@ -423,7 +423,7 @@ public UserDefinedFunction visit(UserDefinedFunction s, T t) {
 
         final Node body = s.body.accept(this, t);
         if (changed || body != s.body) {
-            return new UserDefinedFunction(newArgs, consumeStatement(body));
+            return new UserDefinedFunction(newArgs, consumeStatement(body), s.getRange());
         }
         return s;
     }
@@ -432,6 +432,7 @@ public UserDefinedFunction visit(UserDefinedFunction s, T t) {
 
     protected boolean visit(final Arguments in, final Arguments out, T t) {
         boolean changed = false;
+        out.setRange(in.getRange());
         for (Argument argument : in) {
             final Expression valueExpr = argument.valueExpr();
             if (valueExpr == null) {
diff --git a/ownlang-parser/src/test/java/com/annimon/ownlang/parser/ProgramsTest.java b/ownlang-parser/src/test/java/com/annimon/ownlang/parser/ProgramsTest.java
@@ -97,8 +97,8 @@ public void testProgram(InputSource inputSource) {
                     .perform(stagesData, ex.getParseErrors());
             fail(inputSource + "\n" + error, ex);
         } catch (Exception oae) {
-            fail(inputSource.toString(), oae);
             Console.handleException(stagesData, Thread.currentThread(), oae);
+            fail(inputSource.toString(), oae);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package com.annimon.ownlang.exceptions;`
`2`	`2`
	`3`	`+import com.annimon.ownlang.util.Range;`
	`4`	`+`
`3`	`5`	`public final class ArgumentsMismatchException extends OwnLangRuntimeException {`
`4`	`6`
`5`	`7`	`public ArgumentsMismatchException() {`
`@@ -8,4 +10,8 @@ public ArgumentsMismatchException() {`
`8`	`10`	`public ArgumentsMismatchException(String message) {`
`9`	`11`	`super(message);`
`10`	`12`	`}`
	`13`	`+`
	`14`	`+ public ArgumentsMismatchException(String message, Range range) {`
	`15`	`+ super(message, range);`
	`16`	`+ }`
`11`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,16 +290,18 @@ private ForeachMapStatement foreachMapStatement() {`
`290`	`290`
`291`	`291`	`private FunctionDefineStatement functionDefine() {`
`292`	`292`	`// def name(arg1, arg2 = value) { ... } \|\| def name(args) = expr`
	`293`	`+ final var startTokenIndex = index - 1;`
`293`	`294`	`final String name = consume(TokenType.WORD).text();`
`294`	`295`	`final Arguments arguments = arguments();`
`295`	`296`	`final Statement body = statementBody();`
`296`		`- return new FunctionDefineStatement(name, arguments, body);`
	`297`	`+ return new FunctionDefineStatement(name, arguments, body, getRange(startTokenIndex, index - 1));`
`297`	`298`	`}`
`298`	`299`
`299`	`300`	`private Arguments arguments() {`
`300`	`301`	`// (arg1, arg2, arg3 = expr1, arg4 = expr2)`
`301`	`302`	`final Arguments arguments = new Arguments();`
`302`	`303`	`boolean startsOptionalArgs = false;`
	`304`	`+ final var startTokenIndex = index;`
`303`	`305`	`consume(TokenType.LPAREN);`
`304`	`306`	`while (!match(TokenType.RPAREN)) {`
`305`	`307`	`final String name = consume(TokenType.WORD).text();`
`@@ -313,6 +315,7 @@ private Arguments arguments() {`
`313`	`315`	`}`
`314`	`316`	`match(TokenType.COMMA);`
`315`	`317`	`}`
	`318`	`+ arguments.setRange(getRange(startTokenIndex, index - 1));`
`316`	`319`	`return arguments;`
`317`	`320`	`}`
`318`	`321`
`@@ -802,9 +805,10 @@ private Expression primary() {`
`802`	`805`	`}`
`803`	`806`	`if (match(TokenType.DEF)) {`
`804`	`807`	`// anonymous function def(args) ...`
	`808`	`+ final var startTokenIndex = index - 1;`
`805`	`809`	`final Arguments arguments = arguments();`
`806`	`810`	`final Statement statement = statementBody();`
`807`		`- return new ValueExpression(new UserDefinedFunction(arguments, statement));`
	`811`	`+ return new ValueExpression(new UserDefinedFunction(arguments, statement, getRange(startTokenIndex, index - 1)));`
`808`	`812`	`}`
`809`	`813`	`return variable();`
`810`	`814`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public Value eval() {`
`38`	`38`	`return instantiable.newInstance(ctorArgs());`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`- throw new UnknownClassException(className, getRange());`
	`41`	`+ throw new UnknownClassException(className, range);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// Create an instance and put evaluated fields with method declarations`
`@@ -49,7 +49,7 @@ public Value eval() {`
`49`	`49`	`instance.addField(fieldName, f.eval());`
`50`	`50`	`}`
`51`	`51`	`for (FunctionDefineStatement m : cd.methods) {`
`52`		`- instance.addMethod(m.name, new ClassMethod(m.arguments, m.body, instance));`
	`52`	`+ instance.addMethod(m.name, new ClassMethod(m.arguments, m.body, instance, m.getRange()));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// Call a constructor`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public Node visit(FunctionDefineStatement s, T t) {`
`174`	`174`
`175`	`175`	`final Node body = s.body.accept(this, t);`
`176`	`176`	`if (changed \|\| body != s.body) {`
`177`		`- return new FunctionDefineStatement(s.name, newArgs, consumeStatement(body));`
	`177`	`+ return new FunctionDefineStatement(s.name, newArgs, consumeStatement(body), s.getRange());`
`178`	`178`	`}`
`179`	`179`	`return s;`
`180`	`180`	`}`
`@@ -423,7 +423,7 @@ public UserDefinedFunction visit(UserDefinedFunction s, T t) {`
`423`	`423`
`424`	`424`	`final Node body = s.body.accept(this, t);`
`425`	`425`	`if (changed \|\| body != s.body) {`
`426`		`- return new UserDefinedFunction(newArgs, consumeStatement(body));`
	`426`	`+ return new UserDefinedFunction(newArgs, consumeStatement(body), s.getRange());`
`427`	`427`	`}`
`428`	`428`	`return s;`
`429`	`429`	`}`
`@@ -432,6 +432,7 @@ public UserDefinedFunction visit(UserDefinedFunction s, T t) {`
`432`	`432`
`433`	`433`	`protected boolean visit(final Arguments in, final Arguments out, T t) {`
`434`	`434`	`boolean changed = false;`
	`435`	`+ out.setRange(in.getRange());`
`435`	`436`	`for (Argument argument : in) {`
`436`	`437`	`final Expression valueExpr = argument.valueExpr();`
`437`	`438`	`if (valueExpr == null) {`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ public void testProgram(InputSource inputSource) {`
`97`	`97`	`.perform(stagesData, ex.getParseErrors());`
`98`	`98`	`fail(inputSource + "\n" + error, ex);`
`99`	`99`	`} catch (Exception oae) {`
`100`		`- fail(inputSource.toString(), oae);`
`101`	`100`	`Console.handleException(stagesData, Thread.currentThread(), oae);`
	`101`	`+ fail(inputSource.toString(), oae);`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`