Skip to content
Permalink
Browse files

Rename is_bol -> is_beginning_of_line

Also moves it to pp::Printer from PrintState.
  • Loading branch information...
Mark-Simulacrum committed Jul 9, 2019
1 parent 39aa9bf commit e91dbc5916f508849532d1c7b3069b6c0c3a609b
Showing with 11 additions and 12 deletions.
  1. +2 −2 src/librustc/hir/print.rs
  2. +5 −1 src/libsyntax/print/pp.rs
  3. +4 −9 src/libsyntax/print/pprust.rs
@@ -187,13 +187,13 @@ impl<'a> State<'a> {
}

pub fn space_if_not_bol(&mut self) {
if !self.is_bol() {
if !self.s.is_beginning_of_line() {
self.s.space();
}
}

pub fn break_offset_if_not_bol(&mut self, n: usize, off: isize) {
if !self.is_bol() {
if !self.s.is_beginning_of_line() {
self.s.break_offset(n, off)
} else {
if off != 0 && self.s.last_token().is_hardbreak_tok() {
@@ -301,7 +301,7 @@ impl Default for BufEntry {
}

impl Printer {
pub fn last_token(&mut self) -> Token {
pub fn last_token(&self) -> Token {
self.buf[self.right].token.clone()
}

@@ -651,6 +651,10 @@ impl Printer {
self.spaces(SIZE_INFINITY as usize)
}

pub fn is_beginning_of_line(&self) -> bool {
self.last_token().is_eof() || self.last_token().is_hardbreak_tok()
}

pub fn hardbreak_tok_offset(off: isize) -> Token {
Token::Break(BreakToken {offset: off, blank_space: SIZE_INFINITY})
}
@@ -445,13 +445,8 @@ pub trait PrintState<'a> {

fn pclose(&mut self) { self.writer().word(")") }

// is this the beginning of a line?
fn is_bol(&mut self) -> bool {
self.writer().last_token().is_eof() || self.writer().last_token().is_hardbreak_tok()
}

fn hardbreak_if_not_bol(&mut self) {
if !self.is_bol() {
if !self.writer().is_beginning_of_line() {
self.writer().hardbreak()
}
}
@@ -512,7 +507,7 @@ pub trait PrintState<'a> {
}
}
comments::Trailing => {
if !self.is_bol() {
if !self.writer().is_beginning_of_line() {
self.writer().word(" ");
}
if cmnt.lines.len() == 1 {
@@ -735,7 +730,7 @@ pub trait PrintState<'a> {
}

fn space_if_not_bol(&mut self) {
if !self.is_bol() { self.writer().space(); }
if !self.writer().is_beginning_of_line() { self.writer().space(); }
}

fn nbsp(&mut self) { self.writer().word(" ") }
@@ -793,7 +788,7 @@ impl<'a> State<'a> {

crate fn break_offset_if_not_bol(&mut self, n: usize,
off: isize) {
if !self.is_bol() {
if !self.s.is_beginning_of_line() {
self.s.break_offset(n, off)
} else {
if off != 0 && self.s.last_token().is_hardbreak_tok() {

0 comments on commit e91dbc5

Please sign in to comment.
You can’t perform that action at this time.