Merge branch 'delombok_java7'

build.xml

@@ -69,14 +69,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	<target name="deps" depends="ensureBuildDeps, ensureRuntimeDeps, ensureTestDeps, contrib" description="Downloads all dependencies." />
 	
 	<target name="contrib" depends="config-ivy" description="Downloads various non-crucial documentation, sources, etc that are useful when developing lombok.ast.">
-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib" />
-		<ivy:retrieve />
-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="ecj" />
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib, ecj" />
 		<ivy:retrieve />
 	</target>
 	
 	<target name="ensureBuildDeps" depends="config-ivy">
-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="build" />
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="build, javac7" />
 		<ivy:retrieve />
 	</target>
 	
@@ -132,7 +130,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running.
 		We re-create the file at the end of this target. -->
 		<delete file="build/lombok/META-INF/services/javax.annotation.processing.Processor" quiet="true" />
+		<ivy:compile destdir="build/stubs" source="1.5" target="1.5" includeantruntime="false">
+			<src path="src/stubs" />
+		</ivy:compile>
+		
 		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" includeantruntime="false">
+			<compilerarg value="-Xbootclasspath/p:build/stubs" />
 			<src path="src/core" />
 			<src path="src/installer" />
 			<src path="src/eclipseAgent" />
@@ -140,7 +143,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<classpath refid="build.path" />
 		</ivy:compile>
 		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false">
-			<src path="src/contrib" />
+			<compilerarg value="-Xbootclasspath/p:build/stubs" />
 			<src path="src/core" />
 			<src path="src/delombok" />
 			<include name="com/sun/**" />
@@ -187,7 +190,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 				<srcdir dir="src/eclipseAgent" />
 				<srcdir dir="src/installer" />
 				<srcdir dir="src/delombok" />
-				<srcdir dir="src/contrib" />
+				<srcdir dir="src/stubs" />
 				<srcdir dir="experimental/src" />
 				<srcdir dir="test/transform/src" test="true" />
 				<srcdir dir="test/core/src" test="true" />
@@ -206,7 +209,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<srcdir dir="src/eclipseAgent" />
 			<srcdir dir="src/installer" />
 			<srcdir dir="src/delombok" />
-			<srcdir dir="src/contrib" />
+			<srcdir dir="src/stubs" />
 			<srcdir dir="experimental/src" />
 			<srcdir dir="test/transform/src" />
 			<srcdir dir="test/core/src" />

buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml

@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="net.java.openjdk.custom" module="javac6" revision="1.6.0.18" publication="20100225011200">
+		<license name="GNU General Public License v2 with Classpath Exception" url="http://openjdk.java.net/legal/gplv2+ce.html" />
+		<description homepage="http://openjdk.java.net/" />
+	</info>
+	<configurations>
+		<conf name="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac-1.6.0.18.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-1.6.0.18-sources.zip" />
+	</publications>
+</ivy-module>

buildScripts/ivy-repo/net.java.openjdk.custom-javac7-1.7.0.xml

@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-	<info organisation="projectlombok.org" module="javac" revision="1.6.0.18" publication="20100225011200">
+	<info organisation="net.java.openjdk.custom" module="javac7" revision="1.7.0" publication="20110811230000">
 		<license name="GNU General Public License v2 with Classpath Exception" url="http://openjdk.java.net/legal/gplv2+ce.html" />
 		<description homepage="http://openjdk.java.net/" />
 	</info>
@@ -8,7 +8,7 @@
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac.jar" />
-		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-sources.zip" />
+		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0-sources.zip" />
 	</publications>
 </ivy-module>

buildScripts/ivy.xml

@@ -8,6 +8,7 @@
 		<conf name="test" extends="build, runtime" />
 		<conf name="contrib" />
 		<conf name="ecj" />
+		<conf name="javac7" />
 	</configurations>
 	<dependencies>
 		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.5" conf="build; runtime->build" />
@@ -27,7 +28,8 @@
 		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" />
 		<dependency org="de.java2html" name="java2html" rev="5.0" conf="build->default" />
 		
-		<dependency org="projectlombok.org" name="javac" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
+		<dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
+		<dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" />
 		<dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="ecj->default; contrib->sources" />
 		
 		<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />

src/contrib/com/sun/tools/javac/file/BaseFileObject.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * The lombok team has removed the implementation
- */
-package com.sun.tools.javac.file;
-
-import javax.tools.JavaFileObject;
-
-/**
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
-*/
-public abstract class BaseFileObject implements JavaFileObject {
-	protected BaseFileObject(JavacFileManager fileManager) {}
-}

src/contrib/com/sun/tools/javac/file/JavacFileManager.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * The lombok team has removed the implementation
- */
-package com.sun.tools.javac.file;
-
-
-/**
- * This class provides access to the source, class and other files
- * used by the compiler and related tools.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- */
-public class JavacFileManager {}

src/core/lombok/eclipse/Eclipse.java

@@ -581,7 +581,10 @@ public class Eclipse {
 	 * @param typeRef A type reference to check.
 	 */
 	public static boolean typeMatches(Class<?> type, EclipseNode node, TypeReference typeRef) {
-		if (typeRef == null || typeRef.getTypeName() == null) return false;
+		if (typeRef == null || typeRef.getTypeName() == null || typeRef.getTypeName().length == 0) return false;
+		String lastPartA = new String(typeRef.getTypeName()[typeRef.getTypeName().length -1]);
+		String lastPartB = type.getSimpleName();
+		if (!lastPartA.equals(lastPartB)) return false;
 		String typeName = toQualifiedName(typeRef.getTypeName());
 		
 		TypeLibrary library = new TypeLibrary();

src/core/lombok/javac/apt/Javac6BaseFileObjectWrapper.java

@@ -33,6 +33,8 @@ import java.nio.charset.CharsetDecoder;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.NestingKind;
 
+// Weird SuppressWarnings, but javac doesn't understand 'all' and eclipse doesn't understand that this file contains deprecation references.
+@SuppressWarnings({"all", "deprecation"})
 class Javac6BaseFileObjectWrapper extends com.sun.tools.javac.util.BaseFileObject {
 	private final LombokFileObject delegate;
 	
@@ -48,7 +50,6 @@ class Javac6BaseFileObjectWrapper extends com.sun.tools.javac.util.BaseFileObjec
 		return delegate.toUri();
 	}
 	
-	@SuppressWarnings("all")
 	@Override public String getName() {
 		return delegate.getName();
 	}

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);
 		}
 	}

src/delombok/lombok/delombok/DelombokApp.java

@@ -87,7 +87,7 @@ public class DelombokApp implements LombokApp {
 		final JarFile toolsJarFile = new JarFile(toolsJar);
 		
 		ClassLoader loader = new ClassLoader() {
-			private Class<?>loadStreamAsClass(String name, boolean resolve, InputStream in) throws ClassNotFoundException {
+			private Class<?> loadStreamAsClass(String name, boolean resolve, InputStream in) throws ClassNotFoundException {
 				try {
 					try {
 						byte[] b = new byte[65536];

src/delombok/lombok/delombok/PrettyCommentsPrinter.java

@@ -663,9 +663,9 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
                 else
                     print("class " + tree.name);
                 printTypeParameters(tree.typarams);
-                if (tree.extending != null) {
+                if (tree.getExtendsClause() != null) {
                     print(" extends ");
-                    printExpr(tree.extending);
+                    printExpr(tree.getExtendsClause());
                 }
                 if (tree.implementing.nonEmpty()) {
                     print(" implements ");
@@ -1495,8 +1495,13 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 
     public void visitTree(JCTree tree) {
         try {
-            print("(UNKNOWN: " + tree + ")");
-            println();
+            if ("JCTypeUnion".equals(tree.getClass().getSimpleName())) {
+                print(tree.toString());
+                return;
+            } else {
+                print("(UNKNOWN: " + tree + ")");
+                println();
+            }
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }

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;
 	}

src/delombok/lombok/delombok/java6/CommentCollectingScannerFactory.java

@@ -0,0 +1,65 @@
+/*
+ * 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);
+			}
+			
+			public CommentCollectingScanner.Factory make(Context c) {
+				return new CommentCollectingScannerFactory(c);
+			}
+		});
+	}
+	
+	/** 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));
+	}
+}

src/delombok/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';
+	}
+}

src/delombok/lombok/delombok/java7/CommentCollectingScannerFactory.java

@@ -0,0 +1,66 @@
+/*
+ * 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);
+			}
+			
+			@Override public ScannerFactory make(Context c) {
+				return new CommentCollectingScannerFactory(c);
+			}
+		});
+	}
+	
+	/** 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));
+	}
+}

src/stubs/ABOUT

@@ -0,0 +1 @@
+These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.

src/stubs/com/sun/tools/javac/file/BaseFileObject.java

@@ -0,0 +1,10 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javac.file;
+
+import javax.tools.JavaFileObject;
+
+public abstract class BaseFileObject implements JavaFileObject {
+	protected BaseFileObject(JavacFileManager fileManager) {}
+}

src/stubs/com/sun/tools/javac/file/JavacFileManager.java

@@ -0,0 +1,6 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javac.file;
+
+public class JavacFileManager {}

src/stubs/com/sun/tools/javac/parser/Scanner.java

@@ -0,0 +1,62 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javac.parser;
+
+import java.nio.CharBuffer;
+
+import com.sun.tools.javac.util.Context;
+
+public class Scanner {
+	protected Scanner(Factory fac, CharBuffer buffer) {
+	}
+	
+	protected Scanner(Factory fac, char[] input, int inputLength) {
+	}
+	
+	protected Scanner(ScannerFactory fac, CharBuffer buffer) {
+	}
+	
+	protected Scanner(ScannerFactory fac, char[] input, int inputLength) {
+	}
+	
+	public static class Factory {
+		public static final Context.Key<Scanner.Factory> scannerFactoryKey = null;
+		
+		protected Factory(Context context) {
+		}
+		
+		public Scanner newScanner(CharSequence input) {
+			return null;
+		}
+		
+		public Scanner newScanner(char[] input, int inputLength) {
+			return null;
+		}
+	}
+	
+	public enum CommentStyle {
+		LINE,
+		BLOCK,
+		JAVADOC,
+	}
+	
+	protected void processComment(CommentStyle style) {
+	}
+	
+	public int prevEndPos() {
+		return -1;
+	}
+	
+	public int endPos() {
+		return -1;
+	}
+	
+	public int pos() {
+		return -1;
+	}
+	
+	public char[] getRawCharacters(int beginIndex, int endIndex) {
+		return null;
+	}
+}

src/stubs/com/sun/tools/javac/parser/ScannerFactory.java

@@ -0,0 +1,21 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javac.parser;
+
+import com.sun.tools.javac.util.Context;
+
+public class ScannerFactory {
+	public static final Context.Key<ScannerFactory> scannerFactoryKey = null;
+	
+	protected ScannerFactory(Context c) {
+	}
+	
+	public Scanner newScanner(CharSequence input, boolean keepDocComments) {
+		return null;
+	}
+	
+	public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) {
+		return null;
+	}
+}

src/stubs/com/sun/tools/javac/util/Context.java

@@ -0,0 +1,31 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javac.util;
+
+public class Context {
+	public static class Key<T> {
+	}
+	
+	public interface Factory<T> {
+		T make(Context c);
+		T make();
+	}
+	
+	public <T> void put(Key<T> key, Factory<T> fac) {
+	}
+	
+	public <T> void put(Key<T> key, T data) {
+	}
+	
+	public <T> void put(Class<T> clazz, T data) {
+	}
+	
+	public <T> T get(Key<T> key) {
+		return null;
+	}
+	
+	public <T> T get(Class<T> clazz) {
+		return null;
+	}
+}