squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

syntax: try to fix pattern printing yet again, r=burningtree.

Browse source
This commit is contained in:
Graydon Hoare 2012-12-07 14:39:29 -08:00
parent 4a3170a24c
commit d78053ecb0
2 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/libsyntax/print/pprust.rs
View file

@ -107,7 +107,7 @@ fn ty_to_str(ty: @ast::Ty, intr: @ident_interner) -> ~str {
} }
fn pat_to_str(pat: @ast::pat, intr: @ident_interner) -> ~str { fn pat_to_str(pat: @ast::pat, intr: @ident_interner) -> ~str {
to_str(pat, print_pat, intr) to_str(pat, print_irrefutable_pat, intr)
} }
fn expr_to_str(e: @ast::expr, intr: @ident_interner) -> ~str { fn expr_to_str(e: @ast::expr, intr: @ident_interner) -> ~str {
@ -1266,7 +1266,7 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
if first { if first {
first = false; first = false;
} else { space(s.s); word_space(s, ~"|"); } } else { space(s.s); word_space(s, ~"|"); }
print_pat(s, *p); print_refutable_pat(s, *p);
} }
space(s.s); space(s.s);
match arm.guard { match arm.guard {
@ -1461,7 +1461,7 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
} }
fn print_local_decl(s: ps, loc: @ast::local) { fn print_local_decl(s: ps, loc: @ast::local) {
print_pat(s, loc.node.pat); print_irrefutable_pat(s, loc.node.pat);
match loc.node.ty.node { match loc.node.ty.node {
ast::ty_infer => (), ast::ty_infer => (),
_ => { word_space(s, ~":"); print_type(s, loc.node.ty); } _ => { word_space(s, ~":"); print_type(s, loc.node.ty); }
@ -1538,11 +1538,15 @@ fn print_path(s: ps, &&path: @ast::path, colons_before_params: bool) {
} }
} }
fn print_pat(s: ps, &&pat: @ast::pat) { fn print_irrefutable_pat(s: ps, &&pat: @ast::pat) {
print_pat_full(s, pat, true) print_pat(s, pat, false)
} }
fn print_pat_full(s: ps, &&pat: @ast::pat, print_binding_mode: bool) { fn print_refutable_pat(s: ps, &&pat: @ast::pat) {
print_pat(s, pat, true)
}
fn print_pat(s: ps, &&pat: @ast::pat, refutable: bool) {
maybe_print_comment(s, pat.span.lo); maybe_print_comment(s, pat.span.lo);
let ann_node = node_pat(s, pat); let ann_node = node_pat(s, pat);
(s.ann.pre)(ann_node); (s.ann.pre)(ann_node);
@ -1551,7 +1555,7 @@ fn print_pat_full(s: ps, &&pat: @ast::pat, print_binding_mode: bool) {
match pat.node { match pat.node {
ast::pat_wild => word(s.s, ~"_"), ast::pat_wild => word(s.s, ~"_"),
ast::pat_ident(binding_mode, path, sub) => { ast::pat_ident(binding_mode, path, sub) => {
if print_binding_mode { if refutable {
match binding_mode { match binding_mode {
ast::bind_by_ref(mutbl) => { ast::bind_by_ref(mutbl) => {
word_nbsp(s, ~"ref"); word_nbsp(s, ~"ref");
@ -1570,7 +1574,7 @@ fn print_pat_full(s: ps, &&pat: @ast::pat, print_binding_mode: bool) {
match sub { match sub {
Some(p) => { Some(p) => {
word(s.s, ~"@"); word(s.s, ~"@");
print_pat(s, p); print_pat(s, p, refutable);
} }
None => () None => ()
} }
@ -1582,7 +1586,8 @@ fn print_pat_full(s: ps, &&pat: @ast::pat, print_binding_mode: bool) {
Some(args) => { Some(args) => {
if args.is_not_empty() { if args.is_not_empty() {
popen(s); popen(s);
commasep(s, inconsistent, args, print_pat); commasep(s, inconsistent, args,
|s, p| print_pat(s, p, refutable));
pclose(s); pclose(s);
} else { } } else { }
} }
@ -1590,15 +1595,17 @@ fn print_pat_full(s: ps, &&pat: @ast::pat, print_binding_mode: bool) {
} }
ast::pat_rec(fields, etc) => { ast::pat_rec(fields, etc) => {
word(s.s, ~"{"); word(s.s, ~"{");
fn print_field(s: ps, f: ast::field_pat) { fn print_field(s: ps, f: ast::field_pat, refutable: bool) {
cbox(s, indent_unit); cbox(s, indent_unit);
print_ident(s, f.ident); print_ident(s, f.ident);
word_space(s, ~":"); word_space(s, ~":");
print_pat(s, f.pat); print_pat(s, f.pat, refutable);
end(s); end(s);
} }
fn get_span(f: ast::field_pat) -> codemap::span { return f.pat.span; } fn get_span(f: ast::field_pat) -> codemap::span { return f.pat.span; }
commasep_cmnt(s, consistent, fields, print_field, get_span); commasep_cmnt(s, consistent, fields,
|s, f| print_field(s, f, refutable),
get_span);
if etc { if etc {
if vec::len(fields) != 0u { word_space(s, ~","); } if vec::len(fields) != 0u { word_space(s, ~","); }
word(s.s, ~"_"); word(s.s, ~"_");
@ -1608,15 +1615,17 @@ fn print_pat_full(s: ps, &&pat: @ast::pat, print_binding_mode: bool) {
ast::pat_struct(path, fields, etc) => { ast::pat_struct(path, fields, etc) => {
print_path(s, path, true); print_path(s, path, true);
word(s.s, ~"{"); word(s.s, ~"{");
fn print_field(s: ps, f: ast::field_pat) { fn print_field(s: ps, f: ast::field_pat, refutable: bool) {
cbox(s, indent_unit); cbox(s, indent_unit);
print_ident(s, f.ident); print_ident(s, f.ident);
word_space(s, ~":"); word_space(s, ~":");
print_pat(s, f.pat); print_pat(s, f.pat, refutable);
end(s); end(s);
} }
fn get_span(f: ast::field_pat) -> codemap::span { return f.pat.span; } fn get_span(f: ast::field_pat) -> codemap::span { return f.pat.span; }
commasep_cmnt(s, consistent, fields, print_field, get_span); commasep_cmnt(s, consistent, fields,
|s, f| print_field(s,f,refutable),
get_span);
if etc { if etc {
if vec::len(fields) != 0u { word_space(s, ~","); } if vec::len(fields) != 0u { word_space(s, ~","); }
word(s.s, ~"_"); word(s.s, ~"_");
@ -1625,20 +1634,20 @@ fn print_pat_full(s: ps, &&pat: @ast::pat, print_binding_mode: bool) {
} }
ast::pat_tup(elts) => { ast::pat_tup(elts) => {
popen(s); popen(s);
commasep(s, inconsistent, elts, print_pat); commasep(s, inconsistent, elts, |s, p| print_pat(s, p, refutable));
pclose(s); pclose(s);
} }
ast::pat_box(inner) => { ast::pat_box(inner) => {
word(s.s, ~"@"); word(s.s, ~"@");
print_pat(s, inner); print_pat(s, inner, refutable);
} }
ast::pat_uniq(inner) => { ast::pat_uniq(inner) => {
word(s.s, ~"~"); word(s.s, ~"~");
print_pat(s, inner); print_pat(s, inner, refutable);
} }
ast::pat_region(inner) => { ast::pat_region(inner) => {
word(s.s, ~"&"); word(s.s, ~"&");
print_pat(s, inner); print_pat(s, inner, refutable);
} }
ast::pat_lit(e) => print_expr(s, e), ast::pat_lit(e) => print_expr(s, e),
ast::pat_range(begin, end) => { ast::pat_range(begin, end) => {
@ -1885,7 +1894,7 @@ fn print_arg(s: ps, input: ast::arg) {
ibox(s, indent_unit); ibox(s, indent_unit);
print_arg_mode(s, input.mode); print_arg_mode(s, input.mode);
match input.ty.node { match input.ty.node {
ast::ty_infer => print_pat_full(s, input.pat, false), ast::ty_infer => print_irrefutable_pat(s, input.pat),
_ => { _ => {
match input.pat.node { match input.pat.node {
ast::pat_ident(_, path, _) if ast::pat_ident(_, path, _) if
@ -1894,7 +1903,7 @@ fn print_arg(s: ps, input: ast::arg) {
// Do nothing. // Do nothing.
} }
_ => { _ => {
print_pat_full(s, input.pat, false); print_irrefutable_pat(s, input.pat);
word(s.s, ~":"); word(s.s, ~":");
space(s.s); space(s.s);
} }

2
src/test/run-pass-fulldeps/qquote.rs
View file

@ -61,7 +61,7 @@ fn main() {
check_pp(ext_cx, *stmt2, pprust::print_stmt, ~"let x: int = 23;"); check_pp(ext_cx, *stmt2, pprust::print_stmt, ~"let x: int = 23;");
let pat = #ast[pat]{some(_)}; let pat = #ast[pat]{some(_)};
check_pp(ext_cx, pat, pprust::print_pat, ~"some(_)"); check_pp(ext_cx, pat, pprust::print_refutable_pat, ~"some(_)");
// issue #1785 // issue #1785
let x = #ast{1}; let x = #ast{1};