parser clean up

use match for parsing fd redirections
rust-shell-script · Mar 26, 2021 · c9e8848 · c9e8848
1 parent c951d33
commit c9e8848
Showing 1 changed file with 13 additions and 20 deletions.
diff --git a/macros/src/parser.rs b/macros/src/parser.rs
@@ -97,30 +97,23 @@ impl Parser {
         while *i < self.args.len() {
             match self.args[*i].clone() {
                 ParseRedirectFd(fd1, fd2) => {
-                    if fd1 == fd2 {
-                        *i += 1;
-                        continue;
-                    }
-                    let mut redirect = quote!(::cmd_lib::Redirect);
-                    if fd1 == 1 && fd2 == 2 {
-                        redirect.extend(quote!(::StdoutToStderr));
-                    } else if fd1 == 2 && fd2 == 1 {
-                        redirect.extend(quote!(::StderrToStdout));
-                    } else {
-                        panic!("unsupported fd numbers: {} {}", fd1, fd2);
+                    if fd1 != fd2 {
+                        let mut redirect = quote!(::cmd_lib::Redirect);
+                        match (fd1, fd2) {
+                            (1, 2) => redirect.extend(quote!(::StdoutToStderr)),
+                            (2, 1) => redirect.extend(quote!(::StderrToStdout)),
+                            _ => panic!("unsupported fd numbers: {} {}", fd1, fd2),
+                        }
+                        ret.extend(quote!(.add_redirect(#redirect)));
                     }
-                    ret.extend(quote!(.add_redirect(#redirect)));
                 }
                 ParseRedirectFile(fd1, file, append) => {
                     let mut redirect = quote!(::cmd_lib::Redirect);
-                    if fd1 == 0 {
-                        redirect.extend(quote!(::FileToStdin(#file)));
-                    } else if fd1 == 1 {
-                        redirect.extend(quote!(::StdoutToFile(#file, #append)));
-                    } else if fd1 == 2 {
-                        redirect.extend(quote!(::StderrToFile(#file, #append)));
-                    } else {
-                        panic!("unsupported fd ({}) redirect to file {}", fd1, file);
+                    match fd1 {
+                        0 => redirect.extend(quote!(::FileToStdin(#file))),
+                        1 => redirect.extend(quote!(::StdoutToFile(#file, #append))),
+                        2 => redirect.extend(quote!(::StderrToFile(#file, #append))),
+                        _ => panic!("unsupported fd ({}) redirect to file {}", fd1, file),
                     }
                     ret.extend(quote!(.add_redirect(#redirect)));
                 }