Sfoglia il codice sorgente

move println!'s out of parse_dimac

Lucas Stadler 10 anni fa
parent
commit
6e6569a5cf
1 ha cambiato i file con 6 aggiunte e 3 eliminazioni
  1. 6 3
      rust/dpll/cnf.rs

+ 6 - 3
rust/dpll/cnf.rs

@ -37,7 +37,6 @@ fn parse_dimac(dimac: &str) -> Result<CNF, String> {
37 37
                Ok(n) => { num_clauses = n }
38 38
                Err(e) => { return Err(format!("<num clauses> must be a positive integer: {}", e)) }
39 39
            }
40
            println!("cnf has {} variables and {} clauses", num_vars, num_clauses)
41 40
        }
42 41
    }
43 42
@ -57,7 +56,6 @@ fn parse_dimac(dimac: &str) -> Result<CNF, String> {
57 56
        }
58 57
        let l = vars.len();
59 58
        vars.truncate(l - 1);
60
        println!("{:?}", vars);
61 59
        clauses.push(vars)
62 60
    }
63 61
@ -69,7 +67,12 @@ fn main() {
69 67
    let input: &mut String = &mut String::new();
70 68
    match io::stdin().read_to_string(input) {
71 69
        Ok(_) => match parse_dimac(input) {
72
            Ok(cnf) => { println!("ok!") }
70
            Ok(cnf) => {
71
                println!("cnf has {} variables and {} clauses", cnf.num_vars, cnf.num_clauses);
72
                for clause in cnf.clauses {
73
                    println!("{:?}", clause);
74
                }
75
            }
73 76
            Err(e) => { println!("Error: {}", e) }
74 77
        },
75 78
        Err(e) => { println!("Error: {}", e) }