commit 38ff1c1ed25f8272c37a99d70e89cbbd80d04e44 · drubery.com/icfp2007

+1 -1

asm/gene_list_1.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

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

+2 -2

asm/gene_list_10.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{9,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{9,24} ;

+2 -2

asm/gene_list_11.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{10,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{10,24} ;

+2 -2

asm/gene_list_12.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{11,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{11,24} ;

+2 -2

asm/gene_list_13.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{12,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{12,24} ;

+2 -2

asm/gene_list_14.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{13,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{13,24} ;

+2 -2

asm/gene_list_2.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{1,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{1,24} ;

+2 -2

asm/gene_list_3.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{2,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{2,24} ;

+2 -2

asm/gene_list_4.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{3,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{3,24} ;

+2 -2

asm/gene_list_5.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{4,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{4,24} ;

+2 -2

asm/gene_list_6.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{5,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{5,24} ;

+2 -2

asm/gene_list_7.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{6,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{6,24} ;

+2 -2

asm/gene_list_8.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{7,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{7,24} ;

+2 -2

asm/gene_list_9.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{42,24} ;

     

       2
       2
       -
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; "0"n{8,24} ;

     

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

     

       2
       2
       +
       (?{IFPICFPPCFFPP}!{0x503})n{0,24} ; {0}n{8,24} ;

+1 -1

asm/repair_guide.asm

···

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

     

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

+1 -1

asm/repair_guide_catalog.asm

···

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

     

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

+1 -1

asm/repair_guide_charset.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{10646,24} ;

     

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

+1 -1

asm/repair_guide_field_repair.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{85,24} ;

     

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

+1 -1

asm/repair_guide_genome_structure.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{1729,24} ;

     

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

+1 -1

asm/repair_guide_l_systems.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{5,24} ;

     

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

+1 -1

asm/repair_guide_more_genome_structure.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{8,24} ;

     

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

+1 -1

asm/repair_guide_rna_compression.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{123456,24} ;

     

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

+1 -1

asm/repair_guide_security.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{4405829,24} ;

     

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

+1 -1

asm/repair_guide_wanted.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{112,24} ;

     

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

+1 -1

asm/repair_guide_weird_rna.asm

···

       1
       1
       -
       (?{IFPCFFP})n{0,24} ; "0"n{2181889,24} ;

     

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

+1 -1

asm/startup.asm

···

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

     

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

+1 -1

asm/sun.asm

···

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

     

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

+1 -1

asm/task.asm

···

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

     

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

+7 -7

asm2dna/src/assembler.rs

···

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

     

       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('"') => String::from("0"),

     

       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('"');

     

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

     

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

     

       145
       145
        
                                   l

     

       146
       146
        
                               }

     

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

     
···

       227
       227
        
       

     

       228
       228
        
           #[test]

     

       229
       229
        
           fn test_assemble_pattern_quote() {

     

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

     

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

     

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

     

       232
       232
        
       

     

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

     

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

     

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

     

       235
       235
        
           }

     

       236
       236