From 2232ea5101daddfba2e53bb4e07104f298f65a85 Mon Sep 17 00:00:00 2001
From: Terence Parr <parrt@antlr.org>
Date: Mon, 19 Mar 2012 17:50:51 -0700
Subject: [PATCH] was not computing lookahead correctly in _LOOK.  It assumed
 all epsilons were predicates.

---
 .../org/antlr/v4/runtime/atn/LL1Analyzer.java | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/LL1Analyzer.java b/runtime/Java/src/org/antlr/v4/runtime/atn/LL1Analyzer.java
index 28e60f97d..bc9f6735f 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/atn/LL1Analyzer.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/atn/LL1Analyzer.java
@@ -114,29 +114,34 @@ public class LL1Analyzer {
 
         int n = s.getNumberOfTransitions();
         for (int i=0; i<n; i++) {
-            Transition t = s.transition(i);
-            if ( t.getClass() == RuleTransition.class ) {
-                RuleContext newContext =
-                    new RuleContext(ctx, s.stateNumber);
-                _LOOK(t.target, newContext, look, lookBusy, seeThruPreds);
-            }
-            else if ( t.isEpsilon() && seeThruPreds ) {
-                _LOOK(t.target, ctx, look, lookBusy, seeThruPreds);
-            }
-            else if ( t.getClass() == WildcardTransition.class ) {
-                look.addAll( IntervalSet.of(Token.MIN_USER_TOKEN_TYPE, atn.maxTokenType) );
-            }
-            else {
+			Transition t = s.transition(i);
+			if ( t.getClass() == RuleTransition.class ) {
+				RuleContext newContext =
+				new RuleContext(ctx, s.stateNumber);
+				_LOOK(t.target, newContext, look, lookBusy, seeThruPreds);
+			}
+			else if ( t instanceof PredicateTransition ) {
+				if ( seeThruPreds ) {
+					_LOOK(t.target, ctx, look, lookBusy, seeThruPreds);
+				}
+			}
+			else if ( t.isEpsilon() ) {
+				_LOOK(t.target, ctx, look, lookBusy, seeThruPreds);
+			}
+			else if ( t.getClass() == WildcardTransition.class ) {
+				look.addAll( IntervalSet.of(Token.MIN_USER_TOKEN_TYPE, atn.maxTokenType) );
+			}
+			else {
 //				System.out.println("adding "+ t);
-                IntervalSet set = t.label();
-                if (set != null) {
-                    if (t instanceof NotSetTransition) {
-                        set = set.complement(IntervalSet.of(Token.MIN_USER_TOKEN_TYPE, atn.maxTokenType));
-                    }
-                    look.addAll(set);
-                }
-            }
-        }
-    }
+				IntervalSet set = t.label();
+				if (set != null) {
+					if (t instanceof NotSetTransition) {
+						set = set.complement(IntervalSet.of(Token.MIN_USER_TOKEN_TYPE, atn.maxTokenType));
+					}
+					look.addAll(set);
+				}
+			}
+		}
+	}
 
 }