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

Timestamp:

03/12/15 04:21:46 (10 years ago)

Author:

Maciej Komosinski

Message:

New math operator semantics: extend mixed int/float to float, forbid number+notnumber

File:

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

cpp/frams/util/extvalue.h

@@ -140 +140 @@
         enum CompareResult
         {
-         ResultLower=-1, ResultEqual=0, ResultHigher=1,
-         ResultEqualUnordered,
-         ResultUnequal_RelaxedEqual,
-         ResultUnequal_RelaxedUnequal,
-         ResultMismatch_RelaxedUnequal,
-         ResultMismatch
+                ResultLower = -1, ResultEqual = 0, ResultHigher = 1,
+                ResultEqualUnordered,
+                ResultUnequal_RelaxedEqual,
+                ResultUnequal_RelaxedUnequal,
+                ResultMismatch_RelaxedUnequal,
+                ResultMismatch
         };
         // performs all script value comparisons.
@@ -152 +152 @@
         CompareResult compare(const ExtValue& src) const;
 
-        enum CmpOperator { CmpFIRST,CmpEQ=CmpFIRST,CmpNE,CmpGE,CmpLE,CmpGT,CmpLT,/*relaxed (not)equal*/CmpREQ,CmpRNE };
+        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;
+        struct CmpContext { const ExtValue *v1, *v2; };
         // 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);
+        static int interpretCompare(CmpOperator op, CompareResult result, CmpContext *context = NULL);
+
+        void divInt(paInt a);
+        void divDouble(double a);
 
         int operator==(const ExtValue& src) const;
@@ -197 +197 @@
         bool isNull() const { return (type == TUnknown) || ((type == TObj) && odata().isEmpty()); }
         SString typeDescription() const;//< @return human readable type name (used in error messages)
+        SString typeAndValue() const;//< @return type and value (used in error messages)
         const char* parseNumber(const char* in, ExtPType strict_type = TUnknown);
         const char* deserialize(const char* in);//< @return first character after the succesfully parsed string or NULL if failed