commit 4ff02356bac35e5a4fdf8807ffb4606829613907 · drubery.com/icfp2007

+2 -3

dna2rna/src/dna.rs

···

       41
       41
        
       }

     

       42
       42
        
       

     

       43
       43
        
       impl Base {

     

       44
       44
       -
           fn from_char(c: char) -> Option<Base> {

     

       44
       44
       +
           pub fn from_char(c: char) -> Option<Base> {

     

       45
       45
        
               match c {

     

       46
       46
        
                   'I' => Some(Base::I),

     

       47
       47
        
                   'C' => Some(Base::C),

     
···

       51
       51
        
               }

     

       52
       52
        
           }

     

       53
       53
        
       

     

       54
       54
       -
           #[cfg(test)]

     

       55
       55
       -
           fn to_char(&self) -> char {

     

       54
       54
       +
           pub fn to_char(&self) -> char {

     

       56
       55
        
               match self {

     

       57
       56
        
                   Base::I => 'I',

     

       58
       57
        
                   Base::C => 'C',

+34 -2

dna2rna/src/main.rs

···

       1
       1
        
       mod dna;

     

       2
       2
       +
       mod match_replace;

     

       2
       3
        
       mod parser;

     

       3
       4
        
       mod pattern;

     

       4
       5
        
       mod rna;

     

       5
       6
        
       mod template;

     

       6
       7
        
       

     

       8
       8
       +
       use std::env;

     

       9
       9
       +
       use std::fs;

     

       10
       10
       +
       

     

       7
       11
        
       fn main() {

     

       8
       8
       -
           let dna = dna::DnaRef::from_string("ICFP");

     

       9
       9
       -
           println!("Back to string: {}", dna.to_string());

     

       12
       12
       +
           let args: Vec<String> = env::args().collect();

     

       13
       13
       +
           if args.len() < 2 {

     

       14
       14
       +
               println!("Usage: {} <dna file>", args[0]);

     

       15
       15
       +
               return;

     

       16
       16
       +
           }

     

       17
       17
       +
       

     

       18
       18
       +
           let contents = fs::read_to_string(&args[1]);

     

       19
       19
       +
           if let Ok(dna) = contents {

     

       20
       20
       +
               let mut dna = dna::DnaRef::from_string(&dna);

     

       21
       21
       +
               let mut rna = Vec::new();

     

       22
       22
       +
               loop {

     

       23
       23
       +
                   if let Some(new_dna) = match_replace::match_replace(dna, &mut rna) {

     

       24
       24
       +
                       dna = new_dna;

     

       25
       25
       +
                   } else {

     

       26
       26
       +
                       break;

     

       27
       27
       +
                   }

     

       28
       28
       +
       

     

       29
       29
       +
                   for r in rna.iter() {

     

       30
       30
       +
                       for b in r {

     

       31
       31
       +
                           print!("{}", b.to_char());

     

       32
       32
       +
                       }

     

       33
       33
       +
                       println!();

     

       34
       34
       +
                   }

     

       35
       35
       +
       

     

       36
       36
       +
                   rna.clear();

     

       37
       37
       +
               }

     

       38
       38
       +
           } else {

     

       39
       39
       +
               println!("Could not open {}", args[1]);

     

       40
       40
       +
               return;

     

       41
       41
       +
           }

     

       10
       42
        
       }