Changeset 845

Timestamp:

01/06/19 02:41:09 (6 years ago)

Author:

Maciej Komosinski

Message:

Made strings at least slightly comparable with zero so 'Math.pi && "xyz" && [9,9,7]' can work as expected in FramScript?

File:

• cpp/frams/util/extvalue.cpp (modified) (10 diffs)

cpp/frams/util/extvalue.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -435 +435 @@
                 else if (src.getType() == TDouble)
                         return compareFloat((double)idata(), src.getDouble());
+                else if ((getInt() == 0) && (src.getType() == TString))
+                        return ResultMismatch_RelaxedUnequal;
                 else
                         return ResultMismatch;//comparing numbers with other things is invalid
@@ -449 +451 @@
                 if (src.getType() == TString)
                         return compareString(sdata(), src.getString());
+                else if ((src.type == TInt) && (src.getInt() == 0))
+                        return ResultMismatch_RelaxedUnequal;
                 else
                         return ResultMismatch;
@@ -491 +495 @@
                         if (context->v1 && context->v2)
                                 msg += SString::sprintf(": %s %s %s",
-                                context->v1->typeAndValue().c_str(),
-                                cmp_op_names[op - CmpFIRST],
-                                context->v2->typeAndValue().c_str());
+                                        context->v1->typeAndValue().c_str(),
+                                        cmp_op_names[op - CmpFIRST],
+                                        context->v2->typeAndValue().c_str());
                 }
                 logPrintf("ExtValue", "interpretCompare", LOG_ERROR, "%s", msg.c_str());
@@ -559 +563 @@
                 }
         }
-                //NO break;
+        //NO break;
         default:;
         }
@@ -661 +665 @@
                 }
         }
-                //NO break;
+        //NO break;
         default:;
         }
@@ -813 +817 @@
                         for (const char* t = curr; t < next; t++)
                                 switch (*t)
-                        {
+                                {
                                 case 'd': case 'x': case 'X': case 'u': case 'p': case 'c': type = 'd'; t = next; break;
                                 case 'f': case 'g': case 'e': type = 'f'; t = next; break;
@@ -819 +823 @@
                                 case 't': case 'T': case 'y': case 'i': case 'm': type = *t; t = next; break;
                                 case '%': if (t > begin) { type = *t; t = next; } break;
-                        }
+                                }
                 }
                 if (curr > begin) curr--;
@@ -887 +891 @@
                 }
         }
-                break;
+        break;
 
         case TObj: case TUnknown: case TInvalid:
@@ -1239 +1243 @@
                         if (*end == '>')
                         {
-                        setError(SString("Unserializable class: ") + SString(in + 1, end - in - 1));
-                        return end + 1;
+                                setError(SString("Unserializable class: ") + SString(in + 1, end - in - 1));
+                                return end + 1;
                         }
                         else