Changeset 335 for cpp/frams/util

Timestamp:

03/01/15 01:43:09 (9 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic edits

File:

• cpp/frams/util/extvalue.cpp (modified) (1 diff)

cpp/frams/util/extvalue.cpp

@@ -384 +384 @@
 int ExtValue::interpretCompare(CmpOperator op,CompareResult result,CmpContext *context)
 {
-int err=ResultUnequal_RelaxedEqual;//error when ResultUnequal_RelaxedEqual or higher (not comparable)
+CompareResult error_threshold=ResultUnequal_RelaxedEqual;//error when ResultUnequal_RelaxedEqual or higher (not comparable)
 int ret=0;
 switch (op)
         {
-        case CmpEQ: ret=(result==ResultEqual)||(result==ResultEqualUnordered); err=ResultMismatch_RelaxedUnequal; break;
-        case CmpNE: ret=!((result==ResultEqual)||(result==ResultEqualUnordered)); err=ResultMismatch_RelaxedUnequal; break;
-        case CmpGT: ret=(result==ResultHigher); err=ResultEqualUnordered; break;
-        case CmpGE: ret=(result==ResultEqual)||(result==ResultHigher); err=ResultEqualUnordered; break;
-        case CmpLT: ret=(result==ResultLower); err=ResultEqualUnordered; break;
-        case CmpLE: ret=(result==ResultEqual)||(result==ResultLower); err=ResultEqualUnordered; break;
-        case CmpREQ: ret=(result==ResultEqual)||(result==ResultEqualUnordered)||(result==ResultUnequal_RelaxedEqual); err=ResultMismatch; break;
-        case CmpRNE: ret=!((result==ResultEqual)||(result==ResultEqualUnordered)||(result==ResultUnequal_RelaxedEqual)); err=ResultMismatch; break;
+        case CmpEQ: ret=(result==ResultEqual)||(result==ResultEqualUnordered); error_threshold=ResultMismatch_RelaxedUnequal; break;
+        case CmpNE: ret=!((result==ResultEqual)||(result==ResultEqualUnordered)); error_threshold=ResultMismatch_RelaxedUnequal; break;
+        case CmpGT: ret=(result==ResultHigher); error_threshold=ResultEqualUnordered; break;
+        case CmpGE: ret=(result==ResultEqual)||(result==ResultHigher); error_threshold=ResultEqualUnordered; break;
+        case CmpLT: ret=(result==ResultLower); error_threshold=ResultEqualUnordered; break;
+        case CmpLE: ret=(result==ResultEqual)||(result==ResultLower); error_threshold=ResultEqualUnordered; break;
+        case CmpREQ: ret=(result==ResultEqual)||(result==ResultEqualUnordered)||(result==ResultUnequal_RelaxedEqual); error_threshold=ResultMismatch; break;
+        case CmpRNE: ret=!((result==ResultEqual)||(result==ResultEqualUnordered)||(result==ResultUnequal_RelaxedEqual)); error_threshold=ResultMismatch; break;
         default:;
         }
-if (result>=err)
+if (result >= error_threshold)
         {
         if (context)
                 {
-                SString msg="Type mismatch";
+                SString msg="Type mismatch while comparing";
                 if (context->v1 && context->v2)
                         {