Added support for "and" "or" operators in parser definition.

These operators require at lest one space before and after.