From a9f334fde93a0b07820962bff0b602ef0be731cf Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 1 Nov 2011 00:13:22 +0100 Subject: Fixed issue 284 now also for java7, introduced more stubbing --- src/delombok/lombok/delombok/Delombok.java | 4 +- .../com/sun/tools/javac/parser/EndPosParser.java | 19 ++++++++ src/stubs/com/sun/tools/javac/parser/Lexer.java | 5 +++ .../com/sun/tools/javac/parser/ParserFactory.java | 11 +++++ src/stubs/com/sun/tools/javac/parser/Scanner.java | 2 +- .../com/sun/tools/javac/parser/ScannerFactory.java | 4 ++ .../com/sun/tools/javac/parser/Parser.java | 5 +++ .../com/sun/tools/javac/tree/JCTree.java | 5 +++ .../javac/java6/CommentCollectingParser.java | 6 +-- .../java6/CommentCollectingParserFactory.java | 11 +++-- .../javac/java7/CommentCollectingParser.java | 33 ++++++++++++++ .../java7/CommentCollectingParserFactory.java | 52 ++++++++++++++++++++++ 12 files changed, 147 insertions(+), 10 deletions(-) create mode 100644 src/stubs/com/sun/tools/javac/parser/EndPosParser.java create mode 100644 src/stubs/com/sun/tools/javac/parser/Lexer.java create mode 100644 src/stubs/com/sun/tools/javac/parser/ParserFactory.java create mode 100644 src/stubsstubs/com/sun/tools/javac/parser/Parser.java create mode 100644 src/stubsstubs/com/sun/tools/javac/tree/JCTree.java create mode 100644 src/utils/lombok/javac/java7/CommentCollectingParser.java create mode 100644 src/utils/lombok/javac/java7/CommentCollectingParserFactory.java (limited to 'src') diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index c6d3444a..a66c3264 100644 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -358,8 +358,9 @@ public class Delombok { options.put("compilePolicy", "attr"); + registerCommentsCollectingScannerFactory(context); JavaCompiler compiler = new JavaCompiler(context); - + Map> commentsMap = new IdentityHashMap>(); setInCompiler(compiler, context, commentsMap); @@ -369,7 +370,6 @@ public class Delombok { List roots = new ArrayList(); Map baseMap = new IdentityHashMap(); - registerCommentsCollectingScannerFactory(context); compiler.initProcessAnnotations(Collections.singleton(new lombok.javac.apt.Processor())); diff --git a/src/stubs/com/sun/tools/javac/parser/EndPosParser.java b/src/stubs/com/sun/tools/javac/parser/EndPosParser.java new file mode 100644 index 00000000..1ffd6ec5 --- /dev/null +++ b/src/stubs/com/sun/tools/javac/parser/EndPosParser.java @@ -0,0 +1,19 @@ +package com.sun.tools.javac.parser; + +import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; + +public class EndPosParser { + public EndPosParser(Parser.Factory fac, Lexer S, boolean keepDocComments) { + } + + public EndPosParser(ParserFactory fac, Lexer S, boolean keepDocComments, boolean keepLineMap) { + } + + public JCCompilationUnit compilationUnit() { + return null; + } + + public JCCompilationUnit parseCompilationUnit() { + return null; + } +} diff --git a/src/stubs/com/sun/tools/javac/parser/Lexer.java b/src/stubs/com/sun/tools/javac/parser/Lexer.java new file mode 100644 index 00000000..b0824501 --- /dev/null +++ b/src/stubs/com/sun/tools/javac/parser/Lexer.java @@ -0,0 +1,5 @@ +package com.sun.tools.javac.parser; + +public interface Lexer { + +} diff --git a/src/stubs/com/sun/tools/javac/parser/ParserFactory.java b/src/stubs/com/sun/tools/javac/parser/ParserFactory.java new file mode 100644 index 00000000..193f2333 --- /dev/null +++ b/src/stubs/com/sun/tools/javac/parser/ParserFactory.java @@ -0,0 +1,11 @@ +package com.sun.tools.javac.parser; + +import com.sun.tools.javac.util.Context; + +public class ParserFactory { + public static Context.Key parserFactoryKey; + + public ParserFactory(Context context) { + + } +} \ No newline at end of file diff --git a/src/stubs/com/sun/tools/javac/parser/Scanner.java b/src/stubs/com/sun/tools/javac/parser/Scanner.java index f6f1d25d..af94bacc 100644 --- a/src/stubs/com/sun/tools/javac/parser/Scanner.java +++ b/src/stubs/com/sun/tools/javac/parser/Scanner.java @@ -7,7 +7,7 @@ import java.nio.CharBuffer; import com.sun.tools.javac.util.Context; -public class Scanner { +public class Scanner implements Lexer { protected Scanner(Factory fac, CharBuffer buffer) { } diff --git a/src/stubs/com/sun/tools/javac/parser/ScannerFactory.java b/src/stubs/com/sun/tools/javac/parser/ScannerFactory.java index 26483db3..7f9418de 100644 --- a/src/stubs/com/sun/tools/javac/parser/ScannerFactory.java +++ b/src/stubs/com/sun/tools/javac/parser/ScannerFactory.java @@ -11,6 +11,10 @@ public class ScannerFactory { protected ScannerFactory(Context c) { } + public static ScannerFactory instance(Context c) { + return null; + } + public Scanner newScanner(CharSequence input, boolean keepDocComments) { return null; } diff --git a/src/stubsstubs/com/sun/tools/javac/parser/Parser.java b/src/stubsstubs/com/sun/tools/javac/parser/Parser.java new file mode 100644 index 00000000..20d4954f --- /dev/null +++ b/src/stubsstubs/com/sun/tools/javac/parser/Parser.java @@ -0,0 +1,5 @@ +package com.sun.tools.javac.parser; + +public class Parser { + public static class Factory {} +} diff --git a/src/stubsstubs/com/sun/tools/javac/tree/JCTree.java b/src/stubsstubs/com/sun/tools/javac/tree/JCTree.java new file mode 100644 index 00000000..28edf665 --- /dev/null +++ b/src/stubsstubs/com/sun/tools/javac/tree/JCTree.java @@ -0,0 +1,5 @@ +package com.sun.tools.javac.tree; + +public class JCTree { + public static class JCCompilationUnit extends JCTree {} +} diff --git a/src/utils/lombok/javac/java6/CommentCollectingParser.java b/src/utils/lombok/javac/java6/CommentCollectingParser.java index bc33bf71..0915bbb8 100644 --- a/src/utils/lombok/javac/java6/CommentCollectingParser.java +++ b/src/utils/lombok/javac/java6/CommentCollectingParser.java @@ -6,6 +6,7 @@ import lombok.javac.Comment; import com.sun.tools.javac.parser.EndPosParser; import com.sun.tools.javac.parser.Lexer; +import com.sun.tools.javac.parser.Parser; import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; import com.sun.tools.javac.util.List; @@ -13,12 +14,11 @@ class CommentCollectingParser extends EndPosParser { private final Map> commentsMap; private final Lexer lexer; - - protected CommentCollectingParser(Factory fac, Lexer S, boolean keepDocComments, Map> commentsMap) { + + protected CommentCollectingParser(Parser.Factory fac, Lexer S, boolean keepDocComments, Map> commentsMap) { super(fac, S, keepDocComments); lexer = S; this.commentsMap = commentsMap; - } @Override public JCCompilationUnit compilationUnit() { diff --git a/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java b/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java index ef8b22c4..074f956e 100644 --- a/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java +++ b/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java @@ -13,9 +13,8 @@ import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.List; public class CommentCollectingParserFactory extends Parser.Factory { - private final Map> commentsMap; - + static Context.Key key() { return parserFactoryKey; } @@ -26,7 +25,11 @@ public class CommentCollectingParserFactory extends Parser.Factory { } @Override public Parser newParser(Lexer S, boolean keepDocComments, boolean genEndPos) { - return new CommentCollectingParser(this, S, keepDocComments, commentsMap); + Object x = new CommentCollectingParser(this, S, keepDocComments, commentsMap); + return (Parser) x; + // CCP is based on a stub which extends nothing, but at runtime the stub is replaced with either + //javac6's EndPosParser which extends Parser, or javac7's EndPosParser which implements Parser. + //Either way this will work out. } public static void setInCompiler(JavaCompiler compiler, Context context, Map> commentsMap) { @@ -38,6 +41,6 @@ public class CommentCollectingParserFactory extends Parser.Factory { field.set(compiler, new CommentCollectingParserFactory(context, commentsMap)); } catch (Exception e) { throw new IllegalStateException("Could not set comment sensitive parser in the compiler", e); - } + } } } \ No newline at end of file diff --git a/src/utils/lombok/javac/java7/CommentCollectingParser.java b/src/utils/lombok/javac/java7/CommentCollectingParser.java new file mode 100644 index 00000000..7c3cdc71 --- /dev/null +++ b/src/utils/lombok/javac/java7/CommentCollectingParser.java @@ -0,0 +1,33 @@ +package lombok.javac.java7; + +import java.util.Map; + +import lombok.javac.Comment; + +import com.sun.tools.javac.parser.EndPosParser; +import com.sun.tools.javac.parser.Lexer; +import com.sun.tools.javac.parser.ParserFactory; +import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; +import com.sun.tools.javac.util.List; + +class CommentCollectingParser extends EndPosParser { + + private final Map> commentsMap; + private final Lexer lexer; + + protected CommentCollectingParser(ParserFactory fac, Lexer S, + boolean keepDocComments, boolean keepLineMap, Map> commentsMap) { + super(fac, S, keepDocComments, keepLineMap); + lexer = S; + this.commentsMap = commentsMap; + } + + public JCCompilationUnit parseCompilationUnit() { + JCCompilationUnit result = super.parseCompilationUnit(); + if (lexer instanceof CommentCollectingScanner) { + List comments = ((CommentCollectingScanner)lexer).getComments(); + commentsMap.put(result, comments); + } + return result; + } +} \ No newline at end of file diff --git a/src/utils/lombok/javac/java7/CommentCollectingParserFactory.java b/src/utils/lombok/javac/java7/CommentCollectingParserFactory.java new file mode 100644 index 00000000..8b93376a --- /dev/null +++ b/src/utils/lombok/javac/java7/CommentCollectingParserFactory.java @@ -0,0 +1,52 @@ +package lombok.javac.java7; + +import java.lang.reflect.Field; +import java.util.Map; + +import lombok.javac.Comment; + +import com.sun.tools.javac.main.JavaCompiler; +import com.sun.tools.javac.parser.Lexer; +import com.sun.tools.javac.parser.Parser; +import com.sun.tools.javac.parser.ParserFactory; +import com.sun.tools.javac.parser.ScannerFactory; +import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.List; + +public class CommentCollectingParserFactory extends ParserFactory { + private final Map> commentsMap; + private final Context context; + + static Context.Key key() { + return parserFactoryKey; + } + + protected CommentCollectingParserFactory(Context context, Map> commentsMap) { + super(context); + this.context = context; + this.commentsMap = commentsMap; + } + + public Parser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) { + ScannerFactory scannerFactory = ScannerFactory.instance(context); + Lexer lexer = scannerFactory.newScanner(input, keepDocComments); + Object x = new CommentCollectingParser(this, lexer, keepDocComments, keepLineMap, commentsMap); + return (Parser) x; + // CCP is based on a stub which extends nothing, but at runtime the stub is replaced with either + //javac6's EndPosParser which extends Parser, or javac7's EndPosParser which implements Parser. + //Either way this will work out. + } + + public static void setInCompiler(JavaCompiler compiler, Context context, Map> commentsMap) { + context.put(CommentCollectingParserFactory.key(), (ParserFactory)null); + Field field; + try { + field = JavaCompiler.class.getDeclaredField("parserFactory"); + field.setAccessible(true); + field.set(compiler, new CommentCollectingParserFactory(context, commentsMap)); + } catch (Exception e) { + throw new IllegalStateException("Could not set comment sensitive parser in the compiler", e); + } + } +} \ No newline at end of file -- cgit