From 35cab775d1ac2fc45f614b4659047b2f291dcd96 Mon Sep 17 00:00:00 2001 From: acolyer Date: Mon, 17 Jan 2005 11:05:53 +0000 Subject: java 5 support --- asm/src/org/aspectj/asm/IProgramElement.java | 4 + org.aspectj.ajdt.core/.classpath | 2 +- .../ajcore.20050113.174142.843.txt | 181 +++++++++++++++++++++ .../ajcore.20050113.174530.570.txt | 160 ++++++++++++++++++ .../ajcore.20050113.194328.125.txt | 178 ++++++++++++++++++++ .../ajcore.20050113.201230.099.txt | 160 ++++++++++++++++++ .../src/org/aspectj/ajdt/ajc/BuildArgParser.java | 22 +-- .../ajdt/internal/compiler/AjCompilerAdapter.java | 2 +- .../compiler/ast/AccessForInlineVisitor.java | 2 +- .../internal/compiler/ast/AdviceDeclaration.java | 11 +- .../compiler/ast/AjConstructorDeclaration.java | 2 +- .../internal/compiler/ast/AjMethodDeclaration.java | 2 +- .../internal/compiler/ast/AspectDeclaration.java | 7 +- .../ajdt/internal/compiler/ast/AstUtil.java | 9 +- .../internal/compiler/ast/IfMethodDeclaration.java | 2 +- .../compiler/ast/InterSuperFixerVisitor.java | 6 +- .../ast/InterTypeConstructorDeclaration.java | 2 +- .../compiler/ast/InterTypeDeclaration.java | 4 +- .../compiler/ast/InterTypeFieldDeclaration.java | 2 +- .../compiler/ast/InterTypeMethodDeclaration.java | 3 +- .../internal/compiler/ast/KnownFieldReference.java | 7 +- .../ajdt/internal/compiler/ast/Proceed.java | 23 ++- .../compiler/ast/ThisJoinPointVisitor.java | 2 +- .../compiler/lookup/AjLookupEnvironment.java | 30 ++-- .../internal/compiler/lookup/AjTypeConstants.java | 4 +- .../internal/compiler/lookup/EclipseScope.java | 3 +- .../compiler/lookup/HelperInterfaceBinding.java | 3 +- .../compiler/lookup/InlineAccessFieldBinding.java | 5 +- .../compiler/lookup/InterTypeFieldBinding.java | 13 +- .../compiler/lookup/InterTypeMemberFinder.java | 6 +- .../internal/compiler/lookup/PointcutBinding.java | 8 + .../compiler/lookup/PrivilegedFieldBinding.java | 4 +- .../lookup/SimpleSyntheticAccessMethodBinding.java | 14 +- .../compiler/problem/AjProblemReporter.java | 50 ++---- .../internal/core/builder/AsmHierarchyBuilder.java | 52 ++---- .../core/builder/StatefulNameEnvironment.java | 4 +- tests/java5/annotations/AnnotationAspect04.aj | 4 +- tests/pureJava/KeywordAspect.java | 2 +- .../org/aspectj/systemtest/ajc11/ajc11-tests.xml | 3 +- .../org/aspectj/systemtest/ajc121/ajc121-tests.xml | 2 +- .../org/aspectj/systemtest/ajc150/Annotations.java | 2 +- tests/src/org/aspectj/systemtest/ajc150/Enums.java | 5 +- .../org/aspectj/systemtest/ajc150/TestUtils.java | 24 ++- .../org/aspectj/systemtest/pre10x/pre10x-tests.xml | 8 +- .../org/aspectj/weaver/bcel/BcelTypeMunger.java | 2 +- 45 files changed, 882 insertions(+), 159 deletions(-) create mode 100644 org.aspectj.ajdt.core/ajcore.20050113.174142.843.txt create mode 100644 org.aspectj.ajdt.core/ajcore.20050113.174530.570.txt create mode 100644 org.aspectj.ajdt.core/ajcore.20050113.194328.125.txt create mode 100644 org.aspectj.ajdt.core/ajcore.20050113.201230.099.txt diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java index 476b6aaa0..a4d43fa47 100644 --- a/asm/src/org/aspectj/asm/IProgramElement.java +++ b/asm/src/org/aspectj/asm/IProgramElement.java @@ -219,6 +219,8 @@ public interface IProgramElement extends Serializable { public static final Kind CLASS = new Kind("class"); public static final Kind INTERFACE = new Kind("interface"); public static final Kind ASPECT = new Kind("aspect"); + public static final Kind ENUM = new Kind("enum"); + public static final Kind ANNOTATION = new Kind("annotation"); public static final Kind INITIALIZER = new Kind("initializer"); public static final Kind INTER_TYPE_FIELD = new Kind("inter-type field"); public static final Kind INTER_TYPE_METHOD = new Kind("inter-type method"); @@ -251,6 +253,8 @@ public interface IProgramElement extends Serializable { CLASS, INTERFACE, ASPECT, + ENUM, + ANNOTATION, INITIALIZER, INTER_TYPE_FIELD, INTER_TYPE_METHOD, diff --git a/org.aspectj.ajdt.core/.classpath b/org.aspectj.ajdt.core/.classpath index 32c74b39c..f31838dd6 100644 --- a/org.aspectj.ajdt.core/.classpath +++ b/org.aspectj.ajdt.core/.classpath @@ -2,7 +2,6 @@ - @@ -13,5 +12,6 @@ + diff --git a/org.aspectj.ajdt.core/ajcore.20050113.174142.843.txt b/org.aspectj.ajdt.core/ajcore.20050113.174142.843.txt new file mode 100644 index 000000000..13bc2ac81 --- /dev/null +++ b/org.aspectj.ajdt.core/ajcore.20050113.174142.843.txt @@ -0,0 +1,181 @@ +---- AspectJ Properties --- +AspectJ Compiler DEVELOPMENT built on Monday Dec 27, 2004 at 13:36:56 GMT +---- Dump Properties --- +Dump file: ajcore.20050113.174142.843.txt +Dump reason: java.lang.ArrayIndexOutOfBoundsException +Dump on exception: true +Dump at exit condition: abort +---- Exception Information --- +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.getTypeReference(TheOriginalJDTParserClass.java:6187) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeInterTypeMethodHeaderName(Parser.java:721) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1213) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) +---- System Properties --- +java.runtime.name=Java(TM) 2 Runtime Environment, Standard Edition +sun.boot.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin +java.vm.version=1.5.0-rc-b63 +java.vm.vendor=Sun Microsystems Inc. +java.vendor.url=http://java.sun.com/ +path.separator=; +java.vm.name=Java HotSpot(TM) Client VM +file.encoding.pkg=sun.io +user.country=GB +sun.os.patch.level=Service Pack 1 +java.vm.specification.name=Java Virtual Machine Specification +user.dir=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core +java.runtime.version=1.5.0-rc-b63 +java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment +java.endorsed.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\endorsed +os.arch=x86 +java.io.tmpdir=C:\DOCUME~1\colyer\LOCALS~1\Temp\ +line.separator= + +java.vm.specification.vendor=Sun Microsystems Inc. +user.variant= +os.name=Windows XP +sun.jnu.encoding=Cp1252 +java.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin;.;C:\WINDOWS\System32;C:\WINDOWS;c:\ColyerRoot\Programs\jdk1.5.0\bin;c:\colyerroot\programs\ruby\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\PROGRAM FILES\THINKPAD\UTILITIES;C:\Program Files\IBM\Trace Facility\;C:\Program Files\IBM\Personal Communications\;C:\COLYERROOT\PROGRAMS\CYGWIN\BIN;C:\COLYERROOT\PROGRAMS\JAKARTA-ANT-1.5.1\BIN;C:\COLYERROOT\PROGRAMS\ASPECTJ1.1\BIN;C:\PSM;C:\ColyerRoot\Programs\UnixUtilities +java.specification.name=Java Platform API Specification +java.class.version=49.0 +sun.management.compiler=HotSpot Client Compiler +os.version=5.1 +user.home=C:\Documents and Settings\colyer +user.timezone=Europe/London +java.awt.printerjob=sun.awt.windows.WPrinterJob +file.encoding=Cp1252 +java.specification.version=1.5 +java.class.path=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar +user.name=colyer +java.vm.specification.version=1.0 +java.home=C:\ColyerRoot\Programs\jdk1.5.0\jre +sun.arch.data.model=32 +user.language=en +java.specification.vendor=Sun Microsystems Inc. +awt.toolkit=sun.awt.windows.WToolkit +java.vm.info=mixed mode +java.version=1.5.0-rc +java.ext.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext +sun.boot.class.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\classes;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar +java.vendor=Sun Microsystems Inc. +file.separator=\ +java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi +sun.io.unicode.encoding=UnicodeLittle +sun.cpu.endian=little +sun.desktop=windows +sun.cpu.isalist= +---- Command Line --- +-source +1.5 +-sourceroots +c:\temp\ajtemp +---- Full Classpath --- +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar(37557672 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar(548670 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar(81615 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar(8628006 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\classes(missing) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar(41549 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +---- Compiler Messages --- +error at (no source information available) +C:\temp\ajtemp\a\A.java:0::0 Internal compiler error +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.getTypeReference(TheOriginalJDTParserClass.java:6187) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeInterTypeMethodHeaderName(Parser.java:721) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1213) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) + +abort ABORT -- (ArrayIndexOutOfBoundsException) -1 +-1 +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.getTypeReference(TheOriginalJDTParserClass.java:6187) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeInterTypeMethodHeaderName(Parser.java:721) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1213) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) + +---- org.aspectj.weaver.bcel.BcelWorld ---- +Shadow mungers: +Empty +Type mungers: +Empty diff --git a/org.aspectj.ajdt.core/ajcore.20050113.174530.570.txt b/org.aspectj.ajdt.core/ajcore.20050113.174530.570.txt new file mode 100644 index 000000000..45f68f30d --- /dev/null +++ b/org.aspectj.ajdt.core/ajcore.20050113.174530.570.txt @@ -0,0 +1,160 @@ +---- AspectJ Properties --- +AspectJ Compiler DEVELOPMENT built on Monday Dec 27, 2004 at 13:36:56 GMT +---- Dump Properties --- +Dump file: ajcore.20050113.174530.570.txt +Dump reason: java.lang.ArrayIndexOutOfBoundsException +Dump on exception: true +Dump at exit condition: abort +---- Exception Information --- +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.getTypeReference(TheOriginalJDTParserClass.java:6188) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.consumeMethodHeaderName(TheOriginalJDTParserClass.java:3854) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1517) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6901) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7066) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7031) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) +---- System Properties --- +java.runtime.name=Java(TM) 2 Runtime Environment, Standard Edition +sun.boot.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin +java.vm.version=1.5.0-rc-b63 +java.vm.vendor=Sun Microsystems Inc. +java.vendor.url=http://java.sun.com/ +path.separator=; +java.vm.name=Java HotSpot(TM) Client VM +file.encoding.pkg=sun.io +user.country=GB +sun.os.patch.level=Service Pack 1 +java.vm.specification.name=Java Virtual Machine Specification +user.dir=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core +java.runtime.version=1.5.0-rc-b63 +java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment +java.endorsed.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\endorsed +os.arch=x86 +java.io.tmpdir=C:\DOCUME~1\colyer\LOCALS~1\Temp\ +line.separator= + +java.vm.specification.vendor=Sun Microsystems Inc. +user.variant= +os.name=Windows XP +sun.jnu.encoding=Cp1252 +java.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin;.;C:\WINDOWS\System32;C:\WINDOWS;c:\ColyerRoot\Programs\jdk1.5.0\bin;c:\colyerroot\programs\ruby\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\PROGRAM FILES\THINKPAD\UTILITIES;C:\Program Files\IBM\Trace Facility\;C:\Program Files\IBM\Personal Communications\;C:\COLYERROOT\PROGRAMS\CYGWIN\BIN;C:\COLYERROOT\PROGRAMS\JAKARTA-ANT-1.5.1\BIN;C:\COLYERROOT\PROGRAMS\ASPECTJ1.1\BIN;C:\PSM;C:\ColyerRoot\Programs\UnixUtilities +java.specification.name=Java Platform API Specification +java.class.version=49.0 +sun.management.compiler=HotSpot Client Compiler +os.version=5.1 +user.home=C:\Documents and Settings\colyer +user.timezone=Europe/London +java.awt.printerjob=sun.awt.windows.WPrinterJob +file.encoding=Cp1252 +java.specification.version=1.5 +java.class.path=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar +user.name=colyer +java.vm.specification.version=1.0 +java.home=C:\ColyerRoot\Programs\jdk1.5.0\jre +sun.arch.data.model=32 +user.language=en +java.specification.vendor=Sun Microsystems Inc. +awt.toolkit=sun.awt.windows.WToolkit +java.vm.info=mixed mode +java.version=1.5.0-rc +java.ext.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext +sun.boot.class.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\classes;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar +java.vendor=Sun Microsystems Inc. +file.separator=\ +java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi +sun.io.unicode.encoding=UnicodeLittle +sun.cpu.endian=little +sun.desktop=windows +sun.cpu.isalist= +---- Command Line --- +-source +1.5 +-sourceroots +c:\temp\ajtemp +---- Full Classpath --- +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar(37557672 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar(548670 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar(81615 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar(8628006 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\classes(missing) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar(41549 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +---- Compiler Messages --- +abort ABORT -- (ArrayIndexOutOfBoundsException) -1 +-1 +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.getTypeReference(TheOriginalJDTParserClass.java:6188) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.consumeMethodHeaderName(TheOriginalJDTParserClass.java:3854) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1517) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6901) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7066) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7031) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) + +---- org.aspectj.weaver.bcel.BcelWorld ---- +Shadow mungers: +Empty +Type mungers: +Empty diff --git a/org.aspectj.ajdt.core/ajcore.20050113.194328.125.txt b/org.aspectj.ajdt.core/ajcore.20050113.194328.125.txt new file mode 100644 index 000000000..b48a17af1 --- /dev/null +++ b/org.aspectj.ajdt.core/ajcore.20050113.194328.125.txt @@ -0,0 +1,178 @@ +---- AspectJ Properties --- +AspectJ Compiler DEVELOPMENT built on Monday Dec 27, 2004 at 13:36:56 GMT +---- Dump Properties --- +Dump file: ajcore.20050113.194328.125.txt +Dump reason: java.lang.ArrayIndexOutOfBoundsException +Dump on exception: true +Dump at exit condition: abort +---- Exception Information --- +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeInterTypeMethodHeaderName(Parser.java:725) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1213) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) +---- System Properties --- +java.runtime.name=Java(TM) 2 Runtime Environment, Standard Edition +sun.boot.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin +java.vm.version=1.5.0-rc-b63 +java.vm.vendor=Sun Microsystems Inc. +java.vendor.url=http://java.sun.com/ +path.separator=; +java.vm.name=Java HotSpot(TM) Client VM +file.encoding.pkg=sun.io +user.country=GB +sun.os.patch.level=Service Pack 1 +java.vm.specification.name=Java Virtual Machine Specification +user.dir=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core +java.runtime.version=1.5.0-rc-b63 +java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment +java.endorsed.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\endorsed +os.arch=x86 +java.io.tmpdir=C:\DOCUME~1\colyer\LOCALS~1\Temp\ +line.separator= + +java.vm.specification.vendor=Sun Microsystems Inc. +user.variant= +os.name=Windows XP +sun.jnu.encoding=Cp1252 +java.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin;.;C:\WINDOWS\System32;C:\WINDOWS;c:\ColyerRoot\Programs\jdk1.5.0\bin;c:\colyerroot\programs\ruby\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\PROGRAM FILES\THINKPAD\UTILITIES;C:\Program Files\IBM\Trace Facility\;C:\Program Files\IBM\Personal Communications\;C:\COLYERROOT\PROGRAMS\CYGWIN\BIN;C:\COLYERROOT\PROGRAMS\JAKARTA-ANT-1.5.1\BIN;C:\COLYERROOT\PROGRAMS\ASPECTJ1.1\BIN;C:\PSM;C:\ColyerRoot\Programs\UnixUtilities +java.specification.name=Java Platform API Specification +java.class.version=49.0 +sun.management.compiler=HotSpot Client Compiler +os.version=5.1 +user.home=C:\Documents and Settings\colyer +user.timezone=Europe/London +java.awt.printerjob=sun.awt.windows.WPrinterJob +file.encoding=Cp1252 +java.specification.version=1.5 +java.class.path=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar +user.name=colyer +java.vm.specification.version=1.0 +java.home=C:\ColyerRoot\Programs\jdk1.5.0\jre +sun.arch.data.model=32 +user.language=en +java.specification.vendor=Sun Microsystems Inc. +awt.toolkit=sun.awt.windows.WToolkit +java.vm.info=mixed mode +java.version=1.5.0-rc +java.ext.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext +sun.boot.class.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\classes;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar +java.vendor=Sun Microsystems Inc. +file.separator=\ +java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi +sun.io.unicode.encoding=UnicodeLittle +sun.cpu.endian=little +sun.desktop=windows +sun.cpu.isalist= +---- Command Line --- +-source +1.5 +-sourceroots +c:\temp\ajtemp +---- Full Classpath --- +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar(37557672 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar(548670 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar(81615 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar(8628006 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\classes(missing) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar(41549 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +---- Compiler Messages --- +error at (no source information available) +C:\temp\ajtemp\a\A.java:0::0 Internal compiler error +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeInterTypeMethodHeaderName(Parser.java:725) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1213) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) + +abort ABORT -- (ArrayIndexOutOfBoundsException) -1 +-1 +java.lang.ArrayIndexOutOfBoundsException: -1 + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeInterTypeMethodHeaderName(Parser.java:725) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1213) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) + +---- org.aspectj.weaver.bcel.BcelWorld ---- +Shadow mungers: +Empty +Type mungers: +Empty diff --git a/org.aspectj.ajdt.core/ajcore.20050113.201230.099.txt b/org.aspectj.ajdt.core/ajcore.20050113.201230.099.txt new file mode 100644 index 000000000..d2bcc6a0b --- /dev/null +++ b/org.aspectj.ajdt.core/ajcore.20050113.201230.099.txt @@ -0,0 +1,160 @@ +---- AspectJ Properties --- +AspectJ Compiler DEVELOPMENT built on Monday Dec 27, 2004 at 13:36:56 GMT +---- Dump Properties --- +Dump file: ajcore.20050113.201230.099.txt +Dump reason: java.lang.NullPointerException +Dump on exception: true +Dump at exit condition: abort +---- Exception Information --- +java.lang.NullPointerException + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.createMethodDeclaration(Parser.java:212) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.consumeMethodHeaderName(TheOriginalJDTParserClass.java:3845) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1517) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) +---- System Properties --- +java.runtime.name=Java(TM) 2 Runtime Environment, Standard Edition +sun.boot.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin +java.vm.version=1.5.0-rc-b63 +java.vm.vendor=Sun Microsystems Inc. +java.vendor.url=http://java.sun.com/ +path.separator=; +java.vm.name=Java HotSpot(TM) Client VM +file.encoding.pkg=sun.io +user.country=GB +sun.os.patch.level=Service Pack 1 +java.vm.specification.name=Java Virtual Machine Specification +user.dir=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core +java.runtime.version=1.5.0-rc-b63 +java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment +java.endorsed.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\endorsed +os.arch=x86 +java.io.tmpdir=C:\DOCUME~1\colyer\LOCALS~1\Temp\ +line.separator= + +java.vm.specification.vendor=Sun Microsystems Inc. +user.variant= +os.name=Windows XP +sun.jnu.encoding=Cp1252 +java.library.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\bin;.;C:\WINDOWS\System32;C:\WINDOWS;c:\ColyerRoot\Programs\jdk1.5.0\bin;c:\colyerroot\programs\ruby\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\PROGRAM FILES\THINKPAD\UTILITIES;C:\Program Files\IBM\Trace Facility\;C:\Program Files\IBM\Personal Communications\;C:\COLYERROOT\PROGRAMS\CYGWIN\BIN;C:\COLYERROOT\PROGRAMS\JAKARTA-ANT-1.5.1\BIN;C:\COLYERROOT\PROGRAMS\ASPECTJ1.1\BIN;C:\PSM;C:\ColyerRoot\Programs\UnixUtilities +java.specification.name=Java Platform API Specification +java.class.version=49.0 +sun.management.compiler=HotSpot Client Compiler +os.version=5.1 +user.home=C:\Documents and Settings\colyer +user.timezone=Europe/London +java.awt.printerjob=sun.awt.windows.WPrinterJob +file.encoding=Cp1252 +java.specification.version=1.5 +java.class.path=C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar +user.name=colyer +java.vm.specification.version=1.0 +java.home=C:\ColyerRoot\Programs\jdk1.5.0\jre +sun.arch.data.model=32 +user.language=en +java.specification.vendor=Sun Microsystems Inc. +awt.toolkit=sun.awt.windows.WToolkit +java.vm.info=mixed mode +java.version=1.5.0-rc +java.ext.dirs=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext +sun.boot.class.path=C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar;C:\ColyerRoot\Programs\jdk1.5.0\jre\classes;C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar +java.vendor=Sun Microsystems Inc. +file.separator=\ +java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport.cgi +sun.io.unicode.encoding=UnicodeLittle +sun.cpu.endian=little +sun.desktop=windows +sun.cpu.isalist= +---- Command Line --- +-source +1.5 +-sourceroots +c:\temp\ajtemp +---- Full Classpath --- +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\rt.jar(37557672 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\i18n.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\sunrsasign.jar(missing) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jsse.jar(548670 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\jce.jar(81615 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\charsets.jar(8628006 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\classes(missing) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\test\aspectjrt.jar(41549 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\dnsns.jar(8176 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\localedata.jar(802502 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunjce_provider.jar(153036 bytes) +C:\ColyerRoot\Programs\jdk1.5.0\jre\lib\ext\sunpkcs11.jar(173235 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\org.aspectj.ajdt.core\bin(7 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\bridge\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\weaver\bin(13 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\runtime\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\junit\junit.jar(121070 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-util\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\jdiff\jdiff.jar(22880 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\asm\bin(4 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\lib\bcel\bcel.jar(574117 bytes) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\testing-client\bin(3 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\antbin(1 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\bin(2 entries) +C:\ColyerRoot\Data\EclipseWorkspaces\AspectJDev\shadows.org.eclipse.jdt.core.aj5\lib\jdtDepends.jar(2390857 bytes) +---- Compiler Messages --- +abort ABORT -- (NullPointerException) null +null +java.lang.NullPointerException + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.createMethodDeclaration(Parser.java:212) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.consumeMethodHeaderName(TheOriginalJDTParserClass.java:3845) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser.consumeRule(Parser.java:1517) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:6900) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7065) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.parse(TheOriginalJDTParserClass.java:7030) + at org.aspectj.org.eclipse.jdt.internal.compiler.parser.TheOriginalJDTParserClass.dietParse(TheOriginalJDTParserClass.java:5774) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.beginToCompile(Compiler.java:319) + at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:348) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:682) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.doBuild(AjBuildManager.java:168) + at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:102) + at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:111) + at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60) + at org.aspectj.tools.ajc.Main.run(Main.java:291) + at org.aspectj.tools.ajc.Main.runMain(Main.java:227) + at org.aspectj.tools.ajc.Main.main(Main.java:80) + +---- org.aspectj.weaver.bcel.BcelWorld ---- +Shadow mungers: +Empty +Type mungers: +Empty diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java index e383fb458..0c2806acc 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -614,19 +614,19 @@ public class BuildArgParser extends Main { showError("dir arg not permitted: " + arg); } else if (arg.equals("-1.5")) { buildConfig.setBehaveInJava5Way(true); + unparsedArgs.add("-1.5"); // this would enable the '-source 1.5' to do the same as '-1.5' but doesnt sound quite right as // as an option right now as it doesnt mean we support 1.5 source code - people will get confused... -// } else if (arg.equals("-source")) { -// if (args.size() > nextArgIndex) { -// String level = ((ConfigParser.Arg)args.get(nextArgIndex)).getValue(); -// if (!level.equals("1.5")) { -// unparsedArgs.add("-source"); -// unparsedArgs.add(level); -// } else { -// buildConfig.setJava5Behaviour(true); -// } -// args.remove(args.get(nextArgIndex)); -// } + } else if (arg.equals("-source")) { + if (args.size() > nextArgIndex) { + String level = ((ConfigParser.Arg)args.get(nextArgIndex)).getValue(); + if (level.equals("1.5")){ + buildConfig.setBehaveInJava5Way(true); + } + unparsedArgs.add("-source"); + unparsedArgs.add(level); + args.remove(args.get(nextArgIndex)); + } } else { // argfile, @file parsed by superclass // no eclipse options parsed: diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java index 5f1e66525..1b64e7fc3 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java @@ -109,7 +109,7 @@ public class AjCompilerAdapter implements ICompilerAdapter { reportedErrors = false; } - public void afterCompiling() { + public void afterCompiling(CompilationUnitDeclaration[] units) { try { if (isXNoWeave || (reportedErrors && !proceedOnError)) { // no point weaving... just tell the requestor we're done diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java index abed08cee..06e7381c0 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java @@ -116,7 +116,7 @@ public class AccessForInlineVisitor extends ASTVisitor { MethodBinding superAccessBinding = getSuperAccessMethod(send.binding); AstUtil.replaceMethodBinding(send, superAccessBinding); } else if (!isPublic(send.binding)) { - send.syntheticAccessor = getAccessibleMethod(send.binding, send.receiverType); + send.syntheticAccessor = getAccessibleMethod(send.binding, send.actualReceiverType); } } public void endVisit(AllocationExpression send, BlockScope scope) { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java index c6aaca762..a81ad0abf 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java @@ -77,7 +77,7 @@ public class AdviceDeclaration extends AjMethodDeclaration { l.add(new EclipseAttributeAdapter(makeAttribute())); addDeclarationStartLineAttribute(l,classFile); - return classFile.generateMethodInfoAttribute(binding, l); + return classFile.generateMethodInfoAttribute(binding, false, l); } public AjAttribute makeAttribute() { @@ -184,7 +184,7 @@ public class AdviceDeclaration extends AjMethodDeclaration { classFile.generateMethodInfoHeader(binding); int methodAttributeOffset = classFile.contentsOffset; - int attributeNumber = classFile.generateMethodInfoAttribute(binding, AstUtil.getAjSyntheticAttribute()); + int attributeNumber = classFile.generateMethodInfoAttribute(binding, false, AstUtil.getAjSyntheticAttribute()); int codeAttributeOffset = classFile.contentsOffset; classFile.generateCodeAttributeHeader(); CodeStream codeStream = classFile.codeStream; @@ -203,7 +203,12 @@ public class AdviceDeclaration extends AjMethodDeclaration { // build the Object[] codeStream.generateInlinedValue(nargs-1); - codeStream.newArray(classScope, new ArrayBinding(classScope.getType(TypeBinding.JAVA_LANG_OBJECT), 1)); + codeStream.newArray( + new ArrayBinding( + classScope.getType(TypeBinding.JAVA_LANG_OBJECT, + TypeBinding.JAVA_LANG_OBJECT.length), + 1, + classScope.environment())); int index = 0; for (int i=0; i < nargs-1; i++) { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java index c5128e9af..504631c9c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java @@ -39,7 +39,7 @@ public class AjConstructorDeclaration extends ConstructorDeclaration { // add extra attributes into list then call 2-arg version of generateInfoAttributes... List extras = new ArrayList(); addDeclarationStartLineAttribute(extras,classFile); - return classFile.generateMethodInfoAttribute(binding,extras); + return classFile.generateMethodInfoAttribute(binding,false,extras); } protected void addDeclarationStartLineAttribute(List extraAttributeList, ClassFile classFile) { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java index 1d888ed57..92f1fafa3 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java @@ -39,7 +39,7 @@ public class AjMethodDeclaration extends MethodDeclaration { // add extra attributes into list then call 2-arg version of generateInfoAttributes... List extras = new ArrayList(); addDeclarationStartLineAttribute(extras,classFile); - return classFile.generateMethodInfoAttribute(binding,extras); + return classFile.generateMethodInfoAttribute(binding,false,extras); } protected void addDeclarationStartLineAttribute(List extraAttributeList, ClassFile classFile) { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java index 43eec43d1..cfb0381ce 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java @@ -28,6 +28,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.CodeStream; import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.Label; +import org.aspectj.org.eclipse.jdt.internal.compiler.env.IGenericType; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.*; //import org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser; @@ -315,9 +316,9 @@ public class AspectDeclaration extends TypeDeclaration { List attrs = new ArrayList(); attrs.addAll(AstUtil.getAjSyntheticAttribute()); attrs.addAll(additionalAttributes); - attributeNumber = classFile.generateMethodInfoAttribute(methodBinding, attrs); + attributeNumber = classFile.generateMethodInfoAttribute(methodBinding, false, attrs); } else { - attributeNumber = classFile.generateMethodInfoAttribute(methodBinding, AstUtil.getAjSyntheticAttribute()); + attributeNumber = classFile.generateMethodInfoAttribute(methodBinding, false, AstUtil.getAjSyntheticAttribute()); } int codeAttributeOffset = classFile.contentsOffset; @@ -875,7 +876,7 @@ public class AspectDeclaration extends TypeDeclaration { superclass.print(0, output); } if (superInterfaces != null && superInterfaces.length > 0) { - output.append(isInterface() ? " extends " : " implements ");//$NON-NLS-2$ //$NON-NLS-1$ + output.append((kind() == IGenericType.INTERFACE_DECL) ? " extends " : " implements ");//$NON-NLS-2$ //$NON-NLS-1$ for (int i = 0; i < superInterfaces.length; i++) { if (i > 0) output.append( ", "); //$NON-NLS-1$ superInterfaces[i].print(0, output); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java index ebee3e425..00c6ed69b 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java @@ -37,7 +37,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.CodeStream; import org.aspectj.org.eclipse.jdt.internal.compiler.env.IConstants; import org.aspectj.org.eclipse.jdt.internal.compiler.impl.Constant; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BaseTypes; -import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BindingIds; +import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Binding; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding; @@ -83,7 +83,8 @@ public class AstUtil { public static TypeReference makeTypeReference(TypeBinding binding) { // ??? does this work for primitives QualifiedTypeReference ref = - new QualifiedTypeReference(new char[][] {binding.sourceName()}, binding, new long[] {0}); //??? + new QualifiedTypeReference(new char[][] {binding.sourceName()}, new long[] {0}); //??? + ref.resolvedType = binding; ref.constant = Constant.NotAConstant; return ref; } @@ -136,7 +137,7 @@ public class AstUtil { ret.codegenBinding = binding; ret.constant = ASTNode.NotAConstant; ret.bits &= ~ASTNode.RestrictiveFlagMASK; // clear bits - ret.bits |= BindingIds.VARIABLE; + ret.bits |= Binding.VARIABLE; return ret; } @@ -148,7 +149,7 @@ public class AstUtil { ret.codegenBinding = binding; ret.constant = ASTNode.NotAConstant; ret.bits &= ~ASTNode.RestrictiveFlagMASK; // clear bits - ret.bits |= BindingIds.LOCAL; + ret.bits |= Binding.LOCAL; return ret; } diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java index 82c1da1bb..d1977b91b 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java @@ -39,7 +39,7 @@ public class IfMethodDeclaration extends AjMethodDeclaration { } protected int generateInfoAttributes(ClassFile classFile) { - return classFile.generateMethodInfoAttribute(binding, AstUtil.getAjSyntheticAttribute()); + return classFile.generateMethodInfoAttribute(binding, false, AstUtil.getAjSyntheticAttribute()); } public void resolveStatements() { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java index 7a7e34e61..55059a51f 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java @@ -44,7 +44,11 @@ public class InterSuperFixerVisitor extends ASTVisitor { this.onType = dec.onTypeBinding; this.world = world; - if (onType.superclass() != null) { + // AMC with the java 5 compiler the superclass() of an interface is object, + // not a parent interface (if one exists) + if (onType.isInterface() && onType.superInterfaces().length == 1) { + superType=onType.superInterfaces()[0]; + } else if (onType.superclass() != null) { superType = onType.superclass(); } else if (onType.superInterfaces() == null || onType.superInterfaces().length == 0) { superType = scope.getJavaLangObject(); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java index 0ca059836..c715533b2 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java @@ -74,7 +74,7 @@ public class InterTypeConstructorDeclaration extends InterTypeDeclaration { TypeX aspectTypeX = EclipseFactory.fromBinding(binding.declaringClass); TypeX targetTypeX = EclipseFactory.fromBinding(onTypeBinding); - ArrayBinding objectArrayBinding = scope.createArray(scope.getJavaLangObject(), 1); + ArrayBinding objectArrayBinding = scope.createArrayType(scope.getJavaLangObject(), 1); MethodDeclaration pre = new MethodDeclaration(compilationResult); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java index a10ab56de..07b35dc7a 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java @@ -126,7 +126,7 @@ public abstract class InterTypeDeclaration extends AjMethodDeclaration { protected void resolveOnType(ClassScope classScope) { checkSpec(); - onTypeBinding = (ReferenceBinding)onType.getTypeBinding(classScope); + onTypeBinding = (ReferenceBinding)onType.getTypeBindingPublic(classScope); if (!onTypeBinding.isValidBinding()) { classScope.problemReporter().invalidType(onType, onTypeBinding); ignoreFurtherInvestigation = true; @@ -169,7 +169,7 @@ public abstract class InterTypeDeclaration extends AjMethodDeclaration { } addDeclarationStartLineAttribute(l,classFile); - return classFile.generateMethodInfoAttribute(binding, l); + return classFile.generateMethodInfoAttribute(binding, false, l); } protected abstract Shadow.Kind getShadowKindForBody(); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java index 3df0df771..cc325269d 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java @@ -223,7 +223,7 @@ public class InterTypeFieldDeclaration extends InterTypeDeclaration { } classFile.generateMethodInfoHeader(binding); int methodAttributeOffset = classFile.contentsOffset; - int attributeNumber = classFile.generateMethodInfoAttribute(binding, + int attributeNumber = classFile.generateMethodInfoAttribute(binding, false, makeEffectiveSignatureAttribute(sig, isGetter ? Shadow.FieldGet : Shadow.FieldSet, false)); int codeAttributeOffset = classFile.contentsOffset; classFile.generateCodeAttributeHeader(); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java index 2f651430d..98de6d00c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java @@ -170,7 +170,8 @@ public class InterTypeMethodDeclaration extends InterTypeDeclaration { classFile.generateMethodInfoHeader(dispatchBinding); int methodAttributeOffset = classFile.contentsOffset; - int attributeNumber = classFile.generateMethodInfoAttribute(dispatchBinding, + int attributeNumber = classFile.generateMethodInfoAttribute(dispatchBinding, + false, makeEffectiveSignatureAttribute(signature, Shadow.MethodCall, false)); int codeAttributeOffset = classFile.contentsOffset; classFile.generateCodeAttributeHeader(); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java index 2ffbdf17a..cb784ebf0 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java @@ -13,8 +13,10 @@ package org.aspectj.ajdt.internal.compiler.ast; + import org.aspectj.org.eclipse.jdt.internal.compiler.ast.QualifiedNameReference; import org.aspectj.org.eclipse.jdt.internal.compiler.impl.Constant; +import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Binding; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BlockScope; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.FieldBinding; import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding; @@ -26,10 +28,9 @@ public class KnownFieldReference extends QualifiedNameReference { super(new char[][] {binding.name},new long[1], 0, 0); this.binding = this.codegenBinding = binding; this.constant = Constant.NotAConstant; - this.receiverType = this.actualReceiverType = - binding.declaringClass; + this.actualReceiverType = binding.declaringClass; - this.bits = FIELD; + this.bits = Binding.FIELD; //this.receiver = AstUtil.makeTypeReference(binding.declaringClass); } diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java index ca5f13453..2fc292801 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java @@ -16,6 +16,7 @@ package org.aspectj.ajdt.internal.compiler.ast; import org.aspectj.weaver.AdviceKind; +import org.aspectj.org.eclipse.jdt.internal.compiler.ast.CastExpression; import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Expression; import org.aspectj.org.eclipse.jdt.internal.compiler.ast.MessageSend; import org.aspectj.org.eclipse.jdt.internal.compiler.impl.ReferenceContext; @@ -45,10 +46,16 @@ public class Proceed extends MessageSend { this.arguments = parent.arguments; this.binding = parent.binding; this.codegenBinding = parent.codegenBinding; + this.syntheticAccessor = parent.syntheticAccessor; + this.expectedType = parent.expectedType; this.nameSourcePosition = parent.nameSourcePosition; - this.receiverType = parent.receiverType; - this.qualifyingType = parent.qualifyingType; + this.actualReceiverType = parent.actualReceiverType; + //this.qualifyingType = parent.qualifyingType; + + this.valueCast = parent.valueCast; + this.typeArguments = parent.typeArguments; + this.genericTypeArguments = parent.genericTypeArguments; this.sourceStart = parent.sourceStart; this.sourceEnd = parent.sourceEnd; @@ -66,7 +73,7 @@ public class Proceed extends MessageSend { constant = NotAConstant; binding = codegenBinding = aroundDecl.proceedMethodBinding; - this.qualifyingType = this.receiverType = binding.declaringClass; + this.actualReceiverType = binding.declaringClass; int baseArgCount = 0; if (arguments != null) { @@ -95,7 +102,14 @@ public class Proceed extends MessageSend { return null; //binding.returnType; } - + boolean argsContainCast = false; + for (int i=0; i4 && - adviceDecl.selector[0] == 'a' && - adviceDecl.selector[1] == 'j' && - adviceDecl.selector[2] == 'c' && - adviceDecl.selector[3] == '$') { - - String stringArgName = new String(arg.name); - if (stringArgName.equals("thisJoinPoint")) reportIt = false; - if (stringArgName.equals("thisJoinPointStaticPart")) reportIt = false; - if (stringArgName.equals("thisEnclosingJoinPointStaticPart")) reportIt = false; - if (arg.type.toString().indexOf("AroundClosure")!=-1) reportIt = false; - } - } - } - } - if (arg.name!=null && new String(arg.name).startsWith("ajc$")) reportIt = false; + String sName = new String(name); + if (sName.startsWith("ajc$")) reportIt = false; + if (sName.equals("thisJoinPoint")) reportIt = false; + if (sName.equals("thisJoinPointStaticPart")) reportIt = false; + if (sName.equals("thisEnclosingJoinPointStaticPart")) reportIt = false; + if (sName.equals("ajc_aroundClosure")) reportIt = false; if (reportIt) - super.javadocMissingParamTag(arg, modifiers); + super.javadocMissingParamTag(name,sourceStart,sourceEnd,modifiers); } public void abstractMethodInAbstractClass(SourceTypeBinding type, AbstractMethodDeclaration methodDecl) { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java index fda7e326a..7db5a9983 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java @@ -16,53 +16,31 @@ package org.aspectj.ajdt.internal.core.builder; import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.Stack; +import java.util.*; -import org.aspectj.ajdt.internal.compiler.ast.AdviceDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.*; import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; import org.aspectj.ajdt.internal.compiler.ast.InterTypeDeclaration; -import org.aspectj.ajdt.internal.compiler.ast.PointcutDeclaration; import org.aspectj.ajdt.internal.compiler.lookup.AjLookupEnvironment; import org.aspectj.ajdt.internal.compiler.lookup.EclipseFactory; -import org.aspectj.asm.AsmManager; +import org.aspectj.asm.*; import org.aspectj.asm.IHierarchy; import org.aspectj.asm.IProgramElement; -import org.aspectj.asm.IRelationship; import org.aspectj.asm.internal.ProgramElement; +import org.aspectj.asm.internal.Relationship; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.SourceLocation; import org.aspectj.org.eclipse.jdt.internal.compiler.ASTVisitor; import org.aspectj.org.eclipse.jdt.internal.compiler.CompilationResult; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ASTNode; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ExtendedStringLiteral; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ImportReference; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Initializer; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression; -import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; -import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BlockScope; -import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope; -import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope; -import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodScope; +import org.aspectj.org.eclipse.jdt.internal.compiler.ast.*; +import org.aspectj.org.eclipse.jdt.internal.compiler.env.IGenericType; +import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.*; import org.aspectj.org.eclipse.jdt.internal.compiler.problem.ProblemHandler; import org.aspectj.util.LangUtil; +import org.aspectj.weaver.*; import org.aspectj.weaver.Member; import org.aspectj.weaver.ResolvedMember; -import org.aspectj.weaver.TypeX; -import org.aspectj.weaver.World; -import org.aspectj.weaver.patterns.AndPointcut; -import org.aspectj.weaver.patterns.OrPointcut; -import org.aspectj.weaver.patterns.Pointcut; -import org.aspectj.weaver.patterns.ReferencePointcut; +import org.aspectj.weaver.patterns.*; /** * At each iteration of processCompilationUnit the declarations for a @@ -236,7 +214,9 @@ public class AsmHierarchyBuilder extends ASTVisitor { String name = new String(typeDeclaration.name); IProgramElement.Kind kind = IProgramElement.Kind.CLASS; if (typeDeclaration instanceof AspectDeclaration) kind = IProgramElement.Kind.ASPECT; - else if (typeDeclaration.isInterface()) kind = IProgramElement.Kind.INTERFACE; + else if (typeDeclaration.kind() == IGenericType.INTERFACE_DECL) kind = IProgramElement.Kind.INTERFACE; + else if (typeDeclaration.kind() == IGenericType.ENUM_DECL) kind = IProgramElement.Kind.ENUM; + else if (typeDeclaration.kind() == IGenericType.ANNOTATION_TYPE_DECL) kind = IProgramElement.Kind.ANNOTATION; IProgramElement peNode = new ProgramElement( name, @@ -262,7 +242,9 @@ public class AsmHierarchyBuilder extends ASTVisitor { IProgramElement.Kind kind = IProgramElement.Kind.CLASS; if (memberTypeDeclaration instanceof AspectDeclaration) kind = IProgramElement.Kind.ASPECT; - else if (memberTypeDeclaration.isInterface()) kind = IProgramElement.Kind.INTERFACE; + else if (memberTypeDeclaration.kind() == IGenericType.INTERFACE_DECL) kind = IProgramElement.Kind.INTERFACE; + else if (memberTypeDeclaration.kind() == IGenericType.ENUM_DECL) kind = IProgramElement.Kind.ENUM; + else if (memberTypeDeclaration.kind() == IGenericType.ANNOTATION_TYPE_DECL) kind = IProgramElement.Kind.ANNOTATION; IProgramElement peNode = new ProgramElement( name, @@ -298,7 +280,9 @@ public class AsmHierarchyBuilder extends ASTVisitor { } IProgramElement.Kind kind = IProgramElement.Kind.CLASS; - if (memberTypeDeclaration.isInterface()) kind = IProgramElement.Kind.INTERFACE; + if (memberTypeDeclaration.kind() == IGenericType.INTERFACE_DECL) kind = IProgramElement.Kind.INTERFACE; + else if (memberTypeDeclaration.kind() == IGenericType.ENUM_DECL) kind = IProgramElement.Kind.ENUM; + else if (memberTypeDeclaration.kind() == IGenericType.ANNOTATION_TYPE_DECL) kind = IProgramElement.Kind.ANNOTATION; IProgramElement peNode = new ProgramElement( fullName, diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java index d38342f3d..713f6e728 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java @@ -64,7 +64,9 @@ public class StatefulNameEnvironment implements INameEnvironment { try { //System.out.println("from cache: " + name); - return new NameEnvironmentAnswer(new ClassFileReader(cf.getBytes(), cf.getFilename().toCharArray())); + return new NameEnvironmentAnswer( + new ClassFileReader(cf.getBytes(), cf.getFilename().toCharArray()), + null /* no access restriction */); } catch (ClassFormatException e) { return null; //!!! seems to match FileSystem behavior } diff --git a/tests/java5/annotations/AnnotationAspect04.aj b/tests/java5/annotations/AnnotationAspect04.aj index 62466ae1c..7c1632f7b 100644 --- a/tests/java5/annotations/AnnotationAspect04.aj +++ b/tests/java5/annotations/AnnotationAspect04.aj @@ -3,9 +3,11 @@ import java.lang.annotation.Annotation; public aspect AnnotationAspect04 { declare parents: SimpleAnnotation implements java.io.Serializable; - class C extends Annotation { } + class C {} declare parents: SimpleAnnotation extends C; class D {} declare parents: D extends Annotation; } + + diff --git a/tests/pureJava/KeywordAspect.java b/tests/pureJava/KeywordAspect.java index 9fcf0c446..b08fc41a3 100644 --- a/tests/pureJava/KeywordAspect.java +++ b/tests/pureJava/KeywordAspect.java @@ -8,7 +8,7 @@ public class KeywordAspect { public void realMain(String[] args) { int aspect = 0; - aspect += 10; + aspect += 10; Tester.checkEqual(aspect, 10); Tester.checkEqual(pointcut, "hi-bye"); diff --git a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml index db8c780ac..d9849ceb3 100644 --- a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml @@ -671,7 +671,8 @@ - + + diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml index 9089289e9..64e966c94 100644 --- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml @@ -347,7 +347,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/org/aspectj/systemtest/ajc150/Annotations.java index 94760cc4f..1a8b83cc9 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java +++ b/tests/src/org/aspectj/systemtest/ajc150/Annotations.java @@ -54,7 +54,7 @@ public class Annotations extends TestUtils { // Deals with the cases where an explicit type is specified and it is an annotation type public void test002_decpOnAnnotationNotAllowed_errors() { - CompilationResult cR = binaryWeave("testcode.jar","AnnotationAspect04.aj",3,0,true); + CompilationResult cR = binaryWeave("testcode.jar","AnnotationAspect04.aj",3,0,true,new String[]{"-source","1.5"}); IMessage msg = (IMessage)cR.getErrorMessages().get(1); assertTrue("Expected a message about can't use decp to alter supertype of an annotation: "+msg, msg.toString().indexOf("to alter supertype of annotation type")!=-1); diff --git a/tests/src/org/aspectj/systemtest/ajc150/Enums.java b/tests/src/org/aspectj/systemtest/ajc150/Enums.java index ff0ba4167..20bd6ef77 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/Enums.java +++ b/tests/src/org/aspectj/systemtest/ajc150/Enums.java @@ -59,7 +59,7 @@ public class Enums extends TestUtils { // Deals with the cases where an explicit type is specified and it is an enum type public void test003_decpOnEnumNotAllowed_errors() { - CompilationResult cR = binaryWeave("testcode.jar","EnumAspect03.aj",3,0,true); + CompilationResult cR = binaryWeave("testcode.jar","EnumAspect03.aj",4,0,true); // THE ORDERING CAN BE SENSITIVE HERE... OUGHT TO FIX IT PROPERLY AND ALLOW FOR THEM // IN ANY POSITION IMessage msg = (IMessage)cR.getErrorMessages().get(1); @@ -71,6 +71,9 @@ public class Enums extends TestUtils { msg = (IMessage)cR.getErrorMessages().get(0); assertTrue("Expected a message about can't use decp to make Enum parent of another type: "+msg, msg.toString().indexOf("the parent of type")!=-1); + msg = (IMessage)cR.getErrorMessages().get(3); + assertTrue("Excpected message about not subclassing Enum: "+msg, + msg.toString().indexOf("The type C may not subclass Enum explicitly")!=-1); verifyWeavingMessagesOutput(cR,new String[]{}); } diff --git a/tests/src/org/aspectj/systemtest/ajc150/TestUtils.java b/tests/src/org/aspectj/systemtest/ajc150/TestUtils.java index dbaf6917d..180f9a7c7 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/TestUtils.java +++ b/tests/src/org/aspectj/systemtest/ajc150/TestUtils.java @@ -29,23 +29,35 @@ public abstract class TestUtils extends AjcTestCase { } protected CompilationResult binaryWeave(String inpath, String insource,int expErrors,int expWarnings,boolean xlinterror) { - return binaryWeave(inpath,insource,expErrors,expWarnings,xlinterror,""); + return binaryWeave(inpath,insource,expErrors,expWarnings,xlinterror,(String[])null); } protected CompilationResult binaryWeave(String inpath, String insource,int expErrors,int expWarnings,String extraOption) { return binaryWeave(inpath,insource,expErrors,expWarnings,false,extraOption); } - + protected CompilationResult binaryWeave(String inpath, String insource,int expErrors,int expWarnings,boolean xlinterror,String extraOption) { + return binaryWeave(inpath, insource, expErrors, expWarnings,xlinterror,new String[] {extraOption}); + } + + protected CompilationResult binaryWeave(String inpath, String insource,int expErrors,int expWarnings,boolean xlinterror,String[] extraOptions) { String[] args = null; if (xlinterror) { - if (extraOption!=null && extraOption.length()>0) - args = new String[] {"-inpath",inpath,insource,"-showWeaveInfo","-proceedOnError","-Xlint:warning",extraOption}; + if (extraOptions!=null && extraOptions.length > 0) { + String[] firstargs = new String[] {"-inpath",inpath,insource,"-showWeaveInfo","-proceedOnError","-Xlint:warning"}; + args = new String[firstargs.length + extraOptions.length]; + System.arraycopy(firstargs,0,args,0,firstargs.length); + System.arraycopy(extraOptions,0,args,firstargs.length,extraOptions.length); + } else args = new String[] {"-inpath",inpath,insource,"-showWeaveInfo","-proceedOnError","-Xlint:warning"}; } else { - if (extraOption!=null && extraOption.length()>0) - args = new String[] {"-inpath",inpath,insource,"-showWeaveInfo","-proceedOnError",extraOption}; + if (extraOptions!=null && extraOptions.length>0) { + String[] firstargs = new String[] {"-inpath",inpath,insource,"-showWeaveInfo","-proceedOnError"}; + args = new String[firstargs.length + extraOptions.length]; + System.arraycopy(firstargs,0,args,0,firstargs.length); + System.arraycopy(extraOptions,0,args,firstargs.length,extraOptions.length); + } else args = new String[] {"-inpath",inpath,insource,"-showWeaveInfo","-proceedOnError"}; } diff --git a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml index d96bc3e4b..4d4cb999d 100644 --- a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml +++ b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml @@ -286,7 +286,7 @@ title="pre 0.7 introduction form outside aspect body causes an EmptyStackException" keywords="from-errors"> - + @@ -301,7 +301,7 @@ title="a before() clause at the class-level causes an EmptyStackException" keywords="from-errors"> - + @@ -309,7 +309,7 @@ title="an after() clause at the class-level causes an EmptyStackException" keywords="from-errors"> - + @@ -317,7 +317,7 @@ title="an around() clause at the class-level causes an EmptyStackException" keywords="from-errors"> - + diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java index 3bf3642b7..935d2f966 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java @@ -223,7 +223,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { } if (!satisfiedByITD) { error(weaver, - "Class must implement the inherited abstract method "+o.getDeclaringType()+"."+o.getName()+o.getParameterSignature(), + "The type " + newParentTarget.getName() + " must implement the inherited abstract method "+o.getDeclaringType()+"."+o.getName()+o.getParameterSignature(), newParentTarget.getType().getSourceLocation(),new ISourceLocation[]{o.getSourceLocation(),mungerLoc}); ruleCheckingSucceeded=false; } -- cgit v1.2.3