From 333fec6f0b3368c4e88238b2fa4cc458a4c5acb5 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 4 Jun 2015 01:53:11 +0100 Subject: [PATCH] Allow constraints to be forcibly ignored for testing purposes --- .../org/spongepowered/asm/mixin/MixinEnvironment.java | 7 ++++++- .../asm/mixin/transformer/MixinApplicator.java | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 20c2c249..a01e6afa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -237,7 +237,12 @@ public class MixinEnvironment implements ITokenProvider { * Checks that all declared interface methods are implemented on a class * after mixin application. */ - CHECK_IMPLEMENTS(Option.CHECK_ALL, "interfaces"); + CHECK_IMPLEMENTS(Option.CHECK_ALL, "interfaces"), + + /** + * Ignore all constraints on mixin annotations, output warnings instead + */ + IGNORE_CONSTRAINTS("ignoreConstraints"); /** * Prefix for mixin options diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 908ffdc9..9ef1870b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -49,6 +49,7 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; @@ -723,10 +724,15 @@ public class MixinApplicator { private void checkConstraints(MixinTargetContext mixin, AnnotationNode annotation) { try { Constraint constraint = ConstraintParser.parse(annotation); + MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); try { - constraint.check(MixinEnvironment.getCurrentEnvironment()); + constraint.check(environment); } catch (ConstraintViolationException ex) { - throw new InvalidMixinException(mixin, ex.getMessage(), ex); + if (environment.getOption(Option.IGNORE_CONSTRAINTS)) { + this.logger.warn("Constraint violation: {}", ex.getMessage()); + } else { + throw new InvalidMixinException(mixin, ex.getMessage(), ex); + } } } catch (InvalidConstraintException ex) { throw new InvalidMixinException(mixin, ex.getMessage());