Changeset 333 for cpp/frams/util/extvalue.h

Timestamp:

03/01/15 01:19:56 (9 years ago)

Author:

Maciej Komosinski

Message:

• use source/code mapping for line number and file information in vm error messages
• enum ExtValue::CompareResult? instead of int

File:

• cpp/frams/util/extvalue.h (modified) (2 diffs)

cpp/frams/util/extvalue.h

@@ -136 +136 @@
         static ExtValue invalid() { ExtValue v; v.setInvalid(); return v; }
         static const ExtValue& empty() { static const ExtValue v; return v; }
-        int compare(const ExtValue& src) const;
+        static const ExtValue& zero() { static const ExtValue v(0); return v; }
+
+        enum CompareResult
+        {
+         ResultLower=-1, ResultEqual=0, ResultHigher=1,
+         ResultEqualUnordered,
+         ResultUnequal_RelaxedEqual,
+         ResultUnequal_RelaxedUnequal,
+         ResultMismatch_RelaxedUnequal,
+         ResultMismatch
+        };
+        // performs all script value comparisons.
+        // relaxed comparison (internal use only, not available in scripts) works like regular == with additional null~=0, notnull!~0
+        // and is used for pseudo-boolean conversion allowing for expressions like "if (null) ..."
+        CompareResult compare(const ExtValue& src) const;
+
+        enum CmpOperator { CmpFIRST,CmpEQ=CmpFIRST,CmpNE,CmpGE,CmpLE,CmpGT,CmpLT,/*relaxed (not)equal*/CmpREQ,CmpRNE };
+        static const char* cmp_op_names[];
+        class CmpMessageHandler { public: virtual void cmpMessage(SString& text); };
+        struct CmpContext { const ExtValue *v1,*v2; CmpMessageHandler *handler; };
+        static CmpMessageHandler default_cmp_message;
+        static CmpContext default_cmp_context;
+        // interpret compare() result, optional context controls error messages
+        // @return 0=false, 1=true, -1=undefined (null in script)
+        static int interpretCompare(CmpOperator op,CompareResult result,CmpContext *context=&default_cmp_context);
+
         int operator==(const ExtValue& src) const;
         void operator+=(const ExtValue& src);
@@ -154 +179 @@
         void setInvalid() { setEmpty(); type = TInvalid; }
         bool makeUnique() { return (type == TObj) && odata().makeUnique(); } //< @return false if nothing has changed
-        ExtPType getType() { return type; }
+        ExtPType getType() const { return type; }
         void *getObjectTarget(const char* classname, bool warn = true) const;
         void setInt(paInt v) { if (type != TInt) setri(v); else idata() = v; }