commit c41adf49d2fd67a9e4ec5065edced5889ae23475 · drubery.com/icfp2007

+5 -5

dna2rna/src/parser.rs

···

       129
       129
        
                   {

     

       130
       130
        
                       self.advance(3);

     

       131
       131
        
                       if level == 0 {

     

       132
       132
       -
                           return Some(ret);

     

       132
       132
       +
                           return Some(Pattern::new(ret));

     

       133
       133
        
                       }

     

       134
       134
        
                       level -= 1;

     

       135
       135
        
                       ret.push(PatternItem::Close);

     
···

       241
       241
        
               let mut parser = Parser::new(dna);

     

       242
       242
        
               assert_eq!(

     

       243
       243
        
                   parser.pattern(&mut rna),

     

       244
       244
       -
                   Some(vec![PatternItem::Base(Base::I)])

     

       244
       244
       +
                   Some(Pattern::new(vec![PatternItem::Base(Base::I)]))

     

       245
       245
        
               );

     

       246
       246
        
               assert_eq!(parser.index, 4);

     

       247
       247
        
       

     
···

       249
       249
        
               let mut parser = Parser::new(dna);

     

       250
       250
        
               assert_eq!(

     

       251
       251
        
                   parser.pattern(&mut rna),

     

       252
       252
       -
                   Some(vec![

     

       252
       252
       +
                   Some(Pattern::new(vec![

     

       253
       253
        
                       PatternItem::Open,

     

       254
       254
        
                       PatternItem::Skip(2),

     

       255
       255
        
                       PatternItem::Close,

     

       256
       256
        
                       PatternItem::Base(Base::P)

     

       257
       257
       -
                   ])

     

       257
       257
       +
                   ]))

     

       258
       258
        
               );

     

       259
       259
        
               assert_eq!(parser.index, 16);

     

       260
       260
        
       

     

       261
       261
        
               let dna = dna_from_str("IIIPFCICFPIIC").into_iter();

     

       262
       262
        
               let mut parser = Parser::new(dna);

     

       263
       263
       -
               assert_eq!(parser.pattern(&mut rna), Some(vec![]));

     

       263
       263
       +
               assert_eq!(parser.pattern(&mut rna), Some(Pattern::new(vec![])));

     

       264
       264
        
               assert_eq!(parser.index, 13);

     

       265
       265
        
               assert_eq!(

     

       266
       266
        
                   rna,

+98 -1

dna2rna/src/pattern.rs

···

       1
       1
        
       use crate::dna::Base;

     

       2
       2
       +
       use std::fmt;

     

       3
       3
       +
       use std::slice::Iter;

     

       2
       4
        
       

     

       3
       5
        
       #[derive(Debug, PartialEq)]

     

       4
       6
        
       pub enum PatternItem {

     
···

       9
       11
        
           Close,

     

       10
       12
        
       }

     

       11
       13
        
       

     

       12
       12
       -
       pub type Pattern = Vec<PatternItem>;

     

       14
       14
       +
       impl fmt::Display for PatternItem {

     

       15
       15
       +
           fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

     

       16
       16
       +
               match &self {

     

       17
       17
       +
                   PatternItem::Base(b) => write!(f, "{}", b.to_char()),

     

       18
       18
       +
                   PatternItem::Skip(n) => write!(f, "!{{{}}}", n),

     

       19
       19
       +
                   PatternItem::Search(s) => {

     

       20
       20
       +
                       write!(f, "?{{")?;

     

       21
       21
       +
                       for b in s {

     

       22
       22
       +
                           write!(f, "{}", b.to_char())?;

     

       23
       23
       +
                       }

     

       24
       24
       +
                       write!(f, "}}")?;

     

       25
       25
       +
                       Ok(())

     

       26
       26
       +
                   }

     

       27
       27
       +
                   PatternItem::Open => write!(f, "("),

     

       28
       28
       +
                   PatternItem::Close => write!(f, ")"),

     

       29
       29
       +
               }

     

       30
       30
       +
           }

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       #[derive(PartialEq, Debug)]

     

       34
       34
       +
       pub struct Pattern {

     

       35
       35
       +
           pattern: Vec<PatternItem>,

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       impl Pattern {

     

       39
       39
       +
           pub fn new(pattern: Vec<PatternItem>) -> Pattern {

     

       40
       40
       +
               Pattern { pattern: pattern }

     

       41
       41
       +
           }

     

       42
       42
       +
       

     

       43
       43
       +
           pub fn iter<'a>(&'a self) -> Iter<'a, PatternItem> {

     

       44
       44
       +
               self.pattern.iter()

     

       45
       45
       +
           }

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       impl fmt::Display for Pattern {

     

       49
       49
       +
           fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

     

       50
       50
       +
               for p in self.iter() {

     

       51
       51
       +
                   write!(f, "{}", p)?;

     

       52
       52
       +
               }

     

       53
       53
       +
               Ok(())

     

       54
       54
       +
           }

     

       55
       55
       +
       }

     

       56
       56
       +
       

     

       57
       57
       +
       #[cfg(test)]

     

       58
       58
       +
       mod tests {

     

       59
       59
       +
           use super::*;

     

       60
       60
       +
       

     

       61
       61
       +
           #[test]

     

       62
       62
       +
           fn test_display_base() {

     

       63
       63
       +
               assert_eq!(

     

       64
       64
       +
                   Pattern::new(vec![

     

       65
       65
       +
                       PatternItem::Base(Base::I),

     

       66
       66
       +
                       PatternItem::Base(Base::C),

     

       67
       67
       +
                       PatternItem::Base(Base::F),

     

       68
       68
       +
                       PatternItem::Base(Base::P)

     

       69
       69
       +
                   ])

     

       70
       70
       +
                   .to_string(),

     

       71
       71
       +
                   "ICFP"

     

       72
       72
       +
               );

     

       73
       73
       +
           }

     

       74
       74
       +
       

     

       75
       75
       +
           #[test]

     

       76
       76
       +
           fn test_display_skip() {

     

       77
       77
       +
               assert_eq!(Pattern::new(vec![PatternItem::Skip(5)]).to_string(), "!{5}");

     

       78
       78
       +
           }

     

       79
       79
       +
       

     

       80
       80
       +
           #[test]

     

       81
       81
       +
           fn test_display_search() {

     

       82
       82
       +
               assert_eq!(

     

       83
       83
       +
                   Pattern::new(vec![PatternItem::Search(vec![

     

       84
       84
       +
                       Base::I,

     

       85
       85
       +
                       Base::C,

     

       86
       86
       +
                       Base::F,

     

       87
       87
       +
                       Base::P

     

       88
       88
       +
                   ])])

     

       89
       89
       +
                   .to_string(),

     

       90
       90
       +
                   "?{ICFP}"

     

       91
       91
       +
               );

     

       92
       92
       +
           }

     

       93
       93
       +
       

     

       94
       94
       +
           #[test]

     

       95
       95
       +
           fn test_display_group() {

     

       96
       96
       +
               assert_eq!(

     

       97
       97
       +
                   Pattern::new(vec![

     

       98
       98
       +
                       PatternItem::Open,

     

       99
       99
       +
                       PatternItem::Base(Base::I),

     

       100
       100
       +
                       PatternItem::Base(Base::C),

     

       101
       101
       +
                       PatternItem::Base(Base::F),

     

       102
       102
       +
                       PatternItem::Base(Base::P),

     

       103
       103
       +
                       PatternItem::Close,

     

       104
       104
       +
                   ])

     

       105
       105
       +
                   .to_string(),

     

       106
       106
       +
                   "(ICFP)"

     

       107
       107
       +
               )

     

       108
       108
       +
           }

     

       109
       109
       +
       }