Added operator type enumeration. Need to replace lexer token generation with this enum