Commit Graph
113 Commits
Author SHA1 Message Date
Reinier Zwitserloot 37006cb295 After a great many iterations, Cleanup has now been reduced in functionality (exceptions from the cleanup call WILL mask exceptions from the body - this isn't intended, but it's just not possible to fix this without java 7 features or requiring a rewrite of the class file data.
Tried tactics, and why they won't work:

 - Replace every 'return', 'break', and 'continue' statement (for the latter 2, only if they break/continue out of the try block) with a block that first sets a uniquely named flag before doing the operation.
   Then, check that flag in the finally block to see if the cleanup call should be guarded by a try/catchThrowable. This doesn't work, because its not possible to instrument the 4th way out of a try block without throwing an exception: Just letting it run its course. Tossing a "#flag = true;" at the end may cause a compile time error if the code is not reachable, but figuring that out requires resolution and quite a bit of analysis.

 - Put catch blocks in for all relevant exceptions (RuntimeException, Error, all exceptions declared as thrown by the method, and all types of exceptions of the catch blocks of encapsulating try blocks.
   This doesn't work, partly because it'll fail for sneakily thrown exceptions, but mostly because you can't just catch an exception listed in the 'throws' clause of the method body; catching an exception
   that no statement in the try block can throw is a compile time error, but it is perfectly allright to declare these as 'thrown'.

 - Put in a blanket catch Throwable to set the flag. Two problems with this:
   First, sneaky throw can't be done. Thread.stop invokes a security manager and triggers a warning, Calling a sneakyThrow method creates a runtime dependency on lombok, constructing a sneakyThrow in-class creates visible methods or at least visible class files, and creating a new class via Class.loadClass would be very slow without caching - which gets you the same issues.
   Secondly, this would mean that any statements in the try body that throw an exception aren't flagged to the user as needing to be handled.

The Cleanup annotation now also calls the cleanup method for you, and will call it at the END of the current scope. The following plans have been tried and abandoned:

 - Cleanup right after the final mention. This doesn't work, because the final mention may not be the final use-place. Example:
   @Cleanup InputStream in = new FileInputStream(someFile);
   InputStreamReader reader = new InputStreamReader(in);
   reader.read(); //oops - in is already closed by now.

 - Require an explicit var.cleanup() call and consider that the cue to close off the try block.
   This doesn't work either, because now variables set in between the @Cleanup declaration and the var.cleanup() call become invisible to following statements. Example:
   @Cleanup InputStream in = new FileInputStream(someFile);
   int i = in.read();
   in.close();
   System.out.println(i); //fail - i is inside the generated try block but this isn't, so 'i' is not visible from here.

By running to the end of visible scope, all these problems are avoided. This does remove the flexibility of declaring where you want a close call to be executed, but there are two mitigating factors available:

 1) Create an explicit scope block. You can just stick { code } in any place where you can legally write a statement, in java. This is relatively unknown, so I expect most users will go for:

 2) Just call close explicitly. I've yet to see a cleanup method which isn't idempotent anyway (calling it multiple times is no different than calling it once).

During the course of investigating these options, the AST code has been extended to support live replacement of any child node, including updating the actual underlying system AST as well as our own.
Unfortunately, this code has NOT been tested. It was rather a lot of work so I'm leaving it in, and at least for eclipse it even seemed to work.
2009-06-30 18:22:38 +02:00
Reinier Zwitserloot e0b623a3b8 Removed a debug print. 2009-06-28 06:06:52 +02:00
Reinier Zwitserloot d4556f8539 All lombok code is now targeted at java 1.5, except for the javac-specific stuff, which is on 1.6. 2009-06-28 06:04:08 +02:00
Reinier Zwitserloot 69844725fb Preparating for java 1.5-ification. All stuff that isn't specific to javac should run in java 1.5, so that an eclipse started on a 1.5 JVM will still run lombok. 2009-06-28 05:58:18 +02:00
Reinier Zwitserloot 19f1b26593 Rolled our own ServiceLoader, because its not part of java 1.5. 2009-06-28 05:50:51 +02:00
Reinier Zwitserloot dc7d0cacf5 AptProblem is not available when eclipse is run on java 1.5, and AptProblem is not neccessarily the proper target anyway. Rolled our own DefaultProblem subclass for problem reporting. 2009-06-28 05:45:08 +02:00
Reinier Zwitserloot cd866b852c Stuck some links for the foss licence in the todo list. 2009-06-28 05:44:23 +02:00
Reinier Zwitserloot 71f67e1f65 Added rebuild support to AST.Node. 2009-06-28 05:44:11 +02:00
Reinier Zwitserloot b4cab3f65c [IMPROVEMENT]
Eclipse will now also hold off on running @PrintAST handlers until the very end. Simple generators such as @Getter didn't need this, because PrintAST's handler will hold off until eclipse does a full parse,
but when changing the innards of methods, you would likely not see what you did. Fixed that.

Also, PrintAST has an option to, instead of diving into the ASTNodes of bodies (methods, initializers, etc), to just render the java code, to see if the AST creation/rewriting you've been doing looks like the java code you intended.
2009-06-27 04:00:12 +02:00
Reinier Zwitserloot b9714eae8c [BUGFIX] Pretty major bug - due to a typo, ALL values for annotation methods were set to the value of the last annotation method. e.g in:
@Foo(bar=10), ALL methods in the Foo annotation were presumed to be listed, and set to 10. This was obviously causing problems. Fixed it.
2009-06-27 03:57:51 +02:00
Reinier Zwitserloot c4611d669d [BUGFIX] For some reason, JCLiteral objects contain '1' or '0' (integers) for booleans, not actual booleans. You can tell the difference via the getKind() method. hence, boolean fields in annotations
were throwing unexpected type errors (Integer instead of Boolean). Fixed this.
2009-06-27 03:56:33 +02:00
Reinier Zwitserloot 18931bec53 [TRIVIAL] Added a toString to AnnotationValue, used to debug something, but useful enough to leave in there. 2009-06-27 03:52:31 +02:00
Reinier Zwitserloot 4bddd821d2 Whoops - there was some debug printing left in eclipse's HandleGetter 2009-06-27 03:10:43 +02:00
Reinier Zwitserloot 157bbba3ac Added a caching mechanism to AnnotationValues, for instantiating the annotation. 2009-06-27 03:10:04 +02:00
Reinier Zwitserloot 47bd3e3c06 Added some bugs that we need to fix. 2009-06-26 05:34:55 +02:00
Reinier Zwitserloot cea4c9bb04 Cleanup implemented for eclipse!
There's one serious problem though: The cleanup routine modifies the eclipse internal AST, but doesn't update our bi-directional AST. Thus, or example, having a @Cleanup annotation inside the scope
of another @Cleanup fails, because the application of the second one climbs up to the wrong block level (the original block level instead of newly built try block).
2009-06-26 04:56:40 +02:00
Reinier Zwitserloot 91cd698b1e Added a readme. 2009-06-25 06:29:21 +02:00
Reinier Zwitserloot 84e40cd4e3 Bumped version from 0.3.0 to 0.3.5 in celebration of finishing all 3 generating annotations for both javac and eclipse (@Getter, @Setter, and @Data). 2009-06-25 06:20:51 +02:00
Reinier Zwitserloot 76135a9fb7 Added support for generating toString to javac's HandleData. Now javac's HandleData is COMPLETE! w00t! 2009-06-25 06:18:44 +02:00
Reinier Zwitserloot 29c610af18 Added generating hashCode() to javac's HandleData. 2009-06-25 06:05:11 +02:00
Reinier Zwitserloot 9d7e12d96c trivial 2009-06-25 06:05:07 +02:00
Reinier Zwitserloot 19fec30bc1 javac's HandleData now makes equals methods. 2009-06-25 05:34:01 +02:00
Reinier Zwitserloot dec4be3738 Removed adding the statement: 'final int PRIME = 31;' in the HandleData's createHashCode method when there are 0 fields in the type (it would generate a local variable never used warning!) 2009-06-25 05:33:04 +02:00
Reinier Zwitserloot 63894b98dd Heh, on errors you'd never actually see any message, just the exception type. Whoops. 2009-06-25 05:24:42 +02:00
Reinier Zwitserloot bcee5a50db javac's HandleData now generates the constructor only if it doesn't already exist, and the staticConstructor is now also completed. Left: toString, hashCode, equals. 2009-06-24 07:01:52 +02:00
Reinier Zwitserloot 6d42559417 Work on HandleData, as well as generalizing features in the the PKG class and updating HandleGetter/Setter to call into it. 2009-06-24 01:23:10 +02:00
Reinier Zwitserloot c346b5c054 Added printing for a constructor if it is the default (generated) constructor or not. 2009-06-24 01:22:53 +02:00
Reinier Zwitserloot 99a38d4d08 Added proper support for changing the AST as its being visited, both removal and addition. The rule is now: children traversal traverses through the tree mostly as it was when it started. 2009-06-24 01:22:08 +02:00
Reinier Zwitserloot c834e09af4 Useful script while developing on the javac part of lombok. 2009-06-24 01:21:21 +02:00
Reinier Zwitserloot 7191aa78bd fixed a bug where the auto-generated constructors (actual or static) would throw eclipse errors if you had 0 non-static fields. 2009-06-23 23:52:34 +02:00
Reinier Zwitserloot 2ebb040c81 HandleData for eclipse now seems to work 100%. Also updated toString to use deepToString, and added @Override in case people have warnings for missing @Override annotations on. 2009-06-23 23:33:12 +02:00
Reinier Zwitserloot 6210df32d0 @Data's generation of the equals() method now works! 2009-06-23 21:58:04 +02:00
Reinier Zwitserloot d27fd01b2b Doc 2009-06-23 20:20:07 +02:00
Reinier Zwitserloot e85ef24b4d Fixed some bugs in copyType(), and now the static constructor is generated without any raw generics warnings - it is effectively done. 2009-06-23 19:13:03 +02:00
Reinier Zwitserloot 8bbdcec6fa Figured out that our previous act of just assigning TypeReference objects directly to other nodes (e.g. from a FieldDeclaration's type to a method argument) is NOT a good idea, as this screws up when
the TypeReference object represents a generic type (like 'T') - each instance of a generic type has a different resolution, but 1 TypeReference object can only hold 1 resolution.

Thus, a copyType() method has been written, and the Handle* classes have been updated to use it.

Also, generateEquals() is half-finished in HandleData.
2009-06-23 08:04:44 +02:00
Reinier Zwitserloot 6c82a3c780 This is a 3-day bughunt that ended up being something extremely simple:
** DO NOT REUSE TYPEREFERENCE OBJECTS **

because that makes the binding process go pearshaped - after hte first run, that TypeReference object's binding parameter is set, and as its set, the resolver won't bother re-resolving it.

However, each parse run starts with new scope objects, and any 2 bindings created by different scopes aren't equal to each other. urrrrrrgh!

Fortunately, a lot of code that 'fixed' methods by adding bindings and scope have all been removed, as the parser patch point is well before these bindings are created. Thus:

** NEVER CREATE YOUR OWN BINDINGS AND SCOPE OBJECTS **

because if it comes down to that, you're doing it entirely wrong. That's eclipse's job. We're patching where we are so you don't have to do this.
2009-06-23 06:01:13 +02:00
Reinier Zwitserloot 4ee8e7a3d2 Put the actual numeric value of ASTNode.Bit24 in a comment, but it was missing a 0! 2009-06-23 06:00:57 +02:00
Reinier Zwitserloot 794801c3c9 Removed the equalsPrime thing, because that's just needlessly putting implementation details in there. If switching primes is so important, hash the type name and turn that into a prime, or something.
Also added some javadoc.
2009-06-23 05:56:00 +02:00
Reinier Zwitserloot fdde039d23 More work on the HandleData annotation. Constructor seems to work fine, static constructor not so much. 2009-06-21 18:17:03 +02:00
Reinier Zwitserloot a27c48dd5c trivial 2009-06-21 18:16:55 +02:00
Reinier Zwitserloot b8d9c9ed97 Bug fix: using string literals in any lombok annotation value would blow up that processor. 2009-06-21 18:16:18 +02:00
Reinier Zwitserloot 255bd59071 Due to a java bug, constants in enums don't work, so instead the default access level for @Getter and @Setter have now just been hardcoded in GetterHandler and SetterHandler.
Added ability to look up the Node object for any given AST object on Node itself, as you don't usually have the AST object.

Added toString() method generating to @Data, and this required some fancy footwork in finding if we've already generated methods, and editing a generated method to fill in binding and type resolutions. HandleGetter and HandleSetter have been updated to use these features.

Exceptions caused by lombok handlers show up in the eclipse error log, but now, if they are related to a CompilationUnit, also as a problem (error) on the CUD - those error log entries are easy to miss!

Our ASTs can now be appended to. When you generate a new AST node, you should add it to the AST, obviously. Getter/Setter have been updated to use this.
2009-06-21 00:10:58 +02:00
Reinier Zwitserloot 2e8e43a12e Runs eclipse on a mac. 2009-06-20 23:29:47 +02:00
Reinier Zwitserloot ff306fa5d9 Added initial support for the @Data annotation. Currently produces getters and setters only,
not yet a constructor, toString, hashCode, or equals.

HandleGetter and HandleSetter have been updated to handle static (theoretic; you can't put annotations on static fields normally).

You can now make AnnotationValue objects using just an annotationNode and a target type, as well as check if a given annotationNode is likely to represent a target annotation type. This is in Javac and Eclipse classes.

HandleGetter and HandleSetter can now be asked to make a getter/setter, and will grab access level off of a Getter/Setter annotation, if present.
2009-06-19 16:24:10 +02:00
Reinier Zwitserloot e56ab6c245 Added info on the addNetbeans branch. 2009-06-19 04:48:23 +02:00
Reinier Zwitserloot b964ec18fc Finding lombok.jar would fail if you had any spaces in the path. Fixed that. 2009-06-19 04:32:47 +02:00
Reinier Zwitserloot 7f7cdfc3fc Moved ClassLoaderWorkaround from 'java.lombok' to 'java.lombok.eclipse' as its clearly eclipse-specific. 2009-06-19 03:42:15 +02:00
Reinier Zwitserloot 8b6b821918 Live reloading of the eclipse parser classes is technically supported by the agent though I never tested it. I found a bug while browsing this code. fixed it. 2009-06-19 03:27:56 +02:00
Reinier Zwitserloot 00452d0e95 Renamed EclipseParserPatcher to EclipsePatcher, as it patches not just the parser, but also the CompilationUnitDeclaration class so we can store our AST in it for caching purposes. 2009-06-19 03:24:44 +02:00
Reinier Zwitserloot 7bbf7789f8 List of stuff we still need to do as well as research notes on how to get there. 2009-06-19 03:24:17 +02:00