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 2019/09/29 00:57:40 UTC
[groovy] branch master updated: prepare for removal of antlr2
parser: move used utility method into separate helper class
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new b77a546 prepare for removal of antlr2 parser: move used utility method into separate helper class
b77a546 is described below
commit b77a546fef233d1ddfe3feaa368b441685976d52
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Sep 29 10:57:28 2019 +1000
prepare for removal of antlr2 parser: move used utility method into separate helper class
---
.../codehaus/groovy/antlr/AntlrParserPlugin.java | 27 ++-------------
.../org/codehaus/groovy/antlr/PrimitiveHelper.java | 39 ++++++++++++++++++++++
.../transform/AutoImplementASTTransformation.java | 2 +-
3 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index 8e8fe06..a228da2 100644
--- a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -1097,32 +1097,9 @@ public class AntlrParserPlugin extends ASTHelper implements ParserPlugin, Groovy
}
}
+ @Deprecated
public static Expression getDefaultValueForPrimitive(ClassNode type) {
- if (type == ClassHelper.int_TYPE) {
- return new ConstantExpression(0);
- }
- if (type == ClassHelper.long_TYPE) {
- return new ConstantExpression(0L);
- }
- if (type == ClassHelper.double_TYPE) {
- return new ConstantExpression(0.0);
- }
- if (type == ClassHelper.float_TYPE) {
- return new ConstantExpression(0.0F);
- }
- if (type == ClassHelper.boolean_TYPE) {
- return ConstantExpression.FALSE;
- }
- if (type == ClassHelper.short_TYPE) {
- return new ConstantExpression((short) 0);
- }
- if (type == ClassHelper.byte_TYPE) {
- return new ConstantExpression((byte) 0);
- }
- if (type == ClassHelper.char_TYPE) {
- return new ConstantExpression((char) 0);
- }
- return null;
+ return PrimitiveHelper.getDefaultValueForPrimitive(type);
}
protected ClassNode[] interfaces(AST node) {
diff --git a/src/main/java/org/codehaus/groovy/antlr/PrimitiveHelper.java b/src/main/java/org/codehaus/groovy/antlr/PrimitiveHelper.java
new file mode 100644
index 0000000..ae053b0
--- /dev/null
+++ b/src/main/java/org/codehaus/groovy/antlr/PrimitiveHelper.java
@@ -0,0 +1,39 @@
+package org.codehaus.groovy.antlr;
+
+import org.codehaus.groovy.ast.ClassHelper;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.Expression;
+
+public class PrimitiveHelper {
+ private PrimitiveHelper() {
+ }
+
+ public static Expression getDefaultValueForPrimitive(ClassNode type) {
+ if (type == ClassHelper.int_TYPE) {
+ return new ConstantExpression(0);
+ }
+ if (type == ClassHelper.long_TYPE) {
+ return new ConstantExpression(0L);
+ }
+ if (type == ClassHelper.double_TYPE) {
+ return new ConstantExpression(0.0);
+ }
+ if (type == ClassHelper.float_TYPE) {
+ return new ConstantExpression(0.0F);
+ }
+ if (type == ClassHelper.boolean_TYPE) {
+ return ConstantExpression.FALSE;
+ }
+ if (type == ClassHelper.short_TYPE) {
+ return new ConstantExpression((short) 0);
+ }
+ if (type == ClassHelper.byte_TYPE) {
+ return new ConstantExpression((byte) 0);
+ }
+ if (type == ClassHelper.char_TYPE) {
+ return new ConstantExpression((char) 0);
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
index 67745f8..985e8a7 100644
--- a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
@@ -44,7 +44,7 @@ import java.util.Map;
import static org.apache.groovy.ast.tools.ClassNodeUtils.addGeneratedMethod;
import static org.apache.groovy.ast.tools.MethodNodeUtils.methodDescriptorWithoutReturnType;
-import static org.codehaus.groovy.antlr.AntlrParserPlugin.getDefaultValueForPrimitive;
+import static org.codehaus.groovy.antlr.PrimitiveHelper.getDefaultValueForPrimitive;
import static org.codehaus.groovy.ast.ClassHelper.make;
import static org.codehaus.groovy.ast.expr.ArgumentListExpression.EMPTY_ARGUMENTS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.constX;