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 2018/02/17 17:56:31 UTC
[2/3] groovy git commit: Revert error message for invalid `void`
Revert error message for invalid `void`
(cherry picked from commit a1a3746)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e4133b54
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e4133b54
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e4133b54
Branch: refs/heads/GROOVY_2_6_X
Commit: e4133b5432ef45e853894c682acab07afaecc640
Parents: ac14692
Author: danielsun1106 <re...@hotmail.com>
Authored: Sun Feb 18 00:43:41 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Sun Feb 18 01:47:04 2018 +0800
----------------------------------------------------------------------
.../main/java/org/apache/groovy/parser/antlr4/AstBuilder.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e4133b54/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
----------------------------------------------------------------------
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 28d31b3..8be9554 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
@@ -3943,7 +3943,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
if (!asBoolean(classNode)) {
- // TODO refine error message for `void`
+ if (VOID_STR.equals(ctx.getText())) { // TODO refine error message for `void`
+ throw createParsingFailedException("void is not allowed here", ctx);
+ }
+
throw createParsingFailedException("Unsupported type: " + ctx.getText(), ctx);
}