Skip to content
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

Two minor fixes in parser.rs #14136

Closed
wants to merge 2 commits into from
Closed

Two minor fixes in parser.rs #14136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f58ccc
Add some long-overdue documentation on the INTERPOLATED helper macros.
paulstansifer May 11, 2014
af53bd6
Cleanup some ugly variable names, now that we have `let`-hygiene.
paulstansifer May 11, 2014
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
35 changes: 20 additions & 15 deletions src/libsyntax/parse/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ enum ItemOrViewItem {
IoviViewItem(ViewItem)
}

/* The expr situation is not as complex as I thought it would be.

// Possibly accept an `INTERPOLATED` expression (a pre-parsed expression
// dropped into the token stream, which happens while parsing the
// result of macro expansion)
/* Placement of these is not as complex as I feared it would be.
The important thing is to make sure that lookahead doesn't balk
at INTERPOLATED tokens */
macro_rules! maybe_whole_expr (
Expand All @@ -135,7 +139,7 @@ macro_rules! maybe_whole_expr (
INTERPOLATED(token::NtPath(ref pt)) => Some((**pt).clone()),
_ => None,
};
let ret = match ($p).token {
let found = match ($p).token {
INTERPOLATED(token::NtExpr(e)) => {
Some(e)
}
Expand All @@ -145,7 +149,7 @@ macro_rules! maybe_whole_expr (
}
_ => None
};
match ret {
match found {
Some(e) => {
$p.bump();
return e;
Expand All @@ -156,16 +160,17 @@ macro_rules! maybe_whole_expr (
)
)

// As above, but for things other than expressions
macro_rules! maybe_whole (
($p:expr, $constructor:ident) => (
{
let __found__ = match ($p).token {
let found = match ($p).token {
INTERPOLATED(token::$constructor(_)) => {
Some(($p).bump_and_get())
}
_ => None
};
match __found__ {
match found {
Some(INTERPOLATED(token::$constructor(x))) => {
return x.clone()
}
Expand All @@ -175,13 +180,13 @@ macro_rules! maybe_whole (
);
(no_clone $p:expr, $constructor:ident) => (
{
let __found__ = match ($p).token {
let found = match ($p).token {
INTERPOLATED(token::$constructor(_)) => {
Some(($p).bump_and_get())
}
_ => None
};
match __found__ {
match found {
Some(INTERPOLATED(token::$constructor(x))) => {
return x
}
Expand All @@ -191,13 +196,13 @@ macro_rules! maybe_whole (
);
(deref $p:expr, $constructor:ident) => (
{
let __found__ = match ($p).token {
let found = match ($p).token {
INTERPOLATED(token::$constructor(_)) => {
Some(($p).bump_and_get())
}
_ => None
};
match __found__ {
match found {
Some(INTERPOLATED(token::$constructor(x))) => {
return (*x).clone()
}
Expand All @@ -207,13 +212,13 @@ macro_rules! maybe_whole (
);
(Some $p:expr, $constructor:ident) => (
{
let __found__ = match ($p).token {
let found = match ($p).token {
INTERPOLATED(token::$constructor(_)) => {
Some(($p).bump_and_get())
}
_ => None
};
match __found__ {
match found {
Some(INTERPOLATED(token::$constructor(x))) => {
return Some(x.clone()),
}
Expand All @@ -223,13 +228,13 @@ macro_rules! maybe_whole (
);
(iovi $p:expr, $constructor:ident) => (
{
let __found__ = match ($p).token {
let found = match ($p).token {
INTERPOLATED(token::$constructor(_)) => {
Some(($p).bump_and_get())
}
_ => None
};
match __found__ {
match found {
Some(INTERPOLATED(token::$constructor(x))) => {
return IoviItem(x.clone())
}
Expand All @@ -239,13 +244,13 @@ macro_rules! maybe_whole (
);
(pair_empty $p:expr, $constructor:ident) => (
{
let __found__ = match ($p).token {
let found = match ($p).token {
INTERPOLATED(token::$constructor(_)) => {
Some(($p).bump_and_get())
}
_ => None
};
match __found__ {
match found {
Some(INTERPOLATED(token::$constructor(x))) => {
return (Vec::new(), x)
}
Expand Down