@@ -11,17 +11,17 @@ which both pattern-match on their input and both return early in one case,
1111doing nothing otherwise:
1212
1313~~~~
14- # enum t { special_a (uint), special_b (uint) };
14+ # enum T { SpecialA (uint), SpecialB (uint) };
1515# fn f() -> uint {
16- # let input_1 = special_a (0);
17- # let input_2 = special_a (0);
16+ # let input_1 = SpecialA (0);
17+ # let input_2 = SpecialA (0);
1818match input_1 {
19- special_a (x) => { return x; }
19+ SpecialA (x) => { return x; }
2020 _ => {}
2121}
2222// ...
2323match input_2 {
24- special_b (x) => { return x; }
24+ SpecialB (x) => { return x; }
2525 _ => {}
2626}
2727# return 0u;
@@ -37,22 +37,22 @@ lightweight custom syntax extensions, themselves defined using the
3737the pattern in the above code:
3838
3939~~~~
40- # enum t { special_a (uint), special_b (uint) };
40+ # enum T { SpecialA (uint), SpecialB (uint) };
4141# fn f() -> uint {
42- # let input_1 = special_a (0);
43- # let input_2 = special_a (0);
42+ # let input_1 = SpecialA (0);
43+ # let input_2 = SpecialA (0);
4444macro_rules! early_return(
45- ($inp:expr $sp:ident) => ( // invoke it like `(input_5 special_e )`
45+ ($inp:expr $sp:ident) => ( // invoke it like `(input_5 SpecialE )`
4646 match $inp {
4747 $sp(x) => { return x; }
4848 _ => {}
4949 }
5050 );
5151)
5252// ...
53- early_return!(input_1 special_a );
53+ early_return!(input_1 SpecialA );
5454// ...
55- early_return!(input_2 special_b );
55+ early_return!(input_2 SpecialB );
5656# return 0;
5757# }
5858~~~~
@@ -155,10 +155,10 @@ separator token (a comma-separated list could be written `$(...),*`), and `+`
155155instead of ` * ` to mean "at least one".
156156
157157~~~~
158- # enum t { special_a (uint),special_b (uint),special_c (uint),special_d (uint)};
158+ # enum T { SpecialA (uint),SpecialB (uint),SpecialC (uint),SpecialD (uint)};
159159# fn f() -> uint {
160- # let input_1 = special_a (0);
161- # let input_2 = special_a (0);
160+ # let input_1 = SpecialA (0);
161+ # let input_2 = SpecialA (0);
162162macro_rules! early_return(
163163 ($inp:expr, [ $($sp:ident)|+ ]) => (
164164 match $inp {
@@ -170,9 +170,9 @@ macro_rules! early_return(
170170 );
171171)
172172// ...
173- early_return!(input_1, [special_a|special_c|special_d ]);
173+ early_return!(input_1, [SpecialA|SpecialC|SpecialD ]);
174174// ...
175- early_return!(input_2, [special_b ]);
175+ early_return!(input_2, [SpecialB ]);
176176# return 0;
177177# }
178178~~~~
@@ -215,14 +215,14 @@ solves the problem.
215215Now consider code like the following:
216216
217217~~~~
218- # enum t1 { good_1(t2 , uint), bad_1 };
219- # struct t2 { body: t3 }
220- # enum t3 { good_2 (uint), bad_2 };
221- # fn f(x: t1 ) -> uint {
218+ # enum T1 { Good1(T2 , uint), Bad1 };
219+ # struct T2 { body: T3 }
220+ # enum T3 { Good2 (uint), Bad2 };
221+ # fn f(x: T1 ) -> uint {
222222match x {
223- good_1 (g1, val) => {
223+ Good1 (g1, val) => {
224224 match g1.body {
225- good_2 (result) => {
225+ Good2 (result) => {
226226 // complicated stuff goes here
227227 return result + val;
228228 },
@@ -261,13 +261,13 @@ macro_rules! biased_match (
261261 )
262262)
263263
264- # enum t1 { good_1(t2 , uint), bad_1 };
265- # struct t2 { body: t3 }
266- # enum t3 { good_2 (uint), bad_2 };
267- # fn f(x: t1 ) -> uint {
268- biased_match!((x) ~ (good_1 (g1, val)) else { return 0 };
264+ # enum T1 { Good1(T2 , uint), Bad1 };
265+ # struct T2 { body: T3 }
266+ # enum T3 { Good2 (uint), Bad2 };
267+ # fn f(x: T1 ) -> uint {
268+ biased_match!((x) ~ (Good1 (g1, val)) else { return 0 };
269269 binds g1, val )
270- biased_match!((g1.body) ~ (good_2 (result) )
270+ biased_match!((g1.body) ~ (Good2 (result) )
271271 else { fail!("Didn't get good_2") };
272272 binds result )
273273// complicated stuff goes here
@@ -365,13 +365,13 @@ macro_rules! biased_match (
365365)
366366
367367
368- # enum t1 { good_1(t2 , uint), bad_1 };
369- # struct t2 { body: t3 }
370- # enum t3 { good_2 (uint), bad_2 };
371- # fn f(x: t1 ) -> uint {
368+ # enum T1 { Good1(T2 , uint), Bad1 };
369+ # struct T2 { body: T3 }
370+ # enum T3 { Good2 (uint), Bad2 };
371+ # fn f(x: T1 ) -> uint {
372372biased_match!(
373- (x) ~ (good_1 (g1, val)) else { return 0 };
374- (g1.body) ~ (good_2 (result) ) else { fail!("Didn't get good_2 ") };
373+ (x) ~ (Good1 (g1, val)) else { return 0 };
374+ (g1.body) ~ (Good2 (result) ) else { fail!("Didn't get Good2 ") };
375375 binds val, result )
376376// complicated stuff goes here
377377return result + val;
0 commit comments