You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/03/26 15:29:30 UTC
[groovy] branch GROOVY_3_0_X updated (f09f1aa -> 5dd38b7)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from f09f1aa GROOVY-9480: New v9 ClassFinder throws NoSuchFileException/UnsupportedOperationException and writes it to stderr (#1205)
new 05d63f3 Revert "GROOVY-9440: Missing line number information in stack trace (provide fallback)"
new 5dd38b7 GROOVY-9459: Line number information for automatically inserted return statements slightly different for 2.5 vs 3.0 (provide fallback)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[groovy] 02/02: GROOVY-9459: Line number information for
automatically inserted return statements slightly different for 2.5 vs 3.0
(provide fallback)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5dd38b7207d4703c56b144ca482eb0c5a3621959
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Mar 27 01:28:07 2020 +1000
GROOVY-9459: Line number information for automatically inserted return statements slightly different for 2.5 vs 3.0 (provide fallback)
If the approach now taken in 3.0 (which we believe is the preferred approach) would yield no line number info, fall back to the approach used for 2.5
---
src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
index f8f3bf4..b206c16 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
@@ -114,7 +114,7 @@ public class ReturnAdder {
Expression expression = ((ExpressionStatement) statement).getExpression();
ReturnStatement returnStatement = new ReturnStatement(expression);
returnStatement.copyStatementLabels(statement);
- returnStatement.setSourcePosition(statement);
+ returnStatement.setSourcePosition(statement.getLineNumber() < 0 ? expression : statement);
listener.returnStatementAdded(returnStatement);
return returnStatement;
}
[groovy] 01/02: Revert "GROOVY-9440: Missing line number
information in stack trace (provide fallback)"
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 05d63f36f458406442f804daa7f90a7d6347963f
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Mar 27 01:22:05 2020 +1000
Revert "GROOVY-9440: Missing line number information in stack trace (provide fallback)"
This reverts commit a01d7fbd
---
src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
index b206c16..f8f3bf4 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ReturnAdder.java
@@ -114,7 +114,7 @@ public class ReturnAdder {
Expression expression = ((ExpressionStatement) statement).getExpression();
ReturnStatement returnStatement = new ReturnStatement(expression);
returnStatement.copyStatementLabels(statement);
- returnStatement.setSourcePosition(statement.getLineNumber() < 0 ? expression : statement);
+ returnStatement.setSourcePosition(statement);
listener.returnStatementAdded(returnStatement);
return returnStatement;
}