Allow static methods for Scarpet Functions
What was I thinking?
This commit is contained in:
2 files changed
+6
-8
No files matched your search
@@ -84,9 +84,8 @@ public final class AnnotationParser
|
|||||||
* <p>There is a set of requirements for the class and its methods:</p>
|
* <p>There is a set of requirements for the class and its methods:</p>
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li>Class must be concrete. That is, no interfaces or abstract classes should be passed</li>
|
* <li>Class must be concrete. That is, no interfaces or abstract classes should be passed</li>
|
||||||
* <li>Class must have the default constructor (or an equivalent) available. That is done in order to not need the {@code static} modifier in every method, making them faster to
|
* <li>Class must have the default constructor (or an equivalent) available. That is done in order to not need the {@code static} modifier in every
|
||||||
* code and simpler to look at.</li>
|
* method, making them faster to code and simpler to look at.</li>
|
||||||
* <li>Annotated methods must not be {@code static}. See claim above</li>
|
|
||||||
* <li>Annotated methods must not throw checked exceptions. They can throw regular {@link RuntimeException}s (including but not limited to
|
* <li>Annotated methods must not throw checked exceptions. They can throw regular {@link RuntimeException}s (including but not limited to
|
||||||
* {@link InternalExpressionException}).
|
* {@link InternalExpressionException}).
|
||||||
* Basically, it's fine as long as you don't add a {@code throws} declaration to your methods.</li>
|
* Basically, it's fine as long as you don't add a {@code throws} declaration to your methods.</li>
|
||||||
@@ -121,9 +120,7 @@ public final class AnnotationParser
|
|||||||
{
|
{
|
||||||
if (!method.isAnnotationPresent(ScarpetFunction.class))
|
if (!method.isAnnotationPresent(ScarpetFunction.class))
|
||||||
continue;
|
continue;
|
||||||
// Checks
|
|
||||||
if (Modifier.isStatic(method.getModifiers()))
|
|
||||||
throw new IllegalArgumentException("Annotated method '" + method.getName() + "', provided in '" + clazz + "' must not be static");
|
|
||||||
if (method.getExceptionTypes().length != 0)
|
if (method.getExceptionTypes().length != 0)
|
||||||
throw new IllegalArgumentException("Annotated method '" + method.getName() +"', provided in '"+clazz+"' must not declare checked exceptions");
|
throw new IllegalArgumentException("Annotated method '" + method.getName() +"', provided in '"+clazz+"' must not declare checked exceptions");
|
||||||
|
|
||||||
@@ -212,7 +209,8 @@ public final class AnnotationParser
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
MethodHandle tempHandle = MethodHandles.publicLookup().unreflect(method).asFixedArity().asSpreader(Object[].class, this.methodParamCount);
|
MethodHandle tempHandle = MethodHandles.publicLookup().unreflect(method).asFixedArity().asSpreader(Object[].class, this.methodParamCount);
|
||||||
this.handle = tempHandle.asType(tempHandle.type().changeReturnType(Object.class)).bindTo(instance);
|
tempHandle = tempHandle.asType(tempHandle.type().changeReturnType(Object.class));
|
||||||
|
this.handle = Modifier.isStatic(method.getModifiers()) ? tempHandle : tempHandle.bindTo(instance);
|
||||||
} catch (IllegalAccessException e)
|
} catch (IllegalAccessException e)
|
||||||
{
|
{
|
||||||
throw new IllegalArgumentException(e);
|
throw new IllegalArgumentException(e);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import carpet.script.value.Value;
|
|||||||
* {@link AnnotationParser#parseFunctionClass(Class)} ONCE. The provided {@link Class} must be concrete and provide the default constructor or an
|
* {@link AnnotationParser#parseFunctionClass(Class)} ONCE. The provided {@link Class} must be concrete and provide the default constructor or an
|
||||||
* equivalent to it.</p>
|
* equivalent to it.</p>
|
||||||
*
|
*
|
||||||
* <p>Methods annotated with this annotation must not be static and must not declare throwing any checked exceptions.</p>
|
* <p>Methods annotated with this annotation must not declare throwing any checked exceptions.</p>
|
||||||
*
|
*
|
||||||
* <p>If one of the method's parameters is {@link Context}, Carpet will pass the actual {@link Context} of the expression to the
|
* <p>If one of the method's parameters is {@link Context}, Carpet will pass the actual {@link Context} of the expression to the
|
||||||
* method. If one of the method's parameters is {@link Context.Type}, Carpet will pass the Context Type the function was called inside. That
|
* method. If one of the method's parameters is {@link Context.Type}, Carpet will pass the Context Type the function was called inside. That
|
||||||
|
|||||||
Reference in new issue
Block a user