upgrade snapshot, remove #[LALR] annotation from lrgrammar.lalrpop

lalrpop-snap/src/lexer/dfa/overlap.rs

@@ -90,6 +90,7 @@ fn add_range(range: Test,
     }
 }
 
+#[cfg(test)]
 macro_rules! test {
     ($($range:expr,)*) => {
         {

lalrpop-snap/src/lr1/build/mod.rs

@@ -24,10 +24,10 @@ fn build_lr1_states_legacy<'grammar>(grammar: &'grammar Grammar, start: Nontermi
 
 type ConstructionFunction<'grammar> = fn(&'grammar Grammar, NonterminalString) -> LR1Result<'grammar> ;
 
-fn use_lane_table() -> bool {
+pub fn use_lane_table() -> bool {
     match env::var("LALRPOP_LANE_TABLE") {
-        Ok(ref s) => s == "enabled",
+        Ok(ref s) => s != "disabled",
-        _ => false
+        _ => true
     }
 }
 

lalrpop-snap/src/lr1/build_lalr/mod.rs

@@ -30,6 +30,14 @@ pub fn build_lalr_states<'grammar>(grammar: &'grammar Grammar,
     // First build the LR(1) states
     let lr_states = try!(build::build_lr1_states(grammar, start));
 
+    // With lane table, there is no reason to do state collapse
+    // for LALR. In fact, LALR is pointless!
+    if build::use_lane_table() {
+        println!("Warning: Now that the new lane-table algorithm is the default,");
+        println!("         #[lalr] mode has no effect and can be removed.");
+        return Ok(lr_states);
+    }
+
     profile! {
         &Tls::session(),
         "LALR(1) state collapse",

lalrpop/src/parser/lrgrammar.lalrpop

@@ -5,7 +5,6 @@ use std::iter::once;
 use tok::{self, Tok};
 use util::strip;
 
-#[LALR]
 grammar<'input>(text: &'input str);
 
 pub Grammar: Grammar =