Cleanup

5 files changed, 17 insertions, 16 deletions

diff --git a/AUTHORS b/AUTHORS
index a9339bd2..aaa6b258 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 Lombok contributors in alphabetical order:
 
+Bulgakov Alexander <buls@yandex.ru>
 Christian Sterzl <christian.sterzl@gmail.com>
 DaveLaw <project.lombok@apconsult.de>
 Dawid Rusin <dawidrusin90@gmail.com>
@@ -19,6 +20,5 @@ Szymon Pacanowski <spacanowski@gmail.com>
 Taiki Sugawara <buzz.taiki@gmail.com>
 Thomas Darimont <thomas.darimont@gmail.com>
 Yun Zhi Lin <yun@yunspace.com>
-Bulgakov Alexander <buls@yandex.ru>
 
 By adding your name to this list, you grant full and irrevocable copyright and patent indemnity to Project Lombok and all use of Project Lombok, and you certify that you have the right to do so for all commits you add to Project Lombok.
diff --git a/doc/changelog.markdown b/doc/changelog.markdown
index 0ee812e7..89df8709 100644
--- a/doc/changelog.markdown
+++ b/doc/changelog.markdown
@@ -3,6 +3,7 @@ Lombok Changelog
 
 ### v1.16.11 "Edgy Guinea Pig"
 * v1.16.10 is the latest release
+* BUGFIX: `val` in lambda expressions now work as expected [Issue #911](https://github.com/rzwitserloot/lombok/issues/911)
 * PLATFORM: Red Hat JBoss Developer Studio is now correctly identified by the installer [Issue #1164](https://github.com/rzwitserloot/lombok/issues/1164)
 * BUGFIX: delombok: for-loops with initializers that are not local variables would be generated incorrectly [Issue #1076](https://github.com/rzwitserloot/lombok/issues/1076)
 
diff --git a/src/core/lombok/core/AST.java b/src/core/lombok/core/AST.java
index 2d5e5352..1142018f 100644
--- a/src/core/lombok/core/AST.java
+++ b/src/core/lombok/core/AST.java
@@ -62,12 +62,18 @@ public abstract class AST<A extends AST<A, L, N>, L extends LombokNode<A, L, N>,
 	Map<N, N> identityDetector = new IdentityHashMap<N, N>();
 	private Map<N, L> nodeMap = new IdentityHashMap<N, L>();
 	private boolean changed = false;
+	
+	// The supertypes which are considered AST Node children. Usually, the Statement, and the Expression,
+	// though some platforms (such as Eclipse) group these under one common supertype.
+	private final Collection<Class<? extends N>> statementTypes;
+	
 	private static final HistogramTracker configTracker = System.getProperty("lombok.timeConfig") == null ? null : new HistogramTracker("lombok.config");
 	
-	protected AST(String fileName, String packageDeclaration, ImportList imports) {
+	protected AST(String fileName, String packageDeclaration, ImportList imports, Collection<Class<? extends N>> statementTypes) {
 		this.fileName = fileName == null ? "(unknown).java" : fileName;
 		this.packageDeclaration = packageDeclaration;
 		this.imports = imports;
+		this.statementTypes = statementTypes;
 	}
 	
 	/**
@@ -262,13 +268,8 @@ public abstract class AST<A extends AST<A, L, N>, L extends LombokNode<A, L, N>,
 		return Object.class;
 	}
 	
-	/**
-	 * The supertypes which are considered AST Node children. Usually, the Statement, and the Expression,
-	 * though some platforms (such as Eclipse) group these under one common supertype. */
-	protected abstract Collection<Class<? extends N>> getStatementTypes();
-	
-	protected boolean shouldDrill(Class<?> parentType, Class<?> childType, String fieldName) {
-		for (Class<?> statementType : getStatementTypes()) {
+	private boolean shouldDrill(Class<?> parentType, Class<?> childType, String fieldName) {
+		for (Class<?> statementType : statementTypes) {
 			if (statementType.isAssignableFrom(childType)) return true;
 		}
 		
diff --git a/src/core/lombok/eclipse/EclipseAST.java b/src/core/lombok/eclipse/EclipseAST.java
index 6741b33a..dc2c9843 100644
--- a/src/core/lombok/eclipse/EclipseAST.java
+++ b/src/core/lombok/eclipse/EclipseAST.java
@@ -62,7 +62,7 @@ public class EclipseAST extends AST<EclipseAST, EclipseNode, ASTNode> {
 	 * @param ast The compilation unit, which serves as the top level node in the tree to be built.
 	 */
 	public EclipseAST(CompilationUnitDeclaration ast) {
-		super(toFileName(ast), packageDeclaration(ast), new EclipseImportList(ast));
+		super(toFileName(ast), packageDeclaration(ast), new EclipseImportList(ast), statementTypes());
 		this.compilationUnitDeclaration = ast;
 		setTop(buildCompilationUnit(ast));
 		this.completeParse = isComplete(ast);
@@ -477,9 +477,9 @@ public class EclipseAST extends AST<EclipseAST, EclipseNode, ASTNode> {
 		return putInMap(new EclipseNode(this, statement, childNodes, Kind.STATEMENT));
 	}
 	
-	/** For Eclipse, only Statement counts, as Expression is a subclass of it, even though this isn't
+	/* For Eclipse, only Statement counts, as Expression is a subclass of it, even though this isn't
 	 * entirely correct according to the JLS spec (only some expressions can be used as statements, not all of them). */
-	@Override protected Collection<Class<? extends ASTNode>> getStatementTypes() {
+	private static Collection<Class<? extends ASTNode>> statementTypes() {
 		return Collections.<Class<? extends ASTNode>>singleton(Statement.class);
 	}
 	
diff --git a/src/core/lombok/javac/JavacAST.java b/src/core/lombok/javac/JavacAST.java
index 3130e7a5..106a29ae 100644
--- a/src/core/lombok/javac/JavacAST.java
+++ b/src/core/lombok/javac/JavacAST.java
@@ -81,7 +81,7 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> {
 	 * @param top The compilation unit, which serves as the top level node in the tree to be built.
 	 */
 	public JavacAST(Messager messager, Context context, JCCompilationUnit top) {
-		super(sourceName(top), PackageName.getPackageName(top), new JavacImportList(top));
+		super(sourceName(top), PackageName.getPackageName(top), new JavacImportList(top), statementTypes());
 		setTop(buildCompilationUnit(top));
 		this.context = context;
 		this.messager = messager;
@@ -383,9 +383,8 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> {
 		}
 	}
 	
-	/** For javac, both JCExpression and JCStatement are considered as valid children types. */
-	@Override
-	protected Collection<Class<? extends JCTree>> getStatementTypes() {
+	/* For javac, both JCExpression and JCStatement are considered as valid children types. */
+	private static Collection<Class<? extends JCTree>> statementTypes() {
 		Collection<Class<? extends JCTree>> collection = new ArrayList<Class<? extends JCTree>>(3);
 		collection.add(JCStatement.class);
 		collection.add(JCExpression.class);