diff options
| -rw-r--r-- | build.xml | 6 | ||||
| -rw-r--r-- | experimental/delombok_java7/NOTE | 2 | ||||
| -rw-r--r-- | experimental/delombok_java7/lib/javac7.jar | bin | 0 -> 2992544 bytes | |||
| -rw-r--r-- | experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScanner.java | 95 | ||||
| -rw-r--r-- | experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScannerFactory.java | 62 | ||||
| -rw-r--r-- | src/delombok/lombok/delombok/Delombok.java | 15 | ||||
| -rw-r--r-- | src/delombok/lombok/delombok/java6/CommentCollectingScanner.java (renamed from src/delombok/lombok/delombok/CommentCollectingScanner.java) | 44 | ||||
| -rw-r--r-- | src/delombok/lombok/delombok/java6/CommentCollectingScannerFactory.java | 61 |
8 files changed, 245 insertions, 40 deletions
@@ -149,6 +149,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <classpath location="build/lombok" /> <classpath refid="build.path" /> </ivy:compile> + <ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false"> + <src path="experimental/delombok_java7/src/main" /> + <include name="lombok/delombok/**" /> + <classpath location="build/lombok" /> + <classpath location="experimental/delombok_java7/lib/javac7.jar" /> + </ivy:compile> <mkdir dir="build/lombok/META-INF" /> <mkdir dir="build/lombok/META-INF/services" /> <echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.core.AnnotationProcessor</echo> diff --git a/experimental/delombok_java7/NOTE b/experimental/delombok_java7/NOTE new file mode 100644 index 00000000..83d9fcaf --- /dev/null +++ b/experimental/delombok_java7/NOTE @@ -0,0 +1,2 @@ +The provided 'javac7.jar' may not be complete and should not be used for
+anything else but building 'delombok_java7'.
\ No newline at end of file diff --git a/experimental/delombok_java7/lib/javac7.jar b/experimental/delombok_java7/lib/javac7.jar Binary files differnew file mode 100644 index 00000000..66de8262 --- /dev/null +++ b/experimental/delombok_java7/lib/javac7.jar diff --git a/experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScanner.java b/experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScanner.java new file mode 100644 index 00000000..51ec9e74 --- /dev/null +++ b/experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScanner.java @@ -0,0 +1,95 @@ +/* + * Copyright © 2011 Reinier Zwitserloot and Roel Spilker. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.delombok.java7; + +import java.nio.CharBuffer; + +import lombok.delombok.Comment; +import lombok.delombok.Comment.EndConnection; +import lombok.delombok.Comment.StartConnection; +import lombok.delombok.Delombok.Comments; + +import com.sun.tools.javac.parser.Scanner; + +public class CommentCollectingScanner extends Scanner { + private final Comments comments; + private int endComment = 0; + + public CommentCollectingScanner(CommentCollectingScannerFactory factory, CharBuffer charBuffer, Comments comments) { + super(factory, charBuffer); + this.comments = comments; + } + + public CommentCollectingScanner(CommentCollectingScannerFactory factory, char[] input, int inputLength, Comments comments) { + super(factory, input, inputLength); + this.comments = comments; + } + + @Override + protected void processComment(CommentStyle style) { + int prevEndPos = Math.max(prevEndPos(), endComment); + int pos = pos(); + int endPos = endPos(); + endComment = endPos; + String content = new String(getRawCharacters(pos, endPos)); + StartConnection start = determineStartConnection(prevEndPos, pos); + EndConnection end = determineEndConnection(endPos); + + Comment comment = new Comment(prevEndPos, pos, endPos, content, start, end); + comments.add(comment); + } + + private EndConnection determineEndConnection(int pos) { + boolean first = true; + for (int i = pos;; i++) { + char c = getRawCharacters(i, i + 1)[0]; + if (isNewLine(c)) { + return EndConnection.ON_NEXT_LINE; + } + if (Character.isWhitespace(c)) { + first = false; + continue; + } + return first ? EndConnection.DIRECT_AFTER_COMMENT : EndConnection.AFTER_COMMENT; + } + } + + private StartConnection determineStartConnection(int from, int to) { + if (from == to) { + return StartConnection.DIRECT_AFTER_PREVIOUS; + } + char[] between = getRawCharacters(from, to); + if (isNewLine(between[between.length - 1])) { + return StartConnection.START_OF_LINE; + } + for (char c : between) { + if (isNewLine(c)) { + return StartConnection.ON_NEXT_LINE; + } + } + return StartConnection.AFTER_PREVIOUS; + } + + private boolean isNewLine(char c) { + return c == '\n' || c == '\r'; + } +} diff --git a/experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScannerFactory.java b/experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScannerFactory.java new file mode 100644 index 00000000..0e282de8 --- /dev/null +++ b/experimental/delombok_java7/src/main/lombok/delombok/java7/CommentCollectingScannerFactory.java @@ -0,0 +1,62 @@ +/* + * Copyright © 2011 Reinier Zwitserloot and Roel Spilker. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.delombok.java7; + +import java.nio.CharBuffer; + +import lombok.delombok.Delombok.Comments; + +import com.sun.tools.javac.parser.Scanner; +import com.sun.tools.javac.parser.ScannerFactory; +import com.sun.tools.javac.util.Context; + +public class CommentCollectingScannerFactory extends ScannerFactory { + private final Context context; + + public static void preRegister(final Context context) { + context.put(scannerFactoryKey, new Context.Factory<ScannerFactory>() { + public ScannerFactory make() { + return new CommentCollectingScannerFactory(context); + } + }); + } + + /** Create a new scanner factory. */ + protected CommentCollectingScannerFactory(Context context) { + super(context); + this.context = context; + } + + @Override + public Scanner newScanner(CharSequence input, boolean keepDocComments) { + if (input instanceof CharBuffer) { + return new CommentCollectingScanner(this, (CharBuffer)input, context.get(Comments.class)); + } + char[] array = input.toString().toCharArray(); + return newScanner(array, array.length, keepDocComments); + } + + @Override + public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) { + return new CommentCollectingScanner(this, input, inputLength, context.get(Comments.class)); + } +} diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index f28e5b72..459d2184 100644 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -44,6 +44,7 @@ import java.util.Map; import javax.tools.DiagnosticListener; import javax.tools.JavaFileObject; +import lombok.Lombok; import lombok.javac.LombokOptions; import com.sun.tools.javac.main.JavaCompiler; @@ -355,7 +356,17 @@ public class Delombok { if (classpath != null) options.put(OptionName.CLASSPATH, classpath); if (sourcepath != null) options.put(OptionName.SOURCEPATH, sourcepath); options.put("compilePolicy", "attr"); - CommentCollectingScanner.Factory.preRegister(context); + + try { + Class.forName("lombok.delombok.java7.CommentCollectingScannerFactory").getMethod("preRegister", Context.class).invoke(null, context); + } catch (Throwable t1) { + if (!(t1 instanceof NoClassDefFoundError)) Lombok.sneakyThrow(t1); + try { + Class.forName("lombok.delombok.java6.CommentCollectingScannerFactory").getMethod("preRegister", Context.class).invoke(null, context); + } catch (Exception t2) { + Lombok.sneakyThrow(t2); + } + } JavaCompiler compiler = new JavaCompiler(context); compiler.keepComments = true; @@ -408,7 +419,7 @@ public class Delombok { public static class Comments { public com.sun.tools.javac.util.ListBuffer<Comment> comments = com.sun.tools.javac.util.ListBuffer.lb(); - void add(Comment comment) { + public void add(Comment comment) { comments.append(comment); } } diff --git a/src/delombok/lombok/delombok/CommentCollectingScanner.java b/src/delombok/lombok/delombok/java6/CommentCollectingScanner.java index c930bc62..c05fd158 100644 --- a/src/delombok/lombok/delombok/CommentCollectingScanner.java +++ b/src/delombok/lombok/delombok/java6/CommentCollectingScanner.java @@ -1,5 +1,5 @@ /* - * Copyright © 2009 Reinier Zwitserloot and Roel Spilker. + * Copyright © 2011 Reinier Zwitserloot and Roel Spilker. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -19,61 +19,29 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package lombok.delombok; +package lombok.delombok.java6; import java.nio.CharBuffer; +import lombok.delombok.Comment; import lombok.delombok.Comment.EndConnection; import lombok.delombok.Comment.StartConnection; import lombok.delombok.Delombok.Comments; + import com.sun.tools.javac.parser.Scanner; -import com.sun.tools.javac.util.Context; public class CommentCollectingScanner extends Scanner { private final Comments comments; private int endComment = 0; - - /** A factory for creating scanners. */ - public static class Factory extends Scanner.Factory { - private final Context context; - - public static void preRegister(final Context context) { - context.put(scannerFactoryKey, new Context.Factory<Scanner.Factory>() { - public CommentCollectingScanner.Factory make() { - return new Factory(context); - } - }); - } - - /** Create a new scanner factory. */ - protected Factory(Context context) { - super(context); - this.context = context; - } - - @Override - public Scanner newScanner(CharSequence input) { - if (input instanceof CharBuffer) { - return new CommentCollectingScanner(this, (CharBuffer)input, context.get(Comments.class)); - } - char[] array = input.toString().toCharArray(); - return newScanner(array, array.length); - } - - @Override - public Scanner newScanner(char[] input, int inputLength) { - return new CommentCollectingScanner(this, input, inputLength, context.get(Comments.class)); - } - } - public CommentCollectingScanner(CommentCollectingScanner.Factory factory, CharBuffer charBuffer, Comments comments) { + public CommentCollectingScanner(CommentCollectingScannerFactory factory, CharBuffer charBuffer, Comments comments) { super(factory, charBuffer); this.comments = comments; } - public CommentCollectingScanner(CommentCollectingScanner.Factory factory, char[] input, int inputLength, Comments comments) { + public CommentCollectingScanner(CommentCollectingScannerFactory factory, char[] input, int inputLength, Comments comments) { super(factory, input, inputLength); this.comments = comments; } diff --git a/src/delombok/lombok/delombok/java6/CommentCollectingScannerFactory.java b/src/delombok/lombok/delombok/java6/CommentCollectingScannerFactory.java new file mode 100644 index 00000000..80806f57 --- /dev/null +++ b/src/delombok/lombok/delombok/java6/CommentCollectingScannerFactory.java @@ -0,0 +1,61 @@ +/* + * Copyright © 2011 Reinier Zwitserloot and Roel Spilker. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.delombok.java6; + +import java.nio.CharBuffer; + +import lombok.delombok.Delombok.Comments; + +import com.sun.tools.javac.parser.Scanner; +import com.sun.tools.javac.util.Context; + +public class CommentCollectingScannerFactory extends Scanner.Factory { + private final Context context; + + public static void preRegister(final Context context) { + context.put(scannerFactoryKey, new Context.Factory<Scanner.Factory>() { + public CommentCollectingScanner.Factory make() { + return new CommentCollectingScannerFactory(context); + } + }); + } + + /** Create a new scanner factory. */ + protected CommentCollectingScannerFactory(Context context) { + super(context); + this.context = context; + } + + @Override + public Scanner newScanner(CharSequence input) { + if (input instanceof CharBuffer) { + return new CommentCollectingScanner(this, (CharBuffer)input, context.get(Comments.class)); + } + char[] array = input.toString().toCharArray(); + return newScanner(array, array.length); + } + + @Override + public Scanner newScanner(char[] input, int inputLength) { + return new CommentCollectingScanner(this, input, inputLength, context.get(Comments.class)); + } +}
\ No newline at end of file |