diff -r 761793cce563 -r c2d36c3cf8ad progs/tests/repetition2.txt --- a/progs/tests/repetition2.txt Thu Jun 09 12:31:02 2016 +0100 +++ b/progs/tests/repetition2.txt Fri Jun 10 23:53:46 2016 +0100 @@ -1,79 +1,79 @@ -1 ((..)|(.)) NULL NOMATCH -2 ((..)|(.))((..)|(.)) NULL NOMATCH -3 ((..)|(.))((..)|(.))((..)|(.)) NULL NOMATCH -4 ((..)|(.)){1} NULL NOMATCH -5 ((..)|(.)){2} NULL NOMATCH -6 ((..)|(.)){3} NULL NOMATCH -7 ((..)|(.))* NULL (0,0)(?,?)(?,?)(?,?) -8 ((..)|(.)) a (0,1)(0,1)(?,?)(0,1) -9 ((..)|(.))((..)|(.)) a NOMATCH -10 ((..)|(.))((..)|(.))((..)|(.)) a NOMATCH -11 ((..)|(.)){1} a (0,1)(0,1)(?,?)(0,1) -12 ((..)|(.)){2} a NOMATCH -13 ((..)|(.)){3} a NOMATCH -14 ((..)|(.))* a (0,1)(0,1)(?,?)(0,1) -15 ((..)|(.)) aa (0,2)(0,2)(0,2)(?,?) -16 ((..)|(.))((..)|(.)) aa (0,2)(0,1)(?,?)(0,1)(1,2)(?,?)(1,2) -17 ((..)|(.))((..)|(.))((..)|(.)) aa NOMATCH -18 ((..)|(.)){1} aa (0,2)(0,2)(0,2)(?,?) -19 ((..)|(.)){2} aa (0,2)(1,2)(?,?)(1,2) -20 ((..)|(.)){3} aa NOMATCH -21 ((..)|(.))* aa (0,2)(0,2)(0,2)(?,?) -22 ((..)|(.)) aaa (0,2)(0,2)(0,2)(?,?) -23 ((..)|(.))((..)|(.)) aaa (0,3)(0,2)(0,2)(?,?)(2,3)(?,?)(2,3) -24 ((..)|(.))((..)|(.))((..)|(.)) aaa (0,3)(0,1)(?,?)(0,1)(1,2)(?,?)(1,2)(2,3)(?,?)(2,3) -25 ((..)|(.)){1} aaa (0,2)(0,2)(0,2)(?,?) -26 ((..)|(.)){2} aaa (0,3)(2,3)(?,?)(2,3) -27 ((..)|(.)){3} aaa (0,3)(2,3)(?,?)(2,3) -28 ((..)|(.))* aaa (0,3)(2,3)(?,?)(2,3) -29 ((..)|(.)) aaaa (0,2)(0,2)(0,2)(?,?) -30 ((..)|(.))((..)|(.)) aaaa (0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?) -31 ((..)|(.))((..)|(.))((..)|(.)) aaaa (0,4)(0,2)(0,2)(?,?)(2,3)(?,?)(2,3)(3,4)(?,?)(3,4) -32 ((..)|(.)){1} aaaa (0,2)(0,2)(0,2)(?,?) -33 ((..)|(.)){2} aaaa (0,4)(2,4)(2,4)(?,?) -34 ((..)|(.)){3} aaaa (0,4)(3,4)(?,?)(3,4) -35 ((..)|(.))* aaaa (0,4)(2,4)(2,4)(?,?) -36 ((..)|(.)) aaaaa (0,2)(0,2)(0,2)(?,?) -37 ((..)|(.))((..)|(.)) aaaaa (0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?) -38 ((..)|(.))((..)|(.))((..)|(.)) aaaaa (0,5)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?)(4,5)(?,?)(4,5) -39 ((..)|(.)){1} aaaaa (0,2)(0,2)(0,2)(?,?) -40 ((..)|(.)){2} aaaaa (0,4)(2,4)(2,4)(?,?) -41 ((..)|(.)){3} aaaaa (0,5)(4,5)(?,?)(4,5) -42 ((..)|(.))* aaaaa (0,5)(4,5)(?,?)(4,5) -43 ((..)|(.)) aaaaaa (0,2)(0,2)(0,2)(?,?) -44 ((..)|(.))((..)|(.)) aaaaaa (0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?) -45 ((..)|(.))((..)|(.))((..)|(.)) aaaaaa (0,6)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?)(4,6)(4,6)(?,?) -46 ((..)|(.)){1} aaaaaa (0,2)(0,2)(0,2)(?,?) -47 ((..)|(.)){2} aaaaaa (0,4)(2,4)(2,4)(?,?) -48 ((..)|(.)){3} aaaaaa (0,6)(4,6)(4,6)(?,?) -49 ((..)|(.))* aaaaaa (0,6)(4,6)(4,6)(?,?) -100 X(.?){0,}Y X1234567Y (0,9)(7,8) -101 X(.?){1,}Y X1234567Y (0,9)(7,8) -102 X(.?){2,}Y X1234567Y (0,9)(7,8) -103 X(.?){3,}Y X1234567Y (0,9)(7,8) -104 X(.?){4,}Y X1234567Y (0,9)(7,8) -105 X(.?){5,}Y X1234567Y (0,9)(7,8) -106 X(.?){6,}Y X1234567Y (0,9)(7,8) -107 X(.?){7,}Y X1234567Y (0,9)(7,8) -108 X(.?){8,}Y X1234567Y (0,9)(8,8) -110 X(.?){0,8}Y X1234567Y (0,9)(7,8) -111 X(.?){1,8}Y X1234567Y (0,9)(7,8) -112 X(.?){2,8}Y X1234567Y (0,9)(7,8) -113 X(.?){3,8}Y X1234567Y (0,9)(7,8) -114 X(.?){4,8}Y X1234567Y (0,9)(7,8) -115 X(.?){5,8}Y X1234567Y (0,9)(7,8) -116 X(.?){6,8}Y X1234567Y (0,9)(7,8) -117 X(.?){7,8}Y X1234567Y (0,9)(7,8) -118 X(.?){8,8}Y X1234567Y (0,9)(8,8) -260 (a|ab|c|bcd){0,}(d*) ababcd (0,6)(3,6)(6,6) -261 (a|ab|c|bcd){1,}(d*) ababcd (0,6)(3,6)(6,6) -262 (a|ab|c|bcd){2,}(d*) ababcd (0,6)(3,6)(6,6) -263 (a|ab|c|bcd){3,}(d*) ababcd (0,6)(3,6)(6,6) -264 (a|ab|c|bcd){4,}(d*) ababcd NOMATCH -265 (a|ab|c|bcd){0,10}(d*) ababcd (0,6)(3,6)(6,6) -266 (a|ab|c|bcd){1,10}(d*) ababcd (0,6)(3,6)(6,6) -267 (a|ab|c|bcd){2,10}(d*) ababcd (0,6)(3,6)(6,6) -268 (a|ab|c|bcd){3,10}(d*) ababcd (0,6)(3,6)(6,6) -269 (a|ab|c|bcd){4,10}(d*) ababcd NOMATCH -270 (a|ab|c|bcd)*(d*) ababcd (0,6)(3,6)(6,6) -271 (a|ab|c|bcd)+(d*) ababcd (0,6)(3,6)(6,6) +#1 ((..)|(.)) NULL NOMATCH +#2 ((..)|(.))((..)|(.)) NULL NOMATCH +#3 ((..)|(.))((..)|(.))((..)|(.)) NULL NOMATCH +#4 ((..)|(.)){1} NULL NOMATCH +#5 ((..)|(.)){2} NULL NOMATCH +#6 ((..)|(.)){3} NULL NOMATCH +7 ((..)|(.))* - (0,0) +8 ((..)|(.)) a (0,1)(0,1)(0,1) +#9 ((..)|(.))((..)|(.)) a NOMATCH +#10 ((..)|(.))((..)|(.))((..)|(.)) a NOMATCH +#11 ((..)|(.)){1} a (0,1)(0,1)(?,?)(0,1) +#12 ((..)|(.)){2} a NOMATCH +#13 ((..)|(.)){3} a NOMATCH +14 ((..)|(.))* a (0,1)(0,1)(0,1) +15 ((..)|(.)) aa (0,2)(0,2)(0,2) +16 ((..)|(.))((..)|(.)) aa (0,2)(0,1)(0,1)(1,2)(1,2) +#17 ((..)|(.))((..)|(.))((..)|(.)) aa NOMATCH +#18 ((..)|(.)){1} aa (0,2)(0,2)(0,2)(?,?) +#19 ((..)|(.)){2} aa (0,2)(1,2)(?,?)(1,2) +#20 ((..)|(.)){3} aa NOMATCH +21 ((..)|(.))* aa (0,2)(0,2)(0,2) +#22 ((..)|(.)) aaa (0,2)(0,2)(0,2)(?,?) +23 ((..)|(.))((..)|(.)) aaa (0,3)(0,2)(0,2)(2,3)(2,3) +24 ((..)|(.))((..)|(.))((..)|(.)) aaa (0,3)(0,1)(0,1)(1,2)(1,2)(2,3)(2,3) +#25 ((..)|(.)){1} aaa (0,2)(0,2)(0,2)(?,?) +#26 ((..)|(.)){2} aaa (0,3)(2,3)(?,?)(2,3) +#27 ((..)|(.)){3} aaa (0,3)(2,3)(?,?)(2,3) +28 ((..)|(.))* aaa (0,3)(0,2)(0,2)(2,3)(2,3) +#29 ((..)|(.)) aaaa (0,2)(0,2)(0,2)(?,?) +30 ((..)|(.))((..)|(.)) aaaa (0,4)(0,2)(0,2)(2,4)(2,4) +31 ((..)|(.))((..)|(.))((..)|(.)) aaaa (0,4)(0,2)(0,2)(2,3)(2,3)(3,4)(3,4) +#32 ((..)|(.)){1} aaaa (0,2)(0,2)(0,2)(?,?) +#33 ((..)|(.)){2} aaaa (0,4)(2,4)(2,4)(?,?) +#34 ((..)|(.)){3} aaaa (0,4)(3,4)(?,?)(3,4) +35 ((..)|(.))* aaaa (0,4)(0,2)(0,2)(2,4)(2,4) +#36 ((..)|(.)) aaaaa (0,2)(0,2)(0,2)(?,?) +#37 ((..)|(.))((..)|(.)) aaaaa (0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?) +38 ((..)|(.))((..)|(.))((..)|(.)) aaaaa (0,5)(0,2)(0,2)(2,4)(2,4)(4,5)(4,5) +#39 ((..)|(.)){1} aaaaa (0,2)(0,2)(0,2)(?,?) +#40 ((..)|(.)){2} aaaaa (0,4)(2,4)(2,4)(?,?) +#41 ((..)|(.)){3} aaaaa (0,5)(4,5)(?,?)(4,5) +42 ((..)|(.))* aaaaa (0,5)(0,2)(0,2)(2,4)(2,4)(4,5)(4,5) +#43 ((..)|(.)) aaaaaa (0,2)(0,2)(0,2)(?,?) +#44 ((..)|(.))((..)|(.)) aaaaaa (0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?) +45 ((..)|(.))((..)|(.))((..)|(.)) aaaaaa (0,6)(0,2)(0,2)(2,4)(2,4)(4,6)(4,6) +#46 ((..)|(.)){1} aaaaaa (0,2)(0,2)(0,2)(?,?) +#47 ((..)|(.)){2} aaaaaa (0,4)(2,4)(2,4)(?,?) +#48 ((..)|(.)){3} aaaaaa (0,6)(4,6)(4,6)(?,?) +49 ((..)|(.))* aaaaaa (0,6)(0,2)(0,2)(2,4)(2,4)(4,6)(4,6) +#100 X(.?){0,}Y X1234567Y (0,9)(7,8) +#101 X(.?){1,}Y X1234567Y (0,9)(7,8) +#102 X(.?){2,}Y X1234567Y (0,9)(7,8) +#103 X(.?){3,}Y X1234567Y (0,9)(7,8) +#104 X(.?){4,}Y X1234567Y (0,9)(7,8) +#105 X(.?){5,}Y X1234567Y (0,9)(7,8) +#106 X(.?){6,}Y X1234567Y (0,9)(7,8) +#107 X(.?){7,}Y X1234567Y (0,9)(7,8) +#108 X(.?){8,}Y X1234567Y (0,9)(8,8) +#110 X(.?){0,8}Y X1234567Y (0,9)(7,8) +#111 X(.?){1,8}Y X1234567Y (0,9)(7,8) +#112 X(.?){2,8}Y X1234567Y (0,9)(7,8) +#113 X(.?){3,8}Y X1234567Y (0,9)(7,8) +#114 X(.?){4,8}Y X1234567Y (0,9)(7,8) +#115 X(.?){5,8}Y X1234567Y (0,9)(7,8) +#116 X(.?){6,8}Y X1234567Y (0,9)(7,8) +#117 X(.?){7,8}Y X1234567Y (0,9)(7,8) +#118 X(.?){8,8}Y X1234567Y (0,9)(8,8) +#260 (a|ab|c|bcd){0,}(d*) ababcd (0,6)(3,6)(6,6) +#261 (a|ab|c|bcd){1,}(d*) ababcd (0,6)(3,6)(6,6) +#262 (a|ab|c|bcd){2,}(d*) ababcd (0,6)(3,6)(6,6) +#263 (a|ab|c|bcd){3,}(d*) ababcd (0,6)(3,6)(6,6) +#264 (a|ab|c|bcd){4,}(d*) ababcd NOMATCH +#265 (a|ab|c|bcd){0,10}(d*) ababcd (0,6)(3,6)(6,6) +#266 (a|ab|c|bcd){1,10}(d*) ababcd (0,6)(3,6)(6,6) +#267 (a|ab|c|bcd){2,10}(d*) ababcd (0,6)(3,6)(6,6) +#268 (a|ab|c|bcd){3,10}(d*) ababcd (0,6)(3,6)(6,6) +#269 (a|ab|c|bcd){4,10}(d*) ababcd NOMATCH +270 (a|ab|c|bcd)*(d*) ababcd (0,6)(0,2)(2,3)(3,6)(6,6) +271 (a|ab|c|bcd)+(d*) ababcd (0,6)(0,2)(2,3)(3,6)(6,6)