fluencelabs/lalrpop
1
0
Fork 0
mirror of https://github.com/fluencelabs/lalrpop synced 2025-03-31 07:21:04 +00:00
Code Issues Projects Releases Wiki Activity

remove unstable features

Browse Source
This commit is contained in:
Niko Matsakis 2017-03-23 05:59:05 -04:00
parent 4cc5e50166
commit 301a2a23e2
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lalrpop-snap/src/lib.rs
View File

@ -10,7 +10,7 @@
extern crate atty; extern crate atty;
extern crate bit_set; extern crate bit_set;
#[macro_use] extern crate bitflags; extern crate bitflags;
extern crate diff; extern crate diff;
extern crate itertools; extern crate itertools;
extern crate lalrpop_intern as intern; extern crate lalrpop_intern as intern;

8
lalrpop/src/lr1/lane_table/construct/merge.rs
View File

@ -30,15 +30,15 @@ impl<'m, 'grammar> Merge<'m, 'grammar> {
inconsistent_state: StateIndex) inconsistent_state: StateIndex)
-> Self { -> Self {
Merge { Merge {
table, table: table,
states, states: states,
visited: Set::new(), visited: Set::new(),
original_indices: Map::new(), original_indices: Map::new(),
clones: Multimap::new(), clones: Multimap::new(),
target_states: vec![inconsistent_state], target_states: vec![inconsistent_state],
context_sets: ContextSets { context_sets: ContextSets {
unify, unify: unify,
state_sets, state_sets: state_sets,
} }
} }
} }

9
lalrpop/src/lr1/lane_table/construct/mod.rs
View File

@ -29,9 +29,9 @@ impl<'grammar> LaneTableConstruct<'grammar> {
pub fn new(grammar: &'grammar Grammar, start: NonterminalString) -> Self { pub fn new(grammar: &'grammar Grammar, start: NonterminalString) -> Self {
let first_sets = FirstSets::new(grammar); let first_sets = FirstSets::new(grammar);
Self { Self {
grammar, grammar: grammar,
start, start: start,
first_sets, first_sets: first_sets,
} }
} }
@ -64,7 +64,8 @@ impl<'grammar> LaneTableConstruct<'grammar> {
states.iter() states.iter()
.flat_map(|s| Lookahead::conflicts(&s)) .flat_map(|s| Lookahead::conflicts(&s))
.collect(); .collect();
return Err(TableConstructionError { states, conflicts }); return Err(TableConstructionError { states: states,
conflicts: conflicts });
} }
} }
} }

4
lalrpop/src/lr1/lane_table/lane/mod.rs
View File

@ -26,8 +26,8 @@ impl<'trace, 'grammar, L: Lookahead> LaneTracer<'trace, 'grammar, L> {
-> Self { -> Self {
LaneTracer { LaneTracer {
states: states, states: states,
first_sets, first_sets: first_sets,
state_graph, state_graph: state_graph,
table: LaneTable::new(grammar, conflicts), table: LaneTable::new(grammar, conflicts),
} }
} }

1
lalrpop/src/lr1/lane_table/test.rs
View File

@ -342,7 +342,6 @@ fn paper_example_large_build() {
let _tls = Tls::test(); let _tls = Tls::test();
let grammar = paper_example_large(); let grammar = paper_example_large();
let _lr1_tls = Lr1Tls::install(grammar.terminals.clone()); 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() let states = LaneTableConstruct::new(&grammar, nt("G")).construct()
.expect("failed to build lane table states"); .expect("failed to build lane table states");