Skip to content

GROOVY-11823: try super.propertyMissing(name) before outer class #2360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eric-milles wants to merge 1 commit into
base: master
Choose a base branch
from
+65 −9
Open

GROOVY-11823: try super.propertyMissing(name) before outer class #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/groovy/lang/MetaClassImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,8 +866,8 @@ public Object invokeMissingProperty(final Object instance, final String property
} catch (InvokerInvocationException iie) {
boolean shouldHandle = isGetter && propertyMissingGet != null;
if (!shouldHandle) shouldHandle = !isGetter && propertyMissingSet != null;
if (shouldHandle && iie.getCause() instanceof MissingPropertyException) {
throw (MissingPropertyException) iie.getCause();
if (shouldHandle && iie.getCause() instanceof MissingPropertyException mpe) {
throw mpe;
}
throw iie;
}
Expand Down
50 changes: 43 additions & 7 deletions src/main/java/org/codehaus/groovy/classgen/InnerClassCompletionVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.codehaus.groovy.classgen;

import groovy.lang.MissingMethodException;
import groovy.lang.MissingPropertyException;
import groovy.transform.CompileStatic;
import groovy.transform.stc.POJO;
import org.codehaus.groovy.ast.ClassHelper;
Expand All @@ -29,11 +27,13 @@
import org.codehaus.groovy.ast.InnerClassNode;
import org.codehaus.groovy.ast.MethodNode;
import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.expr.ConstantExpression;
import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.ast.expr.TupleExpression;
import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.Statement;
import org.codehaus.groovy.ast.stmt.TryCatchStatement;
import org.codehaus.groovy.classgen.asm.BytecodeHelper;
import org.codehaus.groovy.control.CompilationUnit;
Expand All @@ -56,17 +56,22 @@
import static org.codehaus.groovy.ast.ClassHelper.VOID_TYPE;
import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
import static org.codehaus.groovy.ast.tools.GeneralUtils.block;
import static org.codehaus.groovy.ast.tools.GeneralUtils.callSuperX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.castX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.catchS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.classX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.constX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorSuperX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorThisX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.notX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.nullX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.param;
import static org.codehaus.groovy.ast.tools.GeneralUtils.params;
import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt;
import static org.codehaus.groovy.ast.tools.GeneralUtils.throwS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.tryCatchS;
Expand Down Expand Up @@ -348,25 +353,56 @@ public void visit(final MethodVisitor mv) {
final ClassNode returnType, final Parameter[] parameters, final BiConsumer<BlockStatement, Parameter[]> consumer) {
MethodNode method = innerClass.getDeclaredMethod(methodName, parameters);
if (method == null) {
ClassNode mme = ClassHelper.make(groovy.lang.MissingMethodException.class);
ClassNode mpe = ClassHelper.make(groovy.lang.MissingPropertyException.class);

// try {
// <consumer dispatch>
// } catch (MissingMethodException notFound) {
// throw new MissingMethodException(notFound.method, this, notFound.arguments)
// }
Parameter catchParam = param(OBJECT_TYPE, "notFound"); // dummy type
ClassNode exceptionT;
Expression newException;
Expression selfType = varX("this");
if ((modifiers & ACC_STATIC) == 0) selfType = callX(selfType, "getClass");
if (methodName.endsWith("methodMissing")) {
exceptionT = ClassHelper.make(MissingMethodException.class);
exceptionT = mme;
newException = ctorX(exceptionT, args(propX(varX(catchParam),"method"), selfType, propX(varX(catchParam),"arguments")));
} else {
exceptionT = ClassHelper.make(MissingPropertyException.class);
exceptionT = mpe;
newException = ctorX(exceptionT, args(propX(varX(catchParam), "property"), selfType, propX(varX(catchParam), "cause")));
}

catchParam.setType(exceptionT);
catchParam.setOriginType(exceptionT);
BlockStatement handleMissing = block();
consumer.accept(handleMissing, parameters);
TryCatchStatement methodBody = tryCatchS(handleMissing);
methodBody.addCatch(catchS(catchParam, throwS(newException)));
TryCatchStatement tryCatch = tryCatchS(handleMissing);
tryCatch.addCatch(catchS(catchParam, throwS(newException)));

Statement methodBody = tryCatch;
if ((modifiers & ACC_STATIC) == 0) { // GROOVY-11823
// if (!"methodMissing".equals(name))
Expression noRecursion = notX(callX(constX(methodName), "equals", varX(parameters[0])));
// try {
// return super.methodMissing(name,args)
// } catch (MissingMethodException ignore) {
// } catch (MissingPropertyException ignore) {
// }
BlockStatement trySuperClass = block();
if (!ClassHelper.isPrimitiveVoid(returnType)) {
trySuperClass.addStatement(returnS(callSuperX(methodName, args(parameters))));
} else {
trySuperClass.addStatement(stmt(callSuperX(methodName, args(parameters))));
trySuperClass.addStatement(returnS(ConstantExpression.EMPTY_EXPRESSION));
}
tryCatch = tryCatchS(trySuperClass);
tryCatch.addCatch(catchS(param(mme, "ignore"), block()));
if (methodName.equals("propertyMissing"))
tryCatch.addCatch(catchS(param(mpe, "ignore"), block()));

methodBody = block(ifS(noRecursion, tryCatch), methodBody);
}
innerClass.addSyntheticMethod(methodName, modifiers, returnType, parameters, ClassNode.EMPTY_ARRAY, methodBody);

// if there is a user-defined method, add compiler error and continue
Expand Down
20 changes: 20 additions & 0 deletions src/test/groovy/gls/innerClass/InnerClassTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2228,6 +2228,7 @@ final class InnerClassTest {
def err = shouldFail """
class Upper {
$returnType propertyMissing(String name, Object value) {
throw new MissingPropertyException(name, getClass())
}
}
class Outer {
Expand All @@ -2239,6 +2240,25 @@ final class InnerClassTest {
assert err =~ /No such property: missing for class: Outer.Inner/
}

// GROOVY-11823
@Test
void testNestedPropertyHandling5() {
assertScript '''
class Upper {
Object propertyMissing(String name) {
if (name == 'fizz') return 'buzz'
throw new MissingPropertyException(name, getClass())
}
}
class Outer {
static class Inner extends Upper {
}
}
def inner = new Outer.Inner()
assert inner.fizz == 'buzz'
'''
}

// GROOVY-7312
@Test
void testInnerClassOfInterfaceIsStatic() {
Expand Down