diff --git a/lalrpop-snap/src/lib.rs b/lalrpop-snap/src/lib.rs index 22c5ded..ae3ec29 100644 --- a/lalrpop-snap/src/lib.rs +++ b/lalrpop-snap/src/lib.rs @@ -10,7 +10,7 @@ extern crate atty; extern crate bit_set; -#[macro_use] extern crate bitflags; +extern crate bitflags; extern crate diff; extern crate itertools; extern crate lalrpop_intern as intern; diff --git a/lalrpop/src/lr1/lane_table/construct/merge.rs b/lalrpop/src/lr1/lane_table/construct/merge.rs index 392424b..5f77caa 100644 --- a/lalrpop/src/lr1/lane_table/construct/merge.rs +++ b/lalrpop/src/lr1/lane_table/construct/merge.rs @@ -30,15 +30,15 @@ impl<'m, 'grammar> Merge<'m, 'grammar> { inconsistent_state: StateIndex) -> Self { Merge { - table, - states, + table: table, + states: states, visited: Set::new(), original_indices: Map::new(), clones: Multimap::new(), target_states: vec![inconsistent_state], context_sets: ContextSets { - unify, - state_sets, + unify: unify, + state_sets: state_sets, } } } diff --git a/lalrpop/src/lr1/lane_table/construct/mod.rs b/lalrpop/src/lr1/lane_table/construct/mod.rs index 4fdcc93..e48784f 100644 --- a/lalrpop/src/lr1/lane_table/construct/mod.rs +++ b/lalrpop/src/lr1/lane_table/construct/mod.rs @@ -29,9 +29,9 @@ impl<'grammar> LaneTableConstruct<'grammar> { pub fn new(grammar: &'grammar Grammar, start: NonterminalString) -> Self { let first_sets = FirstSets::new(grammar); Self { - grammar, - start, - first_sets, + grammar: grammar, + start: start, + first_sets: first_sets, } } @@ -64,7 +64,8 @@ impl<'grammar> LaneTableConstruct<'grammar> { states.iter() .flat_map(|s| Lookahead::conflicts(&s)) .collect(); - return Err(TableConstructionError { states, conflicts }); + return Err(TableConstructionError { states: states, + conflicts: conflicts }); } } } diff --git a/lalrpop/src/lr1/lane_table/lane/mod.rs b/lalrpop/src/lr1/lane_table/lane/mod.rs index 64e15a8..e62ba7d 100644 --- a/lalrpop/src/lr1/lane_table/lane/mod.rs +++ b/lalrpop/src/lr1/lane_table/lane/mod.rs @@ -26,8 +26,8 @@ impl<'trace, 'grammar, L: Lookahead> LaneTracer<'trace, 'grammar, L> { -> Self { LaneTracer { states: states, - first_sets, - state_graph, + first_sets: first_sets, + state_graph: state_graph, table: LaneTable::new(grammar, conflicts), } } diff --git a/lalrpop/src/lr1/lane_table/test.rs b/lalrpop/src/lr1/lane_table/test.rs index dcb6535..70369de 100644 --- a/lalrpop/src/lr1/lane_table/test.rs +++ b/lalrpop/src/lr1/lane_table/test.rs @@ -342,7 +342,6 @@ fn paper_example_large_build() { let _tls = Tls::test(); let grammar = paper_example_large(); let _lr1_tls = Lr1Tls::install(grammar.terminals.clone()); - let lr0_err = build::build_lr0_states(&grammar, nt("G")).unwrap_err(); let states = LaneTableConstruct::new(&grammar, nt("G")).construct() .expect("failed to build lane table states");