Replace regex with winnow based parser

Replace regex with winnow based parser #794