You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/02/29 09:19:57 UTC

[groovy] branch GROOVY_3_0_X updated (bcb2f82 -> 76df80d)

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.


    from bcb2f82  GROOVY-9427: Regression in GString handling
     new d1cdee4  Tweak the message for debugging
     new 76df80d  Add a comment for parsing GString

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:
 src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java                | 2 +-
 .../src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


[groovy] 02/02: Add a comment for parsing GString

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 76df80d5e8f90606c36d96100a4c82f5746cf0fd
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Feb 29 17:17:25 2020 +0800

    Add a comment for parsing GString
    
    (cherry picked from commit 01f7cfe715f32a4485b72f9a5154467bf61bbcfa)
---
 .../src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index ba6e1c4..e0a1cad 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -3545,7 +3545,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
                             return expression;
                         }
                     }
-                } else if (0 == size) {
+                } else if (0 == size) { // e.g. "${}"
                     return configureAST(new ConstantExpression(null), ctx);
                 }
 


[groovy] 01/02: Tweak the message for debugging

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit d1cdee44ad90f503e3add5fbb876bab1923ba435
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Feb 29 17:15:07 2020 +0800

    Tweak the message for debugging
    
    (cherry picked from commit c5bb733be5c0a607e86ccc08f71bbe53f6f08134)
---
 src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 1a87b8f..3784de3 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -96,7 +96,7 @@ public class Java9 extends Java8 {
             }
         } catch (Exception ignore) {
             if (LOGGER.isLoggable(Level.FINEST)) {
-                LOGGER.finest("Failed to find default imported classes:\n" + DefaultGroovyMethods.asString(ignore));
+                LOGGER.finest("[WARNING] Failed to find default imported classes:\n" + DefaultGroovyMethods.asString(ignore));
             }
         }