- if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"gt")) {\r
- BinOp = OPERATOR_GT;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"lt")) {\r
- BinOp = OPERATOR_LT;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"eq")) {\r
- BinOp = OPERATOR_EQ;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ne")) {\r
- BinOp = OPERATOR_NE;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ge")) {\r
- BinOp = OPERATOR_GE;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"le")) {\r
- BinOp = OPERATOR_LE;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"==")) {\r
- BinOp = OPERATOR_EQ;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ugt")) {\r
- BinOp = OPERATOR_UGT;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ult")) {\r
- BinOp = OPERATOR_ULT;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"uge")) {\r
- BinOp = OPERATOR_UGE;\r
- } else if (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ule")) {\r
- BinOp = OPERATOR_ULE;\r
+ if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"gt", &Match)) && Match) {\r
+ BinOp = OperatorGreaterThan;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"lt", &Match)) && Match) {\r
+ BinOp = OperatorLessThan;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"eq", &Match)) && Match) {\r
+ BinOp = OperatorEqual;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ne", &Match)) && Match) {\r
+ BinOp = OperatorNotEqual;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ge", &Match)) && Match) {\r
+ BinOp = OperatorGreatorOrEqual;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"le", &Match)) && Match) {\r
+ BinOp = OperatorLessOrEqual;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"==", &Match)) && Match) {\r
+ BinOp = OperatorEqual;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ugt", &Match)) && Match) {\r
+ BinOp = OperatorUnisgnedGreaterThan;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ult", &Match)) && Match) {\r
+ BinOp = OperatorUnsignedLessThan;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"uge", &Match)) && Match) {\r
+ BinOp = OperatorUnsignedGreaterOrEqual;\r
+ } else if (!EFI_ERROR (IsNextFragment((CONST CHAR16**)(&StatementWalker), L"ule", &Match)) && Match) {\r
+ BinOp = OperatorUnsignedLessOrEqual;\r