junction support in parser, moved parserpseudo states in new file