diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-08-06 17:14:32 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-08-07 12:23:43 -0700 |
| commit | 2772b2e5c7f85e230bcae13c49eb1386afc6cd0e (patch) | |
| tree | 6161076f339dc2adeffcfbc8bcb6e86882b7b16d /src/libsyntax/ext/base.rs | |
| parent | abf4421e7c2fce4e768eb20c126989501081f4f9 (diff) | |
| download | rust-2772b2e5c7f85e230bcae13c49eb1386afc6cd0e.tar.gz rust-2772b2e5c7f85e230bcae13c49eb1386afc6cd0e.zip | |
syntax: Make match arm parsing more restrictive again
Require comma separators for all expression types except the plain block
Diffstat (limited to 'src/libsyntax/ext/base.rs')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 79ef81f78c1..0f163e73c81 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -214,7 +214,7 @@ fn expr_to_str(cx: ext_ctxt, expr: @ast::expr, error: ~str) -> ~str { ast::expr_lit(l) => match l.node { ast::lit_str(s) => return *s, _ => cx.span_fatal(l.span, error) - } + }, _ => cx.span_fatal(expr.span, error) } } @@ -257,7 +257,7 @@ fn get_mac_args(cx: ext_ctxt, sp: span, arg: ast::mac_arg, _ => { cx.span_fatal(sp, fmt!{"#%s: malformed invocation", name}) } - } + }, none => cx.span_fatal(sp, fmt!{"#%s: missing arguments", name}) } } @@ -302,7 +302,7 @@ fn tt_args_to_original_flavor(cx: ext_ctxt, sp: span, arg: ~[ast::token_tree]) } _ => fail ~"badly-structured parse result" } - } + }, _ => fail ~"badly-structured parse result" }; |
