equal
deleted
inserted
replaced
915 |
915 |
916 } |
916 } |
917 |
917 |
918 def turnIntoTerms(r: Rexp): List[Rexp] = r match { |
918 def turnIntoTerms(r: Rexp): List[Rexp] = r match { |
919 case SEQ(r1, r2) => |
919 case SEQ(r1, r2) => |
920 // if(isOne1(r1)) |
|
921 // turnIntoTerms(r2) |
|
922 // else |
|
923 turnIntoTerms(r1).flatMap(r11 => furtherSEQ(r11, r2)) |
920 turnIntoTerms(r1).flatMap(r11 => furtherSEQ(r11, r2)) |
924 case ALTS(r1, r2) => turnIntoTerms(r1) ::: turnIntoTerms(r2) |
921 case ALTS(r1, r2) => turnIntoTerms(r1) ::: turnIntoTerms(r2) |
925 case ZERO => Nil |
922 case ZERO => Nil |
926 case _ => r :: Nil |
923 case _ => r :: Nil |
927 } |
924 } |