commit 3fab6da42fa5a78c1a072908c22f234f4c98b639 · drubery.com/icfp2007

+66 -5

asm2dna/src/assembler.rs

···

       64
       64
        
               let mut ret = 0;

     

       65
       65
        
               let mut iter = s.chars();

     

       66
       66
        
               if is_hex {

     

       67
       67
       -
                   // TODO: advance_by?

     

       68
       67
        
                   iter.nth(1);

     

       69
       68
        
               }

     

       70
       69
        
       

     
···

       121
       120
        
                           self.expect('{').ok_or("Skip followed by non-{")?;

     

       122
       121
        
                           let n = self.read_to("}").ok_or("Skip failed to terminate")?;

     

       123
       122
        
                           let n = Self::parse_int(&n).ok_or("Invalid int inside skip")?;

     

       124
       124
       -
       		    self.emit("IP");

     

       123
       123
       +
                           self.emit("IP");

     

       125
       124
        
                           self.emit(&Self::encode_int(n, IntPadding::NoPadding));

     

       126
       125
        
                           self.expect('}').ok_or("Skip failed to terminate")?;

     

       127
       126
        
                       }

     
···

       139
       138
        
                           let n = self.read_to("\",").ok_or("Reference failed terminate")?;

     

       140
       139
        
                           let n = Self::parse_int(&n).ok_or("Reference group index invalid")?;

     

       141
       140
        
                           let l = match self.iter.next() {

     

       142
       142
       -
                               Some('"') => "0",

     

       143
       143
       -
                               Some(',') => &self.read_to("\",").ok_or("Reference failed to terminate")?,

     

       141
       141
       +
                               Some('"') => String::from("0"),

     

       142
       142
       +
                               Some(',') => {

     

       143
       143
       +
                                   let l = self.read_to("\"").ok_or("Reference failed to terminate")?;

     

       144
       144
       +
                                   self.expect('"');

     

       145
       145
       +
                                   l

     

       146
       146
       +
                               }

     

       144
       147
        
                               _ => return Err("Reference failed to terminate"),

     

       145
       148
        
                           };

     

       146
       149
        
                           let l = Self::parse_int(&l).ok_or("Reference level invalid")?;

     
···

       153
       156
        
                           let n = Self::parse_int(&n).ok_or("Length group index invalid")?;

     

       154
       157
        
                           self.emit("IIP");

     

       155
       158
        
                           self.emit(&Self::encode_int(n, IntPadding::NoPadding));

     

       159
       159
       +
                           self.expect('|').ok_or("Length failed to terminate")?;

     

       156
       160
        
                       }

     

       157
       161
        
                       Some('n') => {

     

       158
       162
        
                           self.expect('{');

     
···

       187
       191
        
           }

     

       188
       192
        
       }

     

       189
       193
        
       

     

       190
       190
       -
       // TODO: Tests

     

       194
       194
       +
       #[cfg(test)]

     

       195
       195
       +
       mod tests {

     

       196
       196
       +
           use super::*;

     

       197
       197
       +
       

     

       198
       198
       +
           #[test]

     

       199
       199
       +
           fn test_assemble_bases() {

     

       200
       200
       +
               let asm = assemble(&"ICFP").unwrap();

     

       201
       201
       +
               assert_eq!(b"CFPIC", &asm[..]);

     

       202
       202
       +
           }

     

       203
       203
       +
       

     

       204
       204
       +
           #[test]

     

       205
       205
       +
           fn test_assemble_skip() {

     

       206
       206
       +
               let asm = assemble(&"!{1} !{0x10}").unwrap();

     

       207
       207
       +
               assert_eq!(b"IPCPIPIIIICP", &asm[..]);

     

       208
       208
       +
           }

     

       209
       209
       +
       

     

       210
       210
       +
           #[test]

     

       211
       211
       +
           fn test_assemble_search() {

     

       212
       212
       +
               let asm = assemble(&"?{ICFP}").unwrap();

     

       213
       213
       +
               assert_eq!(b"IFFCFPIC", &asm[..]);

     

       214
       214
       +
           }

     

       215
       215
       +
       

     

       216
       216
       +
           #[test]

     

       217
       217
       +
           fn test_assemble_groups() {

     

       218
       218
       +
               let asm = assemble(&"()()").unwrap();

     

       219
       219
       +
               assert_eq!(b"IIPIICIIPIIC", &asm[..]);

     

       220
       220
       +
           }

     

       221
       221
       +
       

     

       222
       222
       +
           #[test]

     

       223
       223
       +
           fn test_assemble_pattern_template() {

     

       224
       224
       +
               let asm = assemble(&"!{2} ; II ;").unwrap();

     

       225
       225
       +
               assert_eq!(b"IPICPIICCCIIC", &asm[..]);

     

       226
       226
       +
           }

     

       227
       227
       +
       

     

       228
       228
       +
           #[test]

     

       229
       229
       +
           fn test_assemble_pattern_quote() {

     

       230
       230
       +
               let asm = assemble(&"\"2\"").unwrap();

     

       231
       231
       +
               assert_eq!(b"IPPICP", &asm[..]);

     

       232
       232
       +
       

     

       233
       233
       +
               let asm = assemble(&"\"2,3\"").unwrap();

     

       234
       234
       +
               assert_eq!(b"IPCCPICP", &asm[..]);

     

       235
       235
       +
           }

     

       236
       236
       +
       

     

       237
       237
       +
           #[test]

     

       238
       238
       +
           fn test_assemble_pattern_length() {

     

       239
       239
       +
               let asm = assemble(&"|3|").unwrap();

     

       240
       240
       +
               assert_eq!(b"IIPCCP", &asm[..]);

     

       241
       241
       +
           }

     

       242
       242
       +
       

     

       243
       243
       +
           #[test]

     

       244
       244
       +
           fn test_assemble_pattern_constant() {

     

       245
       245
       +
               let asm = assemble(&"n{4,5}").unwrap();

     

       246
       246
       +
               assert_eq!(b"CCFCIC", &asm[..]);

     

       247
       247
       +
       

     

       248
       248
       +
               let asm = assemble(&"n{0x123,24}").unwrap();

     

       249
       249
       +
               assert_eq!(b"FFCCCFCCFCCCCCCCCCCCCCCIC", &asm[..]);

     

       250
       250
       +
           }

     

       251
       251
       +
       }

+9 -7

asm2dna/src/main.rs

···

       2
       2
        
       

     

       3
       3
        
       use std::env;

     

       4
       4
        
       use std::fs;

     

       5
       5
       -
       use std::io;

     

       6
       5
        
       

     

       7
       7
       -
       fn main() -> io::Result<()> {

     

       6
       6
       +
       fn main() {

     

       8
       7
        
           let args: Vec<String> = env::args().collect();

     

       9
       8
        
           if args.len() < 3 {

     

       10
       9
        
               println!("Usage: {} <asm file> <dna file>", args[0]);

     

       11
       11
       -
               return Ok(());

     

       10
       10
       +
               return;

     

       12
       11
        
           }

     

       13
       12
        
       

     

       14
       14
       -
           // TODO: Better error messages

     

       15
       15
       -
           let asm = fs::read_to_string(&args[1])?;

     

       13
       13
       +
           let Ok(asm) = fs::read_to_string(&args[1]) else {

     

       14
       14
       +
               println!("Failed to open asm file at {}", &args[1]);

     

       15
       15
       +
               return;

     

       16
       16
       +
           };

     

       16
       17
        
           match assembler::assemble(&asm) {

     

       17
       17
       -
               Ok(dna) => fs::write(&args[2], dna)?,

     

       18
       18
       +
               Ok(dna) => {

     

       19
       19
       +
                   let _ = fs::write(&args[2], dna);

     

       20
       20
       +
               }

     

       18
       21
        
               Err(err) => println!("{}", err),

     

       19
       22
        
           }

     

       20
       20
       -
           return Ok(());

     

       21
       23
        
       }

+18 -10

dna2rna/src/main.rs

···

       8
       8
        
       use std::env;

     

       9
       9
        
       use std::fs;

     

       10
       10
        
       use std::fs::File;

     

       11
       11
       -
       use std::io;

     

       12
       11
        
       use std::io::Write;

     

       13
       12
        
       

     

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

     

       13
       13
       +
       fn main() {

     

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

     

       16
       15
        
           if args.len() < 4 {

     

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

     

       18
       18
       -
               return Ok(());

     

       17
       17
       +
               return;

     

       19
       18
        
           }

     

       20
       19
        
       

     

       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])?;

     

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

     

       21
       21
       +
               println!("Failed to read prefix file at {}", &args[1]);

     

       22
       22
       +
       	return;

     

       23
       23
       +
           };

     

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

     

       25
       25
       +
           	println!("Failed to read dna file at {}", &args[2]);

     

       26
       26
       +
       	return;

     

       27
       27
       +
           };

     

       24
       28
        
       

     

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

     

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

     

       30
       30
       +
           let Ok(mut rna_file) = File::create(&args[3]) else {

     

       31
       31
       +
               println!("Failed to create rna output file at {}", &args[3]);

     

       32
       32
       +
       	return;

     

       33
       33
       +
           };

     

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

     

       28
       35
        
           loop {

     

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

     
···

       34
       41
        
       

     

       35
       42
        
               for r in rna.iter() {

     

       36
       43
        
                   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")?;

     

       44
       44
       +
       	    // Just tolerate a write error.

     

       45
       45
       +
                   let _ = rna_file.write(rna_str.as_bytes());

     

       46
       46
       +
       	    let _ = rna_file.write(b"\n");

     

       39
       47
        
               }

     

       40
       48
        
       

     

       41
       49
        
               rna.clear();

     

       42
       50
        
           }

     

       43
       51
        
       

     

       44
       44
       -
           return Ok(());

     

       52
       52
       +
           return;

     

       45
       53
        
       }

+28 -34

rna2bmp/src/rna_processor.rs

···

       133
       133
        
                   } else if r == "PCCIFFP" {

     

       134
       134
        
                       self.mark = self.position;

     

       135
       135
        
                   } else if r == "PFFICCP" {

     

       136
       136
       -
                       // TODO: Can I rework this to reduce casts or locals?

     

       137
       136
        
                       let x0 = self.position.0 as isize;

     

       138
       137
        
                       let y0 = self.position.1 as isize;

     

       139
       138
        
                       let x1 = self.mark.0 as isize;

     
···

       184
       183
        
                           self.bitmaps.push(Bitmap::new());

     

       185
       184
        
                       }

     

       186
       185
        
                   } else if r == "PFFPCCP" {

     

       187
       187
       -
       	        // TODO: Better structure

     

       188
       188
       -
                       if let Some(bmp0) = self.bitmaps.pop() {

     

       189
       189
       -
                           if let Some(mut bmp1) = self.bitmaps.pop() {

     

       190
       190
       -
                               for x in 0..SIZE {

     

       191
       191
       -
                                   for y in 0..SIZE {

     

       192
       192
       -
                                       let (r0, g0, b0, a0) = *bmp0.pixel((x, y));

     

       193
       193
       -
                                       let (r1, g1, b1, a1) = *bmp1.pixel((x, y));

     

       194
       194
       -
                                       let r = r0 + ((r1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       195
       195
       -
                                       let g = g0 + ((g1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       196
       196
       -
                                       let b = b0 + ((b1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       197
       197
       -
                                       let a = a0 + ((a1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       198
       198
       -
                                       *bmp1.pixel_mut((x, y)) = (r, g, b, a);

     

       199
       199
       -
                                   }

     

       186
       186
       +
                       if self.bitmaps.len() >= 2 {

     

       187
       187
       +
                           let bmp0 = self.bitmaps.pop().unwrap();

     

       188
       188
       +
                           let mut bmp1 = self.bitmaps.pop().unwrap();

     

       189
       189
       +
                           for x in 0..SIZE {

     

       190
       190
       +
                               for y in 0..SIZE {

     

       191
       191
       +
                                   let (r0, g0, b0, a0) = *bmp0.pixel((x, y));

     

       192
       192
       +
                                   let (r1, g1, b1, a1) = *bmp1.pixel((x, y));

     

       193
       193
       +
                                   let r = r0 + ((r1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       194
       194
       +
                                   let g = g0 + ((g1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       195
       195
       +
                                   let b = b0 + ((b1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       196
       196
       +
                                   let a = a0 + ((a1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       197
       197
       +
                                   *bmp1.pixel_mut((x, y)) = (r, g, b, a);

     

       200
       198
        
                               }

     

       201
       201
       -
                               self.bitmaps.push(bmp1);

     

       202
       202
       -
                           } else {

     

       203
       203
       -
       		        self.bitmaps.push(bmp0);

     

       204
       204
       -
       		    }

     

       199
       199
       +
                           }

     

       200
       200
       +
                           self.bitmaps.push(bmp1);

     

       205
       201
        
                       }

     

       206
       202
        
                   } else if r == "PFFICCF" {

     

       207
       207
       -
                       if let Some(bmp0) = self.bitmaps.pop() {

     

       208
       208
       -
                           if let Some(mut bmp1) = self.bitmaps.pop() {

     

       209
       209
       -
                               for x in 0..SIZE {

     

       210
       210
       -
                                   for y in 0..SIZE {

     

       211
       211
       -
                                       let (_, _, _, a0) = *bmp0.pixel((x, y));

     

       212
       212
       -
                                       let (r1, g1, b1, a1) = *bmp1.pixel((x, y));

     

       213
       213
       -
                                       let r = ((r1 as usize) * (a0 as usize) / 255) as u8;

     

       214
       214
       -
                                       let g = ((g1 as usize) * (a0 as usize) / 255) as u8;

     

       215
       215
       -
                                       let b = ((b1 as usize) * (a0 as usize) / 255) as u8;

     

       216
       216
       -
                                       let a = ((a1 as usize) * (a0 as usize) / 255) as u8;

     

       217
       217
       -
                                       *bmp1.pixel_mut((x, y)) = (r, g, b, a);

     

       218
       218
       -
                                   }

     

       203
       203
       +
                       if self.bitmaps.len() >= 2 {

     

       204
       204
       +
                           let bmp0 = self.bitmaps.pop().unwrap();

     

       205
       205
       +
                           let mut bmp1 = self.bitmaps.pop().unwrap();

     

       206
       206
       +
                           for x in 0..SIZE {

     

       207
       207
       +
                               for y in 0..SIZE {

     

       208
       208
       +
                                   let (_, _, _, a0) = *bmp0.pixel((x, y));

     

       209
       209
       +
                                   let (r1, g1, b1, a1) = *bmp1.pixel((x, y));

     

       210
       210
       +
                                   let r = ((r1 as usize) * (a0 as usize) / 255) as u8;

     

       211
       211
       +
                                   let g = ((g1 as usize) * (a0 as usize) / 255) as u8;

     

       212
       212
       +
                                   let b = ((b1 as usize) * (a0 as usize) / 255) as u8;

     

       213
       213
       +
                                   let a = ((a1 as usize) * (a0 as usize) / 255) as u8;

     

       214
       214
       +
                                   *bmp1.pixel_mut((x, y)) = (r, g, b, a);

     

       219
       215
        
                               }

     

       220
       220
       -
                               self.bitmaps.push(bmp1);

     

       221
       221
       -
                           } else {

     

       222
       222
       -
       		        self.bitmaps.push(bmp0);

     

       223
       223
       -
       		    }

     

       216
       216
       +
                           }

     

       217
       217
       +
                           self.bitmaps.push(bmp1);

     

       224
       218
        
                       }

     

       225
       219
        
                   }

     

       226
       220
        
               }