Merge pull request #466 from ratmice/stdin

Allow Stdin to be used as input file for lrlex/nimbleparse

lrlex/src/main.rs

@@ -2,7 +2,7 @@ use getopts::Options;
 use std::{
     env,
     fs::File,
-    io::{stderr, Read, Write},
+    io::{stdin, stderr, Read, Write},
     path::Path,
     process,
     str::FromStr,
@@ -26,14 +26,18 @@ fn usage(prog: &str, msg: &str) {
 }
 
 fn read_file(path: &str) -> String {
+    let mut s = String::new();
+    if path == "-" {
+        stdin().read_to_string(&mut s).unwrap();
+        return s;
+    }
     let mut f = match File::open(path) {
         Ok(r) => r,
         Err(e) => {
             writeln!(stderr(), "Can't open file {}: {}", path, e).ok();
             process::exit(1);
         }
     };
-    let mut s = String::new();
     f.read_to_string(&mut s).unwrap();
     s
 }

nimbleparse/src/main.rs

@@ -276,7 +276,13 @@ fn main() {
         }
     }
 
-    let input = read_file(&matches.free[2]);
+    let input = if &matches.free[2] == "-" {
+        let mut s = String::new();
+        std::io::stdin().read_to_string(&mut s).unwrap();
+        s
+    } else {
+        read_file(&matches.free[2])
+    };
     let lexer = lexerdef.lexer(&input);
     let pb = RTParserBuilder::new(&grm, &stable).recoverer(recoverykind);
     let (pt, errs) = pb.parse_generictree(&lexer);