Skip to content

Commit fcb5968

Browse files
committed
Eliminate eof token state
1 parent bb85c61 commit fcb5968

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

src/algorithm.rs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ pub enum Token {
3232
Break(BreakToken),
3333
Begin(BeginToken),
3434
End,
35-
Eof,
3635
}
3736

3837
#[derive(Copy, Clone)]
@@ -83,27 +82,16 @@ struct BufEntry {
8382
size: isize,
8483
}
8584

86-
impl Default for BufEntry {
87-
fn default() -> Self {
88-
BufEntry {
89-
token: Token::Eof,
90-
size: 0,
91-
}
92-
}
93-
}
94-
9585
impl Printer {
9686
pub fn new() -> Self {
9787
let linewidth = 78;
98-
let mut buf = RingBuffer::new();
99-
buf.advance_right();
10088
Printer {
10189
out: String::new(),
10290
margin: linewidth as isize,
10391
space: linewidth as isize,
10492
left: 0,
10593
right: 0,
106-
buf,
94+
buf: RingBuffer::new(),
10795
left_total: 0,
10896
right_total: 0,
10997
scan_stack: VecDeque::new(),
@@ -344,7 +332,6 @@ impl Printer {
344332
assert_eq!(len, l);
345333
self.print_string(s);
346334
}
347-
Token::Eof => panic!(), // Eof should never get here.
348335
}
349336
}
350337
}

src/ring.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ impl<T> RingBuffer<T> {
1919
self.data.push_back(value);
2020
}
2121

22-
pub fn advance_right(&mut self)
23-
where
24-
T: Default,
25-
{
26-
self.data.push_back(T::default());
27-
}
28-
2922
pub fn advance_left(&mut self) {
3023
self.data.pop_front().unwrap();
3124
self.offset += 1;

0 commit comments

Comments
 (0)