Skip to content

Replace ancient op naming #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2020
Merged

Replace ancient op naming #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2728fbe
Rename op -> punct
dtolnay Oct 1, 2020
31084b4
Rename Punct::op to ch, print as char
dtolnay Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ impl Debug for Group {
/// `Punct` with different forms of `Spacing` returned.
#[derive(Clone)]
pub struct Punct {
op: char,
ch: char,
spacing: Spacing,
span: Span,
}
Expand All @@ -722,17 +722,17 @@ impl Punct {
///
/// The returned `Punct` will have the default span of `Span::call_site()`
/// which can be further configured with the `set_span` method below.
pub fn new(op: char, spacing: Spacing) -> Punct {
pub fn new(ch: char, spacing: Spacing) -> Punct {
Punct {
op,
ch,
spacing,
span: Span::call_site(),
}
}

/// Returns the value of this punctuation character as `char`.
pub fn as_char(&self) -> char {
self.op
self.ch
}

/// Returns the spacing of this punctuation character, indicating whether
Expand All @@ -759,14 +759,14 @@ impl Punct {
/// convertible back into the same character.
impl Display for Punct {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Display::fmt(&self.op, f)
Display::fmt(&self.ch, f)
}
}

impl Debug for Punct {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let mut debug = fmt.debug_struct("Punct");
debug.field("op", &self.op);
debug.field("char", &self.ch);
debug.field("spacing", &self.spacing);
imp::debug_span_field_if_nontrivial(&mut debug, self.span.inner);
debug.finish()
Expand Down
12 changes: 6 additions & 6 deletions src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ fn leaf_token(input: Cursor) -> PResult<TokenTree> {
if let Ok((input, l)) = literal(input) {
// must be parsed before ident
Ok((input, TokenTree::Literal(crate::Literal::_new_stable(l))))
} else if let Ok((input, p)) = op(input) {
} else if let Ok((input, p)) = punct(input) {
Ok((input, TokenTree::Punct(p)))
} else if let Ok((input, i)) = ident(input) {
Ok((input, TokenTree::Ident(i)))
Expand Down Expand Up @@ -729,8 +729,8 @@ fn digits(mut input: Cursor) -> Result<Cursor, LexError> {
}
}

fn op(input: Cursor) -> PResult<Punct> {
match op_char(input) {
fn punct(input: Cursor) -> PResult<Punct> {
match punct_char(input) {
Ok((rest, '\'')) => {
if ident_any(rest)?.0.starts_with("'") {
Err(LexError)
Expand All @@ -739,7 +739,7 @@ fn op(input: Cursor) -> PResult<Punct> {
}
}
Ok((rest, ch)) => {
let kind = match op_char(rest) {
let kind = match punct_char(rest) {
Ok(_) => Spacing::Joint,
Err(LexError) => Spacing::Alone,
};
Expand All @@ -749,9 +749,9 @@ fn op(input: Cursor) -> PResult<Punct> {
}
}

fn op_char(input: Cursor) -> PResult<char> {
fn punct_char(input: Cursor) -> PResult<char> {
if input.starts_with("//") || input.starts_with("/*") {
// Do not accept `/` of a comment as an op.
// Do not accept `/` of a comment as a punct.
return Err(LexError);
}

Expand Down
6 changes: 3 additions & 3 deletions src/wrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ fn into_compiler_token(token: TokenTree) -> proc_macro::TokenTree {
Spacing::Joint => proc_macro::Spacing::Joint,
Spacing::Alone => proc_macro::Spacing::Alone,
};
let mut op = proc_macro::Punct::new(tt.as_char(), spacing);
op.set_span(tt.span().inner.unwrap_nightly());
op.into()
let mut punct = proc_macro::Punct::new(tt.as_char(), spacing);
punct.set_span(tt.span().inner.unwrap_nightly());
punct.into()
}
TokenTree::Ident(tt) => tt.inner.unwrap_nightly().into(),
TokenTree::Literal(tt) => tt.inner.unwrap_nightly().into(),
Expand Down
10 changes: 5 additions & 5 deletions tests/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ fn no_panic() {
}

#[test]
fn op_before_comment() {
fn punct_before_comment() {
let mut tts = TokenStream::from_str("~// comment").unwrap().into_iter();
match tts.next().unwrap() {
TokenTree::Punct(tt) => {
Expand Down Expand Up @@ -341,7 +341,7 @@ TokenStream [
sym: a,
},
Punct {
op: '+',
char: '+',
spacing: Alone,
},
Literal {
Expand All @@ -362,7 +362,7 @@ TokenStream [
sym: a
},
Punct {
op: '+',
char: '+',
spacing: Alone
},
Literal {
Expand All @@ -384,7 +384,7 @@ TokenStream [
span: bytes(2..3),
},
Punct {
op: '+',
char: '+',
spacing: Alone,
span: bytes(4..5),
},
Expand All @@ -409,7 +409,7 @@ TokenStream [
span: bytes(2..3)
},
Punct {
op: '+',
char: '+',
spacing: Alone,
span: bytes(4..5)
},
Expand Down