]> source.dussan.org Git - aspectj.git/log
aspectj.git
19 years agoavoid losing type variable information when resolving bindings
acolyer [Wed, 13 Jul 2005 13:04:03 +0000 (13:04 +0000)]
avoid losing type variable information when resolving bindings

19 years agonow remembers its location for better error reporting
acolyer [Wed, 13 Jul 2005 13:03:35 +0000 (13:03 +0000)]
now remembers its location for better error reporting

19 years agotest case updates...
acolyer [Wed, 13 Jul 2005 13:02:54 +0000 (13:02 +0000)]
test case updates...

19 years agobetter error reporting when using type vars in inappropriate locations
acolyer [Wed, 13 Jul 2005 13:02:35 +0000 (13:02 +0000)]
better error reporting when using type vars in inappropriate locations

19 years agoadded an additional message operation to tidy up weaver code
acolyer [Wed, 13 Jul 2005 13:02:06 +0000 (13:02 +0000)]
added an additional message operation to tidy up weaver code

19 years agotest for parameterized type usage
acolyer [Wed, 13 Jul 2005 13:01:37 +0000 (13:01 +0000)]
test for parameterized type usage

19 years agonew message "a parameterized type pattern may not be used in a handler pointcut expre...
acolyer [Wed, 13 Jul 2005 13:00:59 +0000 (13:00 +0000)]
new message "a parameterized type pattern may not be used in a handler pointcut expression"

19 years agosometimes we get asked to resolve more than once, and that's ok...
acolyer [Wed, 13 Jul 2005 13:00:08 +0000 (13:00 +0000)]
sometimes we get asked to resolve more than once, and that's ok...

19 years agomore test cases covering generics in pointcut expressions
acolyer [Wed, 13 Jul 2005 12:59:45 +0000 (12:59 +0000)]
more test cases covering generics in pointcut expressions

19 years agodon't re-resolve already resolved types
acolyer [Wed, 13 Jul 2005 10:13:38 +0000 (10:13 +0000)]
don't re-resolve already resolved types

19 years agoteach a typex whether or not it represents a type variable
acolyer [Wed, 13 Jul 2005 10:13:10 +0000 (10:13 +0000)]
teach a typex whether or not it represents a type variable

19 years agoorganized imports
aclement [Wed, 13 Jul 2005 08:40:51 +0000 (08:40 +0000)]
organized imports

19 years agoAnt 1.6 antlib.xml support, per bug 103493
wisberg [Tue, 12 Jul 2005 21:00:30 +0000 (21:00 +0000)]
Ant 1.6 antlib.xml support, per bug 103493

19 years agohandles resolution of bindings when the pointcut uses type variables
acolyer [Tue, 12 Jul 2005 14:24:51 +0000 (14:24 +0000)]
handles resolution of bindings when the pointcut uses type variables

19 years agoa pointcut now has a simple list of type variable names in scope rather than a TypeVa...
acolyer [Tue, 12 Jul 2005 14:24:13 +0000 (14:24 +0000)]
a pointcut now has a simple list of type variable names in scope rather than a TypeVariableListPattern

19 years agotest that a signature with a generic declaring type does not match on the erasure...
acolyer [Tue, 12 Jul 2005 14:23:35 +0000 (14:23 +0000)]
test that a signature with a generic declaring type does not match on the erasure of the parameter types

19 years agoorganized imports
aclement [Tue, 12 Jul 2005 13:59:06 +0000 (13:59 +0000)]
organized imports

19 years agogenerics: new error messages.
aclement [Tue, 12 Jul 2005 13:58:17 +0000 (13:58 +0000)]
generics: new error messages.

19 years agoI needed to make some changes to resolveBindings, but the original method had degener...
acolyer [Tue, 12 Jul 2005 13:19:22 +0000 (13:19 +0000)]
I needed to make some changes to resolveBindings, but the original method had degenerated into such a mess that I've refactored it before continuing. This commit changes no functionality, it just makes the code more readable!

19 years agoparameterized members remember their erasure and this is used in member matching...
acolyer [Tue, 12 Jul 2005 11:09:22 +0000 (11:09 +0000)]
parameterized members remember their erasure and this is used in member matching so that a signature pattern based on the erasure of a signature can match parameterized member declarations.

19 years agotest that a the erasure of a signature matches a parameterized implementation of...
acolyer [Tue, 12 Jul 2005 11:08:09 +0000 (11:08 +0000)]
test that a the erasure of a signature matches a parameterized implementation of a method

19 years agotests for Huff's fix for 102746 - not hooked up b/c harness manages classpath.
wisberg [Mon, 11 Jul 2005 23:52:53 +0000 (23:52 +0000)]
tests for Huff's fix for 102746 - not hooked up b/c harness manages classpath.

19 years agoVariant of Huff's fix for 102746 - untested hypothesis
wisberg [Mon, 11 Jul 2005 23:51:52 +0000 (23:51 +0000)]
Variant of Huff's fix for 102746 - untested hypothesis

19 years ago99861 temp fix for deadlock when Sun' Unsafe.defineClass API is used (deadlock in...
avasseur [Mon, 11 Jul 2005 15:09:52 +0000 (15:09 +0000)]
99861 temp fix for deadlock when Sun' Unsafe.defineClass API is used (deadlock in JVMTI obviously, not tied to AJ, but bothers Ron)

19 years agofix 83935 where Jp / Pjp is an arg and bound in a formal binding as well as another...
avasseur [Mon, 11 Jul 2005 15:05:44 +0000 (15:05 +0000)]
fix 83935 where Jp / Pjp is an arg and bound in a formal binding as well as another (or 2+) used as implicit bindings in @AJ

19 years agoadd unresolved TypeVariableRefTypes which are created by EclipseFactory during conver...
acolyer [Mon, 11 Jul 2005 13:50:39 +0000 (13:50 +0000)]
add unresolved TypeVariableRefTypes which are created by EclipseFactory during conversion of bindings to TypeX, and resolved to TypeVariableReferenceTypes by the world.

19 years agoa simple type pattern for a generic type should match any parameterization of that...
acolyer [Mon, 11 Jul 2005 13:49:26 +0000 (13:49 +0000)]
a simple type pattern for a generic type should match any parameterization of that type

19 years agoadded one simple test for matching members of a parameterized type.
acolyer [Mon, 11 Jul 2005 13:48:57 +0000 (13:48 +0000)]
added one simple test for matching members of a parameterized type.
Took me 3 days to get it to pass!!!

19 years agochanged EclipseFactory.makeResolvedMember from static to non-static member and fully...
acolyer [Mon, 11 Jul 2005 13:48:13 +0000 (13:48 +0000)]
changed EclipseFactory.makeResolvedMember from static to non-static member and fully resolved all types involved.

19 years agogenerics: use raw type of iterator
aclement [Mon, 11 Jul 2005 10:53:01 +0000 (10:53 +0000)]
generics: use raw type of iterator

19 years agogenerics: modified to use built in types since otherwise world setup is painful.
aclement [Mon, 11 Jul 2005 10:52:46 +0000 (10:52 +0000)]
generics: modified to use built in types since otherwise world setup is painful.

19 years agogenerics: temporarily use the raw type when matching until the type pattern logic...
aclement [Mon, 11 Jul 2005 10:52:22 +0000 (10:52 +0000)]
generics: temporarily use the raw type when matching until the type pattern logic is aware

19 years agogenerics: polices the combinations of decp when using generics/raws/parameterized...
aclement [Mon, 11 Jul 2005 10:51:48 +0000 (10:51 +0000)]
generics: polices the combinations of decp when using generics/raws/parameterized types

19 years agogenerics: writes out correct class signature
aclement [Mon, 11 Jul 2005 10:51:20 +0000 (10:51 +0000)]
generics: writes out correct class signature

19 years agogenerics: improved type resolution, aware of raw/simple/parameterized/generic
aclement [Mon, 11 Jul 2005 10:51:05 +0000 (10:51 +0000)]
generics: improved type resolution, aware of raw/simple/parameterized/generic

19 years agogenerics: dont assume bcelmethod, it cant be resolvedmember
aclement [Mon, 11 Jul 2005 10:50:35 +0000 (10:50 +0000)]
generics: dont assume bcelmethod, it cant be resolvedmember

19 years agogenerics: signature unpacking.
aclement [Mon, 11 Jul 2005 10:50:15 +0000 (10:50 +0000)]
generics: signature unpacking.

19 years agogenerics: dont assume its a bcelmethod. When working with generic methods they are...
aclement [Mon, 11 Jul 2005 10:48:54 +0000 (10:48 +0000)]
generics: dont assume its a bcelmethod.  When working with generic methods they are merely 'resolvedmembers'

19 years agogenerics: now promotes simple types to raw types if we discover they are generic...
aclement [Mon, 11 Jul 2005 10:48:28 +0000 (10:48 +0000)]
generics: now promotes simple types to raw types if we discover they are generic during resolution.

19 years agogenerics: copes with '+' '-' in the signature, less than ideal...
aclement [Mon, 11 Jul 2005 10:47:42 +0000 (10:47 +0000)]
generics: copes with '+' '-' in the signature, less than ideal...

19 years agogenerics: allow for type variables that arrive in static methods and don't come from...
aclement [Mon, 11 Jul 2005 10:47:08 +0000 (10:47 +0000)]
generics: allow for type variables that arrive in static methods and don't come from the declaring type

19 years agogenerics: few bug fixes to ensure typex's know if they represent generics/raws or...
aclement [Mon, 11 Jul 2005 10:46:30 +0000 (10:46 +0000)]
generics: few bug fixes to ensure typex's know if they represent generics/raws or simples.

19 years agogenerics: lots of generic decp tests.
aclement [Mon, 11 Jul 2005 10:46:02 +0000 (10:46 +0000)]
generics: lots of generic decp tests.

19 years agogenerics: ask for the appropriate TypeX depending on the binding
aclement [Mon, 11 Jul 2005 10:45:27 +0000 (10:45 +0000)]
generics: ask for the appropriate TypeX depending on the binding

19 years agobut i only changed a comment...
acolyer [Mon, 11 Jul 2005 09:40:14 +0000 (09:40 +0000)]
but i only changed a comment...

19 years agofixes dumb array cast
acolyer [Mon, 11 Jul 2005 09:38:48 +0000 (09:38 +0000)]
fixes dumb array cast

19 years agoability to replace upper bound (used when fixing up circular dependencies)
acolyer [Mon, 11 Jul 2005 09:38:13 +0000 (09:38 +0000)]
ability to replace upper bound (used when fixing up circular dependencies)

19 years agotest case for Enum conversions
acolyer [Mon, 11 Jul 2005 09:37:21 +0000 (09:37 +0000)]
test case for Enum conversions

19 years agoanswer correct superclass and superinterfaces taking into account generic signature
acolyer [Mon, 11 Jul 2005 09:36:49 +0000 (09:36 +0000)]
answer correct superclass and superinterfaces taking into account generic signature

19 years agohandle recursive type variables such as Enum
acolyer [Mon, 11 Jul 2005 09:35:36 +0000 (09:35 +0000)]
handle recursive type variables such as Enum

19 years agobeginnings of proper type variable support in Eclipse type world
acolyer [Mon, 11 Jul 2005 09:34:44 +0000 (09:34 +0000)]
beginnings of proper type variable support in Eclipse type world

19 years agodo the right thing with ":" in an ftp
acolyer [Mon, 11 Jul 2005 09:32:20 +0000 (09:32 +0000)]
do the right thing with ":" in an ftp

19 years agogenerics: includes fix for generic signatures
aclement [Fri, 8 Jul 2005 16:31:44 +0000 (16:31 +0000)]
generics: includes fix for generic signatures

19 years agoexpose generic ClassTypeSignature for member resolving
acolyer [Fri, 8 Jul 2005 16:07:21 +0000 (16:07 +0000)]
expose generic ClassTypeSignature for member resolving

19 years agosupport for unpacking generic signature
acolyer [Fri, 8 Jul 2005 16:06:48 +0000 (16:06 +0000)]
support for unpacking generic signature

19 years agoavoid needless resolving
acolyer [Fri, 8 Jul 2005 16:06:18 +0000 (16:06 +0000)]
avoid needless resolving

19 years agoimproved tolerance for generics signature chars
acolyer [Fri, 8 Jul 2005 16:05:54 +0000 (16:05 +0000)]
improved tolerance for generics signature chars

19 years agosimplify signature processing and remove implicit extends
acolyer [Fri, 8 Jul 2005 16:05:19 +0000 (16:05 +0000)]
simplify signature processing and remove implicit extends

19 years agoadded getTypeVariables to interface
acolyer [Fri, 8 Jul 2005 16:03:45 +0000 (16:03 +0000)]
added getTypeVariables to interface

19 years agogive back parameterized versions of members for parameterized types
acolyer [Fri, 8 Jul 2005 16:03:21 +0000 (16:03 +0000)]
give back parameterized versions of members for parameterized types

19 years agochange signature until we figure out the right thing to do in TypeX
acolyer [Fri, 8 Jul 2005 16:02:51 +0000 (16:02 +0000)]
change signature until we figure out the right thing to do in TypeX

19 years agoraise inner type visibility for subclasses
acolyer [Fri, 8 Jul 2005 16:02:28 +0000 (16:02 +0000)]
raise inner type visibility for subclasses

19 years agomoved some tests with 1.5 dependencies
acolyer [Fri, 8 Jul 2005 16:01:02 +0000 (16:01 +0000)]
moved some tests with 1.5 dependencies

19 years agodummy implementation of getTypeVariables
acolyer [Fri, 8 Jul 2005 16:00:41 +0000 (16:00 +0000)]
dummy implementation of getTypeVariables

19 years agoadded test for broken primitive case
acolyer [Fri, 8 Jul 2005 16:00:07 +0000 (16:00 +0000)]
added test for broken primitive case

19 years agofix in GenericSigParser when tokenising primitives
acolyer [Fri, 8 Jul 2005 15:59:24 +0000 (15:59 +0000)]
fix in GenericSigParser when tokenising primitives

19 years agogenerics: more accurate generic type test.
aclement [Fri, 8 Jul 2005 15:19:44 +0000 (15:19 +0000)]
generics: more accurate generic type test.

19 years agogenerics: can determine if java class is generic.
aclement [Fri, 8 Jul 2005 15:17:23 +0000 (15:17 +0000)]
generics: can determine if java class is generic.

19 years agocreate a typeX from a set of TypeX parameters
acolyer [Fri, 8 Jul 2005 13:25:02 +0000 (13:25 +0000)]
create a typeX from a set of TypeX parameters

19 years agosome /. confusion cleared up
acolyer [Fri, 8 Jul 2005 13:24:32 +0000 (13:24 +0000)]
some /. confusion cleared up

19 years agosmall signature change in JavaClass
acolyer [Fri, 8 Jul 2005 10:28:14 +0000 (10:28 +0000)]
small signature change in JavaClass

19 years agotest cases for generics updates made by amc
acolyer [Fri, 8 Jul 2005 10:26:53 +0000 (10:26 +0000)]
test cases for generics updates made by amc

19 years agoinclude new test suites for generics updates
acolyer [Fri, 8 Jul 2005 10:26:26 +0000 (10:26 +0000)]
include new test suites for generics updates

19 years agosupport for generics and type variables
acolyer [Fri, 8 Jul 2005 10:25:01 +0000 (10:25 +0000)]
support for generics and type variables

19 years agoproper implementation of canBeParameterized
acolyer [Fri, 8 Jul 2005 10:24:19 +0000 (10:24 +0000)]
proper implementation of canBeParameterized

19 years agoutility class that converts from Bcel signature world to TypeX world
acolyer [Fri, 8 Jul 2005 10:23:45 +0000 (10:23 +0000)]
utility class that converts from Bcel signature world to TypeX world

19 years agoadded support for canBeParameterized
acolyer [Fri, 8 Jul 2005 10:23:11 +0000 (10:23 +0000)]
added support for canBeParameterized

19 years agocan create a parameterized type from an array of TypeX's
acolyer [Fri, 8 Jul 2005 10:22:52 +0000 (10:22 +0000)]
can create a parameterized type from an array of TypeX's

19 years agosupports isGeneric
acolyer [Fri, 8 Jul 2005 10:21:55 +0000 (10:21 +0000)]
supports isGeneric

19 years agoTypeX hierarchy members for bounded reference types and type variables
acolyer [Fri, 8 Jul 2005 10:21:35 +0000 (10:21 +0000)]
TypeX hierarchy members for bounded reference types and type variables

19 years agosimple implementation of isGeneric
acolyer [Fri, 8 Jul 2005 10:20:38 +0000 (10:20 +0000)]
simple implementation of isGeneric

19 years agocopyright statement
acolyer [Fri, 8 Jul 2005 10:19:33 +0000 (10:19 +0000)]
copyright statement

19 years agolazy loading and parsing of generic signature
acolyer [Fri, 8 Jul 2005 10:19:14 +0000 (10:19 +0000)]
lazy loading and parsing of generic signature

19 years agogenerics: new message
aclement [Fri, 8 Jul 2005 09:56:50 +0000 (09:56 +0000)]
generics: new message

19 years agogenerics: decp tests, binary weaving
aclement [Fri, 8 Jul 2005 09:56:22 +0000 (09:56 +0000)]
generics: decp tests, binary weaving

19 years agogenerics: decp tests
aclement [Fri, 8 Jul 2005 09:56:01 +0000 (09:56 +0000)]
generics: decp tests

19 years agoorganized imports
aclement [Fri, 8 Jul 2005 09:55:12 +0000 (09:55 +0000)]
organized imports

19 years agotemp removal of the call to build runtime with 11 javac. WILL NEED TO FIX RUNTIME...
aclement [Wed, 6 Jul 2005 08:25:53 +0000 (08:25 +0000)]
temp removal of the call to build runtime with 11 javac.  WILL NEED TO FIX RUNTIME before finishing 1.5.0

19 years agoadd offset in MethodDeclarationAttribute for @AJ in AJDT
avasseur [Tue, 5 Jul 2005 11:46:21 +0000 (11:46 +0000)]
add offset in MethodDeclarationAttribute for @AJ in AJDT

19 years agoOn the build machine, code to test is in jars, not in 'bin' folders - so the aj.path...
aclement [Tue, 5 Jul 2005 08:12:33 +0000 (08:12 +0000)]
On the build machine, code to test is in jars, not in 'bin' folders - so the aj.path for the LTW tests needs to have an entry for asm.jar in addition to the asm/bin it currently has.  Otherwise they fail with 'NoClassDefFoundError: org/aspectj/asm/IRelationship$Kind'

19 years agogenerics: promoted getGenericType up to ResolvedTypeX - it will throw an exception...
aclement [Mon, 4 Jul 2005 16:20:08 +0000 (16:20 +0000)]
generics: promoted getGenericType up to ResolvedTypeX - it will throw an exception if you ask a type that is not parameterized or raw

19 years agogenerics: First simple change to ensure the pattern I<String> results in an ExactTyp...
aclement [Mon, 4 Jul 2005 15:00:52 +0000 (15:00 +0000)]
generics:  First simple change to ensure the pattern I<String> results in an ExactTypePattern that remembers the parameterization.

19 years agogenerics: one fix to ensure the class we output says 'class X implement I' rather...
aclement [Mon, 4 Jul 2005 14:59:57 +0000 (14:59 +0000)]
generics: one fix to ensure the class we output says 'class X implement I' rather than 'class X implements I<String>' when the I<String> is added via declare parents.  (I<String> should be captured in the signature attribute on the class X).  Also some placeholder code added (commented out) that we'll need when trying to fix up the signature attribute when binary weaving.

19 years agogenerics: implementation of getDeclaredGenericSignature()
aclement [Mon, 4 Jul 2005 14:58:21 +0000 (14:58 +0000)]
generics: implementation of getDeclaredGenericSignature()

19 years agogenerics: loads of changes to make the resolution process generics aware
aclement [Mon, 4 Jul 2005 14:58:00 +0000 (14:58 +0000)]
generics: loads of changes to make the resolution process generics aware

19 years agogenerics: TypeXs are much more aware of generics. The only method in this class...
aclement [Mon, 4 Jul 2005 14:57:20 +0000 (14:57 +0000)]
generics: TypeXs are much more aware of generics.  The only method in this class not finished now is forGenericTypeSignature() - it does not quite capture all the information from the parsed generic signature in the TypeX it creates.  It currently captures enough for the testcases I've written - no doubt will need extending for other testcases.

19 years agonasty clone method fix for 83311
aclement [Mon, 4 Jul 2005 14:55:34 +0000 (14:55 +0000)]
nasty clone method fix for 83311

19 years agogenerics:
aclement [Mon, 4 Jul 2005 14:55:13 +0000 (14:55 +0000)]
generics:

19 years agogenerics: delegates should be able to supply their declared generic signature.
aclement [Mon, 4 Jul 2005 14:54:51 +0000 (14:54 +0000)]
generics: delegates should be able to supply their declared generic signature.

19 years agogenerics: Going from eclipse type bindings to AspectJ TypeXs (and back again) is...
aclement [Mon, 4 Jul 2005 14:54:01 +0000 (14:54 +0000)]
generics: Going from eclipse type bindings to AspectJ TypeXs (and back again) is now generics aware.  Also modified the code that adds source type bindings into the 'world map' of types to be a little more generics aware.