commit c42ee87b9b6d18e5481dfa2533bf6360d8d7d36b · drubery.com/icfp2007

+4 -1

.gitignore

···

       2
       2
        
       dna2rna/target/

     

       3
       3
        
       rna2bmp/target/

     

       4
       4
        
       rna/

     

       5
       5
       -
       bmp/
     

       5
       5
       +
       bmp/

     

       6
       6
       +
       .tup/

     

       7
       7
       +
       bin/

     

       8
       8
       +
       png/

+10

Tupfile

···

       1
       1
       +
       RUSTC_FLAGS= --edition=2024 --crate-type bin --emit=link -C opt-level=3 -C embed-bitcode=no --check-cfg 'cfg (docsrs,test)' --check-cfg 'cfg(feature, values())' --out-dir bin -C strip=debuginfo -L dependency=bin

     

       2
       2
       +
       

     

       3
       3
       +
       : dna2rna/src/*.rs |> rustc --crate-name dna2rna dna2rna/src/main.rs $(RUSTC_FLAGS) |> bin/dna2rna

     

       4
       4
       +
       : rna2bmp/src/*.rs |> rustc --crate-name rna2bmp rna2bmp/src/main.rs $(RUSTC_FLAGS) |> bin/rna2bmp

     

       5
       5
       +
       

     

       6
       6
       +
       : foreach prefixes/*.dna | bin/dna2rna |> ./bin/dna2rna %f task/endo.dna rna/%B.rna |> rna/%B.rna

     

       7
       7
       +
       

     

       8
       8
       +
       : foreach rna/*.rna | bin/rna2bmp |> ./bin/rna2bmp %f bmp/%B.bmp |> bmp/%B.bmp

     

       9
       9
       +
       

     

       10
       10
       +
       : foreach bmp/*.bmp |> convert %f png/%B.png |> png/%B.png

+16 -17

dna2rna/src/main.rs

···

       7
       7
        
       

     

       8
       8
        
       use std::env;

     

       9
       9
        
       use std::fs;

     

       10
       10
       +
       use std::fs::File;

     

       11
       11
       +
       use std::io;

     

       12
       12
       +
       use std::io::Write;

     

       10
       13
        
       

     

       11
       11
       -
       fn main() {

     

       14
       14
       +
       fn main() -> io::Result<()> {

     

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

     

       13
       13
       -
           if args.len() < 3 {

     

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

     

       15
       15
       -
               return;

     

       16
       16
       +
           if args.len() < 4 {

     

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

     

       18
       18
       +
               return Ok(());

     

       16
       19
        
           }

     

       17
       20
        
       

     

       18
       18
       -
           let Ok(prefix) = fs::read_to_string(&args[1]) else {

     

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

     

       20
       20
       -
               return;

     

       21
       21
       -
           };

     

       22
       22
       -
       

     

       23
       23
       -
           let Ok(dna) = fs::read_to_string(&args[2]) else {

     

       24
       24
       -
               println!("Could not open {}", args[2]);

     

       25
       25
       -
               return;

     

       26
       26
       -
           };

     

       21
       21
       +
           // TODO: Better error messages

     

       22
       22
       +
           let prefix = fs::read_to_string(&args[1])?;

     

       23
       23
       +
           let dna = fs::read_to_string(&args[2])?;

     

       27
       24
        
       

     

       28
       25
        
           let mut dna = dna::DnaRef::from_string(&prefix) + dna::DnaRef::from_string(&dna);

     

       26
       26
       +
           let mut rna_file = File::create(&args[3])?;

     

       29
       27
        
           let mut rna = Vec::new();

     

       30
       28
        
           loop {

     

       31
       29
        
               if let Some(new_dna) = match_replace::match_replace(dna, &mut rna) {

     
···

       35
       33
        
               }

     

       36
       34
        
       

     

       37
       35
        
               for r in rna.iter() {

     

       38
       38
       -
                   for b in r {

     

       39
       39
       -
                       print!("{}", b.to_char());

     

       40
       40
       -
                   }

     

       41
       41
       -
                   println!();

     

       36
       36
       +
                   let rna_str: String = r.iter().map(|b| b.to_char()).collect();

     

       37
       37
       +
                   rna_file.write(rna_str.as_bytes())?;

     

       38
       38
       +
                   rna_file.write(b"\n")?;

     

       42
       39
        
               }

     

       43
       40
        
       

     

       44
       41
        
               rna.clear();

     

       45
       42
        
           }

     

       43
       43
       +
       

     

       44
       44
       +
           return Ok(());

     

       46
       45
        
       }

+3 -3

dna2rna/src/parser.rs

···

       39
       39
        
       

     

       40
       40
        
           pub fn next_is(&mut self, next: &[Base]) -> bool {

     

       41
       41
        
               self.peek_to(next.len());

     

       42
       42
       -
       	if self.peeked.len() < next.len() {

     

       43
       43
       -
       	  return false;

     

       44
       44
       -
       	}

     

       42
       42
       +
               if self.peeked.len() < next.len() {

     

       43
       43
       +
                   return false;

     

       44
       44
       +
               }

     

       45
       45
        
               return &self.peeked[..next.len()] == next;

     

       46
       46
        
           }

     

       47
       47