Skip to content

Commit

Permalink
Update the Groovy plug-in to 2.4.20
Browse files Browse the repository at this point in the history 
#1144
  • Loading branch information
@eric-milles
eric-milles committed Jul 22, 2020
1 parent dd5f3bc commit 64e1267
Show file tree
Hide file tree
Showing 24 changed files with 1,088 additions and 140 deletions.
2 changes: 1 addition & 1 deletion ...e.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ protected String[] getDefaultClassPaths() {
System.arraycopy(cps, 0, newcps, 0, cps.length);

String[] ivyVersions = {"2.5.0", "2.4.0"};
String[] groovyVersions = {"3.0.4-indy", "2.5.12-indy", "2.4.19"};
String[] groovyVersions = {"3.0.4-indy", "2.5.12-indy", "2.4.20"};
try {
URL groovyJar = null;
for (String groovyVer : groovyVersions) {
Expand Down
20 changes: 17 additions & 3 deletions ...vy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4149,13 +4149,19 @@ public void testReferencingFields_DirectAccess6() {
};
//@formatter:on

runConformTest(sources, "private".equals(modifier) ? "C" : "A"); // TODO: MetaClassImpl.getAttribute(Class,Object,String,boolean) drops super
if (!"private".equals(modifier)) {
runConformTest(sources, "A");
} else if (isAtLeastGroovy(25)) {
runConformTest(sources, "C"); // MetaClassImpl.getAttribute(Class,Object,String,boolean) drops super
} else {
runConformTest(sources, "", "groovy.lang.MissingFieldException: No such field: field for class: A");
}
}
}

@Test
public void testReferencingFields_DirectAccess7() {
for (String modifier : new String[] {"public", "protected", "@groovy.transform.PackageScope", /*GROOVY-8999: "private"*/}) {
for (String modifier : new String[] {"public", "protected", "@groovy.transform.PackageScope", "private"}) {
//@formatter:off
String[] sources = {
"Main.groovy",
Expand All @@ -4177,7 +4183,15 @@ public void testReferencingFields_DirectAccess7() {
};
//@formatter:on

runConformTest(sources, "x");
if (!"private".equals(modifier)) {
runConformTest(sources, "x");
} else if (isAtLeastGroovy(30)) {
runConformTest(sources, "", "groovy.lang.MissingFieldException: No such field: field for class: C"); // GROOVY-8999
} else if (isAtLeastGroovy(25)) {
runConformTest(sources, "A"); // GROOVY-8999
} else {
runConformTest(sources, "", "groovy.lang.MissingFieldException: No such field: field for class: A");
}
}
}

Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy24/.checkstyle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<file-match-pattern match-pattern="groovy/classgen/asm/BinaryExpressionHelper.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/BytecodeHelper.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/CompileStack.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/InvocationWriter.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/StatementWriter.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticInvocationWriter.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticPropertyAccessHelper.java" include-pattern="false" />
Expand Down
4 changes: 2 additions & 2 deletions base/org.codehaus.groovy24/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy24/lib/ivy-2.4.0-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-all-2.4.19.jar" sourcepath="lib/groovy-all-2.4.19-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-all-2.4.20.jar" sourcepath="lib/groovy-all-2.4.20-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy24/lib/groovy-all-2.4.19-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy24/lib/groovy-all-2.4.20-javadoc.jar!/" />
</attributes>
</classpathentry>

Expand Down
210 changes: 105 additions & 105 deletions base/org.codehaus.groovy24/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,116 +4,116 @@ Bundle-SymbolicName: org.codehaus.groovy
Automatic-Module-Name: org.codehaus.groovy
Bundle-Name: Apache Groovy
Bundle-Vendor: Pivotal Software, Inc.
Bundle-Version: 2.4.19.qualifier
Bundle-Version: 2.4.20.qualifier
Bundle-ClassPath: eclipse-trace.jar,
groovy-eclipse.jar,
lib/ivy-2.4.0.jar,
lib/groovy-all-2.4.19.jar
Export-Package: groovy.beans;version="2.4.19",
groovy.grape;version="2.4.19",
groovy.inspect;version="2.4.19",
groovy.inspect.swingui;version="2.4.19",
groovy.io;version="2.4.19",
groovy.jmx.builder;version="2.4.19",
groovy.json;version="2.4.19",
groovy.json.internal;version="2.4.19",
groovy.lang;version="2.4.19",
groovy.mock.interceptor;version="2.4.19",
groovy.model;version="2.4.19",
groovy.security;version="2.4.19",
groovy.servlet;version="2.4.19",
groovy.sql;version="2.4.19",
groovy.swing;version="2.4.19",
groovy.swing.binding;version="2.4.19",
groovy.swing.factory;version="2.4.19",
groovy.swing.impl;version="2.4.19",
groovy.test;version="2.4.19",
groovy.text;version="2.4.19",
groovy.text.markup;version="2.4.19",
groovy.time;version="2.4.19",
groovy.transform;version="2.4.19",
groovy.transform.builder;version="2.4.19",
groovy.transform.stc;version="2.4.19",
groovy.ui;version="2.4.19",
groovy.ui.icons;version="2.4.19",
groovy.ui.text;version="2.4.19",
groovy.ui.view;version="2.4.19",
groovy.util;version="2.4.19",
groovy.util.logging;version="2.4.19",
groovy.util.slurpersupport;version="2.4.19",
groovy.xml;version="2.4.19",
groovy.xml.dom;version="2.4.19",
groovy.xml.streamingmarkupsupport;version="2.4.19",
lib/groovy-all-2.4.20.jar
Export-Package: groovy.beans;version="2.4.20",
groovy.grape;version="2.4.20",
groovy.inspect;version="2.4.20",
groovy.inspect.swingui;version="2.4.20",
groovy.io;version="2.4.20",
groovy.jmx.builder;version="2.4.20",
groovy.json;version="2.4.20",
groovy.json.internal;version="2.4.20",
groovy.lang;version="2.4.20",
groovy.mock.interceptor;version="2.4.20",
groovy.model;version="2.4.20",
groovy.security;version="2.4.20",
groovy.servlet;version="2.4.20",
groovy.sql;version="2.4.20",
groovy.swing;version="2.4.20",
groovy.swing.binding;version="2.4.20",
groovy.swing.factory;version="2.4.20",
groovy.swing.impl;version="2.4.20",
groovy.test;version="2.4.20",
groovy.text;version="2.4.20",
groovy.text.markup;version="2.4.20",
groovy.time;version="2.4.20",
groovy.transform;version="2.4.20",
groovy.transform.builder;version="2.4.20",
groovy.transform.stc;version="2.4.20",
groovy.ui;version="2.4.20",
groovy.ui.icons;version="2.4.20",
groovy.ui.text;version="2.4.20",
groovy.ui.view;version="2.4.20",
groovy.util;version="2.4.20",
groovy.util.logging;version="2.4.20",
groovy.util.slurpersupport;version="2.4.20",
groovy.xml;version="2.4.20",
groovy.xml.dom;version="2.4.20",
groovy.xml.streamingmarkupsupport;version="2.4.20",
groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
org.apache.groovy.io;version="2.4.19",
org.apache.groovy.util;version="2.4.19",
org.codehaus.groovy;version="2.4.19",
org.codehaus.groovy.ant;version="2.4.19",
org.codehaus.groovy.antlr;version="2.4.19",
org.codehaus.groovy.antlr.parser;version="2.4.19",
org.codehaus.groovy.ast;version="2.4.19",
org.codehaus.groovy.ast.builder;version="2.4.19",
org.codehaus.groovy.ast.expr;version="2.4.19",
org.codehaus.groovy.ast.stmt;version="2.4.19",
org.codehaus.groovy.ast.tools;version="2.4.19",
org.codehaus.groovy.binding;version="2.4.19",
org.codehaus.groovy.bsf;version="2.4.19",
org.codehaus.groovy.classgen;version="2.4.19",
org.codehaus.groovy.classgen.asm;version="2.4.19",
org.codehaus.groovy.classgen.asm.indy;version="2.4.19",
org.codehaus.groovy.classgen.asm.sc;version="2.4.19",
org.codehaus.groovy.cli;version="2.4.19",
org.codehaus.groovy.control;version="2.4.19",
org.codehaus.groovy.control.customizers;version="2.4.19",
org.codehaus.groovy.control.customizers.builder;version="2.4.19",
org.codehaus.groovy.control.io;version="2.4.19",
org.codehaus.groovy.control.messages;version="2.4.19",
org.apache.groovy.io;version="2.4.20",
org.apache.groovy.util;version="2.4.20",
org.codehaus.groovy;version="2.4.20",
org.codehaus.groovy.ant;version="2.4.20",
org.codehaus.groovy.antlr;version="2.4.20",
org.codehaus.groovy.antlr.parser;version="2.4.20",
org.codehaus.groovy.ast;version="2.4.20",
org.codehaus.groovy.ast.builder;version="2.4.20",
org.codehaus.groovy.ast.expr;version="2.4.20",
org.codehaus.groovy.ast.stmt;version="2.4.20",
org.codehaus.groovy.ast.tools;version="2.4.20",
org.codehaus.groovy.binding;version="2.4.20",
org.codehaus.groovy.bsf;version="2.4.20",
org.codehaus.groovy.classgen;version="2.4.20",
org.codehaus.groovy.classgen.asm;version="2.4.20",
org.codehaus.groovy.classgen.asm.indy;version="2.4.20",
org.codehaus.groovy.classgen.asm.sc;version="2.4.20",
org.codehaus.groovy.cli;version="2.4.20",
org.codehaus.groovy.control;version="2.4.20",
org.codehaus.groovy.control.customizers;version="2.4.20",
org.codehaus.groovy.control.customizers.builder;version="2.4.20",
org.codehaus.groovy.control.io;version="2.4.20",
org.codehaus.groovy.control.messages;version="2.4.20",
org.codehaus.groovy.eclipse,
org.codehaus.groovy.groovydoc;version="2.4.19",
org.codehaus.groovy.jsr223;version="2.4.19",
org.codehaus.groovy.plugin;version="2.4.19",
org.codehaus.groovy.reflection;version="2.4.19",
org.codehaus.groovy.reflection.android;version="2.4.19",
org.codehaus.groovy.reflection.stdclasses;version="2.4.19",
org.codehaus.groovy.reflection.v7;version="2.4.19",
org.codehaus.groovy.runtime;version="2.4.19",
org.codehaus.groovy.runtime.callsite;version="2.4.19",
org.codehaus.groovy.runtime.dgmimpl;version="2.4.19",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.4.19",
org.codehaus.groovy.runtime.m12n;version="2.4.19",
org.codehaus.groovy.runtime.memoize;version="2.4.19",
org.codehaus.groovy.runtime.metaclass;version="2.4.19",
org.codehaus.groovy.runtime.powerassert;version="2.4.19",
org.codehaus.groovy.runtime.typehandling;version="2.4.19",
org.codehaus.groovy.runtime.wrappers;version="2.4.19",
org.codehaus.groovy.syntax;version="2.4.19",
org.codehaus.groovy.testng;version="2.4.19",
org.codehaus.groovy.tools;version="2.4.19",
org.codehaus.groovy.tools.ast;version="2.4.19",
org.codehaus.groovy.tools.groovydoc;version="2.4.19",
org.codehaus.groovy.tools.groovydoc.gstringTemplates;version="2.4.19",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.classLevel;version="2.4.19",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.packageLevel;version="2.4.19",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.topLevel;version="2.4.19",
org.codehaus.groovy.tools.gse;version="2.4.19",
org.codehaus.groovy.tools.javac;version="2.4.19",
org.codehaus.groovy.tools.shell;version="2.4.19",
org.codehaus.groovy.tools.shell.commands;version="2.4.19",
org.codehaus.groovy.tools.shell.completion;version="2.4.19",
org.codehaus.groovy.tools.shell.util;version="2.4.19",
org.codehaus.groovy.tools.xml;version="2.4.19",
org.codehaus.groovy.transform;version="2.4.19",
org.codehaus.groovy.transform.sc;version="2.4.19",
org.codehaus.groovy.transform.sc.transformers;version="2.4.19",
org.codehaus.groovy.transform.stc;version="2.4.19",
org.codehaus.groovy.transform.tailrec;version="2.4.19",
org.codehaus.groovy.transform.trait;version="2.4.19",
org.codehaus.groovy.util;version="2.4.19",
org.codehaus.groovy.vmplugin;version="2.4.19",
org.codehaus.groovy.vmplugin.v5;version="2.4.19",
org.codehaus.groovy.vmplugin.v6;version="2.4.19",
org.codehaus.groovy.vmplugin.v7;version="2.4.19",
org.codehaus.groovy.vmplugin.v8;version="2.4.19"
org.codehaus.groovy.groovydoc;version="2.4.20",
org.codehaus.groovy.jsr223;version="2.4.20",
org.codehaus.groovy.plugin;version="2.4.20",
org.codehaus.groovy.reflection;version="2.4.20",
org.codehaus.groovy.reflection.android;version="2.4.20",
org.codehaus.groovy.reflection.stdclasses;version="2.4.20",
org.codehaus.groovy.reflection.v7;version="2.4.20",
org.codehaus.groovy.runtime;version="2.4.20",
org.codehaus.groovy.runtime.callsite;version="2.4.20",
org.codehaus.groovy.runtime.dgmimpl;version="2.4.20",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="2.4.20",
org.codehaus.groovy.runtime.m12n;version="2.4.20",
org.codehaus.groovy.runtime.memoize;version="2.4.20",
org.codehaus.groovy.runtime.metaclass;version="2.4.20",
org.codehaus.groovy.runtime.powerassert;version="2.4.20",
org.codehaus.groovy.runtime.typehandling;version="2.4.20",
org.codehaus.groovy.runtime.wrappers;version="2.4.20",
org.codehaus.groovy.syntax;version="2.4.20",
org.codehaus.groovy.testng;version="2.4.20",
org.codehaus.groovy.tools;version="2.4.20",
org.codehaus.groovy.tools.ast;version="2.4.20",
org.codehaus.groovy.tools.groovydoc;version="2.4.20",
org.codehaus.groovy.tools.groovydoc.gstringTemplates;version="2.4.20",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.classLevel;version="2.4.20",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.packageLevel;version="2.4.20",
org.codehaus.groovy.tools.groovydoc.gstringTemplates.topLevel;version="2.4.20",
org.codehaus.groovy.tools.gse;version="2.4.20",
org.codehaus.groovy.tools.javac;version="2.4.20",
org.codehaus.groovy.tools.shell;version="2.4.20",
org.codehaus.groovy.tools.shell.commands;version="2.4.20",
org.codehaus.groovy.tools.shell.completion;version="2.4.20",
org.codehaus.groovy.tools.shell.util;version="2.4.20",
org.codehaus.groovy.tools.xml;version="2.4.20",
org.codehaus.groovy.transform;version="2.4.20",
org.codehaus.groovy.transform.sc;version="2.4.20",
org.codehaus.groovy.transform.sc.transformers;version="2.4.20",
org.codehaus.groovy.transform.stc;version="2.4.20",
org.codehaus.groovy.transform.tailrec;version="2.4.20",
org.codehaus.groovy.transform.trait;version="2.4.20",
org.codehaus.groovy.util;version="2.4.20",
org.codehaus.groovy.vmplugin;version="2.4.20",
org.codehaus.groovy.vmplugin.v5;version="2.4.20",
org.codehaus.groovy.vmplugin.v6;version="2.4.20",
org.codehaus.groovy.vmplugin.v7;version="2.4.20",
org.codehaus.groovy.vmplugin.v8;version="2.4.20"
Require-Bundle: org.eclipse.core.runtime,
org.junit;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy24/VERSION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
2019-05-10: GROOVY_2_4_17
2020-01-14: GROOVY_2_4_18
2020-03-03: GROOVY_2_4_19
2020-07-22: GROOVY_2_4_20
10 changes: 5 additions & 5 deletions base/org.codehaus.groovy24/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ <h3>License</h3>

<h3>Third Party Content</h3>

<h4>groovy-all-2.4.19.jar</h4>
<h4>groovy-all-2.4.20.jar</h4>

<ul>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.19.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.19.zip</a></li>
<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-2.4.19.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-2.4.19.zip</a></li>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.20.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.20.zip</a></li>
<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-2.4.20.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-2.4.20.zip</a></li>
<li>License kind: ASL</li>
<li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
Expand All @@ -47,7 +47,7 @@ <h4>ivy-2.4.0.jar</h4>
<h4>commons-cli-1.2.jar</h4>

<ul>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.19.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.19.zip</a></li>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.20.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.20.zip</a></li>
<li>License kind: ASL</li>
<li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
Expand All @@ -56,7 +56,7 @@ <h4>commons-cli-1.2.jar</h4>
<h4>jline-2.12.jar</h4>

<ul>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.19.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.19.zip</a></li>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.20.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.4.20.zip</a></li>
<li>License kind: BSD</li>
<li>License URL: <a href="https://www.opensource.org/licenses/bsd-license.php">https://www.opensource.org/licenses/bsd-license.php</a></li>
<li>License text: <a href="about_files/jline2-license.txt">jline2-license.txt</a></li>
Expand Down
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy24/build.antlr2x
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project default="build">

<target name="build" depends="clean">
<java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-all-2.4.19.jar" dir="${basedir}" fork="true">
<java classname="groovyjarjarantlr.Tool" classpath="../../../../../lib/groovy-all-2.4.20.jar" dir="${basedir}" fork="true">
<arg line="-o parser groovy.g" />
</java>
<replaceregexp byline="true" flags="g" match="\bimport antlr." replace="import groovyjarjarantlr.">
Expand Down
Binary file removed base/org.codehaus.groovy24/lib/groovy-all-2.4.19-javadoc.jar
View file
Binary file not shown.
Binary file added base/org.codehaus.groovy24/lib/groovy-all-2.4.20-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...roovy24/lib/groovy-all-2.4.19-sources.jar → ...roovy24/lib/groovy-all-2.4.20-sources.jar
View file
Binary file not shown.
Binary file renamed ...dehaus.groovy24/lib/groovy-all-2.4.19.jar → ...dehaus.groovy24/lib/groovy-all-2.4.20.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy24/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>org.codehaus.groovy.eclipse</groupId>
<artifactId>org.codehaus.groovy</artifactId>
<version>2.4.19-SNAPSHOT</version>
<version>2.4.20-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
10 changes: 8 additions & 2 deletions base/org.codehaus.groovy24/src/org/codehaus/groovy/ast/ModuleNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.codehaus.groovy.ast.expr.ClassExpression;
import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
import org.codehaus.groovy.ast.expr.MethodCallExpression;
import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.ExpressionStatement;
Expand Down Expand Up @@ -344,12 +345,17 @@ protected ClassNode createStatementsClass() {
new Parameter[] {makeFinal(new Parameter(ClassHelper.STRING_TYPE.makeArray(), "args"))},
ClassNode.EMPTY_ARRAY,
new ExpressionStatement(
/* GRECLIPSE edit
new MethodCallExpression(
new ClassExpression(ClassHelper.make(InvokerHelper.class)),
*/
new StaticMethodCallExpression(
ClassHelper.make(InvokerHelper.class),
// GRECLIPSE end
"runScript",
new ArgumentListExpression(
new ClassExpression(classNode),
new VariableExpression("args"))))));
new ClassExpression(classNode),
new VariableExpression("args"))))));

MethodNode methodNode = new MethodNode("run", ACC_PUBLIC, ClassHelper.OBJECT_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, statementBlock);
methodNode.setIsScriptBody();
Expand Down
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy24/src/org/codehaus/groovy/classgen/AsmClassGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2274,7 +2274,7 @@ public static boolean isThisExpression(Expression expression) {
return false;
}

private static boolean isSuperExpression(Expression expression) {
public static boolean isSuperExpression(Expression expression) {
if (expression instanceof VariableExpression) {
VariableExpression varExp = (VariableExpression) expression;
return varExp.getName().equals("super");
Expand Down
Loading

0 comments on commit 64e1267

Please sign in to comment.