added set logic expression parsing and match_expression parsing