commit 152f788ca037140e4cccc1407bc5fbb1ff8b4d23 · drubery.com/icfp2007

+4 -1

Tupfile

···

       2
       2
        
       

     

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

     

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

     

       5
       5
       +
       : asm2dna/src/*.rs |> rustc --crate-name asm2dna asm2dna/src/main.rs $(RUSTC_FLAGS) |> out/bin/asm2dna

     

       6
       6
       +
       

     

       7
       7
       +
       : foreach asm/*.asm | out/bin/asm2dna |> ./out/bin/asm2dna %f out/dna/%B.dna |> out/dna/%B.dna

     

       5
       8
        
       

     

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

     

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

     

       7
       10
        
       

     

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

     

       9
       12

asm/repair_guide.asm

···

       1
       1
       +
       (?{IFPCFFP})II ; "0"IC ;

asm/repair_guide_catalog.asm

···

       1
       1
       +
       (?{IFPCFFP})n{0,24} ; "0"n{1337,24} ;

asm/startup.asm

···

       1
       1
       +
       (?{IFPCFFP})I ; "0"C ;

asm/sun.asm

···

       1
       1
       +
       (?{IFPFI})P ; "0"F ;

asm/task.asm

···

       1
       1
       +
       (?{IFPP})F ; "0"P ;

asm2dna/.dir-locals.el

···

       1
       1
       +
       ((nil . ((default-directory . "~/repos/endo/asm2dna/"))))

asm2dna/Cargo.lock

···

       1
       1
       +
       # This file is automatically @generated by Cargo.

     

       2
       2
       +
       # It is not intended for manual editing.

     

       3
       3
       +
       version = 4

     

       4
       4
       +
       

     

       5
       5
       +
       [[package]]

     

       6
       6
       +
       name = "asm2dna"

     

       7
       7
       +
       version = "0.1.0"

asm2dna/Cargo.toml

···

       1
       1
       +
       [package]

     

       2
       2
       +
       name = "asm2dna"

     

       3
       3
       +
       version = "0.1.0"

     

       4
       4
       +
       edition = "2024"

     

       5
       5
       +
       

     

       6
       6
       +
       [dependencies]

+189

asm2dna/src/assembler.rs

···

       1
       1
       +
       use std::iter::Peekable;

     

       2
       2
       +
       use std::str::Chars;

     

       3
       3
       +
       

     

       4
       4
       +
       pub type Error = &'static str;

     

       5
       5
       +
       

     

       6
       6
       +
       pub fn assemble(asm: &str) -> Result<Vec<u8>, Error> {

     

       7
       7
       +
           Assembler::new(asm).assemble()

     

       8
       8
       +
       }

     

       9
       9
       +
       

     

       10
       10
       +
       struct Assembler<'a> {

     

       11
       11
       +
           iter: Peekable<Chars<'a>>,

     

       12
       12
       +
           output: Vec<u8>,

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       15
       15
       +
       enum IntPadding {

     

       16
       16
       +
           NoPadding,

     

       17
       17
       +
           PaddedTo(usize),

     

       18
       18
       +
       }

     

       19
       19
       +
       

     

       20
       20
       +
       impl<'a> Assembler<'a> {

     

       21
       21
       +
           fn new(buf: &'a str) -> Assembler<'a> {

     

       22
       22
       +
               Assembler {

     

       23
       23
       +
                   iter: buf.chars().peekable(),

     

       24
       24
       +
                   output: Vec::new(),

     

       25
       25
       +
               }

     

       26
       26
       +
           }

     

       27
       27
       +
       

     

       28
       28
       +
           fn expect(&mut self, c: char) -> Option<()> {

     

       29
       29
       +
               match self.iter.next() {

     

       30
       30
       +
                   Some(d) => {

     

       31
       31
       +
                       if c == d {

     

       32
       32
       +
                           Some(())

     

       33
       33
       +
                       } else {

     

       34
       34
       +
                           None

     

       35
       35
       +
                       }

     

       36
       36
       +
                   }

     

       37
       37
       +
                   None => None,

     

       38
       38
       +
               }

     

       39
       39
       +
           }

     

       40
       40
       +
       

     

       41
       41
       +
           fn emit(&mut self, s: &str) {

     

       42
       42
       +
               self.output.extend_from_slice(s.as_bytes());

     

       43
       43
       +
           }

     

       44
       44
       +
       

     

       45
       45
       +
           fn read_to(&mut self, any_of: &str) -> Option<String> {

     

       46
       46
       +
               let mut s = String::new();

     

       47
       47
       +
               loop {

     

       48
       48
       +
                   if let Some(c) = self.iter.peek()

     

       49
       49
       +
                       && any_of.contains(*c)

     

       50
       50
       +
                   {

     

       51
       51
       +
                       return Some(s);

     

       52
       52
       +
                   }

     

       53
       53
       +
       

     

       54
       54
       +
                   match self.iter.next() {

     

       55
       55
       +
                       Some(c) => s.push(c),

     

       56
       56
       +
                       None => return None,

     

       57
       57
       +
                   }

     

       58
       58
       +
               }

     

       59
       59
       +
           }

     

       60
       60
       +
       

     

       61
       61
       +
           fn parse_int(s: &str) -> Option<usize> {

     

       62
       62
       +
               let is_hex = s.starts_with("0x");

     

       63
       63
       +
               let base = if is_hex { 16 } else { 10 };

     

       64
       64
       +
               let mut ret = 0;

     

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

     

       66
       66
       +
               if is_hex {

     

       67
       67
       +
                   // TODO: advance_by?

     

       68
       68
       +
                   iter.nth(1);

     

       69
       69
       +
               }

     

       70
       70
       +
       

     

       71
       71
       +
               for c in iter {

     

       72
       72
       +
                   ret *= base;

     

       73
       73
       +
                   ret += c.to_digit(base)?;

     

       74
       74
       +
               }

     

       75
       75
       +
       

     

       76
       76
       +
               return Some(ret as usize);

     

       77
       77
       +
           }

     

       78
       78
       +
       

     

       79
       79
       +
           fn encode_int(mut n: usize, p: IntPadding) -> String {

     

       80
       80
       +
               let mut s = String::new();

     

       81
       81
       +
               while n > 0 {

     

       82
       82
       +
                   if n % 2 == 1 {

     

       83
       83
       +
                       s += "C";

     

       84
       84
       +
                   } else {

     

       85
       85
       +
                       s += "I";

     

       86
       86
       +
                   }

     

       87
       87
       +
       

     

       88
       88
       +
                   n /= 2;

     

       89
       89
       +
               }

     

       90
       90
       +
       

     

       91
       91
       +
               if let IntPadding::PaddedTo(p) = p {

     

       92
       92
       +
                   for _ in s.len()..(p - 1) {

     

       93
       93
       +
                       s += "I";

     

       94
       94
       +
                   }

     

       95
       95
       +
               }

     

       96
       96
       +
       

     

       97
       97
       +
               s += "P";

     

       98
       98
       +
               return s;

     

       99
       99
       +
           }

     

       100
       100
       +
       

     

       101
       101
       +
           fn emit_consts(&mut self, s: &str) {

     

       102
       102
       +
               for c in s.chars() {

     

       103
       103
       +
                   match c {

     

       104
       104
       +
                       'I' => self.emit("C"),

     

       105
       105
       +
                       'C' => self.emit("F"),

     

       106
       106
       +
                       'F' => self.emit("P"),

     

       107
       107
       +
                       'P' => self.emit("IC"),

     

       108
       108
       +
                       _ => {}

     

       109
       109
       +
                   }

     

       110
       110
       +
               }

     

       111
       111
       +
           }

     

       112
       112
       +
       

     

       113
       113
       +
           fn assemble(mut self) -> Result<Vec<u8>, Error> {

     

       114
       114
       +
               loop {

     

       115
       115
       +
                   match self.iter.next() {

     

       116
       116
       +
                       Some('I') => self.emit("C"),

     

       117
       117
       +
                       Some('C') => self.emit("F"),

     

       118
       118
       +
                       Some('F') => self.emit("P"),

     

       119
       119
       +
                       Some('P') => self.emit("IC"),

     

       120
       120
       +
                       Some('!') => {

     

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

     

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

     

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

     

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

     

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

     

       126
       126
       +
                       }

     

       127
       127
       +
                       Some('?') => {

     

       128
       128
       +
                           self.expect('{').ok_or("Search followed by non-?")?;

     

       129
       129
       +
                           let s = self.read_to("}").ok_or("Search failed to terminate")?;

     

       130
       130
       +
                           self.emit("IFF");

     

       131
       131
       +
                           self.emit_consts(&s);

     

       132
       132
       +
                           self.expect('}').ok_or("Search failed to terminate")?;

     

       133
       133
       +
                       }

     

       134
       134
       +
                       Some('(') => self.emit("IIP"),

     

       135
       135
       +
                       Some(')') => self.emit("IIC"),

     

       136
       136
       +
                       Some(';') => self.emit("IIC"),

     

       137
       137
       +
                       Some('"') => {

     

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

     

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

     

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

     

       141
       141
       +
                               Some('"') => "0",

     

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

     

       143
       143
       +
                               _ => return Err("Reference failed to terminate"),

     

       144
       144
       +
                           };

     

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

     

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

     

       147
       147
       +
                           self.emit(&Self::encode_int(l, IntPadding::NoPadding));

     

       148
       148
       +
                           self.emit(&Self::encode_int(n, IntPadding::NoPadding));

     

       149
       149
       +
                       }

     

       150
       150
       +
                       Some('|') => {

     

       151
       151
       +
                           let n = self.read_to("|").ok_or("Length failed to terminate")?;

     

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

     

       153
       153
       +
                           self.emit("IIP");

     

       154
       154
       +
                           self.emit(&Self::encode_int(n, IntPadding::NoPadding));

     

       155
       155
       +
                       }

     

       156
       156
       +
                       Some('n') => {

     

       157
       157
       +
                           self.expect('{');

     

       158
       158
       +
                           let n = self

     

       159
       159
       +
                               .read_to("},")

     

       160
       160
       +
                               .ok_or("Int constant failed to terminate")?;

     

       161
       161
       +
                           let n = Self::parse_int(&n).ok_or("Int constant invalid")?;

     

       162
       162
       +
                           match self.iter.next() {

     

       163
       163
       +
                               Some('}') => {

     

       164
       164
       +
                                   self.emit(&Self::encode_int(n, IntPadding::NoPadding));

     

       165
       165
       +
                               }

     

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

     

       167
       167
       +
                                   let pad = self

     

       168
       168
       +
                                       .read_to("}")

     

       169
       169
       +
                                       .ok_or("Int constant failed to terminate")?;

     

       170
       170
       +
                                   let pad =

     

       171
       171
       +
                                       Self::parse_int(&pad).ok_or("Int constant padding invalid")?;

     

       172
       172
       +
                                   self.emit_consts(&Self::encode_int(n, IntPadding::PaddedTo(pad)));

     

       173
       173
       +
                                   self.expect('}').ok_or("Int constant failed to terminate")?;

     

       174
       174
       +
                               }

     

       175
       175
       +
                               _ => return Err("Int constant failed to terminate"),

     

       176
       176
       +
                           };

     

       177
       177
       +
                       }

     

       178
       178
       +
                       Some(' ') | Some('\n') => {}

     

       179
       179
       +
                       None => return Ok(self.output),

     

       180
       180
       +
                       Some(c) => {

     

       181
       181
       +
                           println!("{}", c);

     

       182
       182
       +
                           return Err("Invalid character");

     

       183
       183
       +
                       }

     

       184
       184
       +
                   }

     

       185
       185
       +
               }

     

       186
       186
       +
           }

     

       187
       187
       +
       }

     

       188
       188
       +
       

     

       189
       189
       +
       // TODO: Tests

+21

asm2dna/src/main.rs

···

       1
       1
       +
       mod assembler;

     

       2
       2
       +
       

     

       3
       3
       +
       use std::env;

     

       4
       4
       +
       use std::fs;

     

       5
       5
       +
       use std::io;

     

       6
       6
       +
       

     

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

     

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

     

       9
       9
       +
           if args.len() < 3 {

     

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

     

       11
       11
       +
               return Ok(());

     

       12
       12
       +
           }

     

       13
       13
       +
       

     

       14
       14
       +
           // TODO: Better error messages

     

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

     

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

     

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

     

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

     

       19
       19
       +
           }

     

       20
       20
       +
           return Ok(());

     

       21
       21
       +
       }

prefixes/empty.dna asm/empty.asm

-1

prefixes/repair_guide.dna

···

       1
       1
       -
       IIPIFFCPICFPPICIICCCIICIPPPCFIIC

-1

prefixes/startup.dna

···

       1
       1
       -
       IIPIFFCPICFPPICIICCIICIPPPFIIC

-1

prefixes/sun.dna

···

       1
       1
       -
       IIPIFFCPICPCIICICIICIPPPPIIC

-1

prefixes/task.dna

···

       1
       1
       -
       IIPIFFCPICICIICPIICIPPPICIIC