From ad5377fcb2342ae792702a6641421620fceee244 Mon Sep 17 00:00:00 2001 From: jhugunin Date: Wed, 12 Mar 2003 02:10:40 +0000 Subject: implemented fastMatch method along with some basic tests of weave performance with and without it --- .../testdata/src1/trace/HardTraceNothing.java | 5 ++++ .../testdata/src1/trace/ObviousTraceNothing.java | 7 +++++ .../internal/compiler/batch/BcweaverJarMaker.java | 33 ++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 org.aspectj.ajdt.core/testdata/src1/trace/HardTraceNothing.java create mode 100644 org.aspectj.ajdt.core/testdata/src1/trace/ObviousTraceNothing.java (limited to 'org.aspectj.ajdt.core') diff --git a/org.aspectj.ajdt.core/testdata/src1/trace/HardTraceNothing.java b/org.aspectj.ajdt.core/testdata/src1/trace/HardTraceNothing.java new file mode 100644 index 000000000..6f6b8e1cb --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/src1/trace/HardTraceNothing.java @@ -0,0 +1,5 @@ +package trace; + +public aspect HardTraceNothing extends MegaTrace { + pointcut where(): call(public * frotz(..)); +} \ No newline at end of file diff --git a/org.aspectj.ajdt.core/testdata/src1/trace/ObviousTraceNothing.java b/org.aspectj.ajdt.core/testdata/src1/trace/ObviousTraceNothing.java new file mode 100644 index 000000000..5b1af0081 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/src1/trace/ObviousTraceNothing.java @@ -0,0 +1,7 @@ +package trace; + +public aspect ObviousTraceNothing extends MegaTrace { + pointcut where(): within(foo.bar..*); + + declare parents: foo.bar..* implements Marker; +} \ No newline at end of file diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java index f83ee7ed3..86bd3c227 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java @@ -28,6 +28,10 @@ public class BcweaverJarMaker { makeJar1a(); makeJar2(); + makeJarObviousNothing(); + makeJarHardNothing(); + + makeTestJars(); } @@ -60,6 +64,35 @@ public class BcweaverJarMaker { } + public static void makeJarObviousNothing() throws IOException { + List args = new ArrayList(); + args.add("-outjar"); + args.add("../weaver/testdata/megatrace0easy.jar"); + + args.add("-classpath"); + args.add("../runtime/bin"); + + args.add("testdata/src1/trace/MegaTrace.java"); + args.add("testdata/src1/trace/ObviousTraceNothing.java"); + + CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); + } + + public static void makeJarHardNothing() throws IOException { + List args = new ArrayList(); + args.add("-outjar"); + args.add("../weaver/testdata/megatrace0hard.jar"); + + args.add("-classpath"); + args.add("../runtime/bin"); + + args.add("testdata/src1/trace/MegaTrace.java"); + args.add("testdata/src1/trace/HardTraceNothing.java"); + + CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); + } + + public static void makeJar1a() throws IOException { List args = new ArrayList(); args.add("-outjar"); -- cgit v1.2.3