Changeset 228

Timestamp:

04/24/14 23:57:44 (11 years ago)

Author:

Maciej Komosinski

Message:

More warnings for illegal ExtValue? operations: object+-*/%something and similar

Location:

cpp/frams

Files:

• genetics/defgenoconv.cpp (modified) (2 diffs)
• util/extvalue.cpp (modified) (6 diffs)
• util/extvalue.h (modified) (1 diff)

cpp/frams/genetics/defgenoconv.cpp

@@ -31 +31 @@
 #include "f7/conv_f7.h"
 #endif
-#ifdef USE_GENCONV_f81
+#ifdef USE_GENCONV_f81     
 #include "f8/conv_f8tof1.h"
 #endif
@@ -68 +68 @@
 #endif
 #ifdef USE_GENCONV_f81
-        addConverter(new GenoConv_f8ToF1());
+        addConverter(new GenoConv_F8ToF1()); //uncompilable for now... needs lemon, and still borland complains for a hundred of unknown reasons with all kinds of nonsense messages :/
 #endif
 #ifdef USE_GENCONV_f90

cpp/frams/util/extvalue.cpp

@@ -222 +222 @@
 ///////////////////////////////////////
 
+SString ExtValue::typeDescription() const
+{
+switch(type)
+        {
+        case TInt: return SString("integer value");
+        case TDouble: return SString("floating point value");
+        case TString: return SString("text string");
+        case TUnknown: return SString("null value");
+        case TInvalid: return SString("invalid value");
+        case TObj: return getObject().isEmpty()?SString("null"):(SString(getObject().interfaceName())+" object");
+        }
+return SString::empty();
+}
+
 void *ExtValue::getObjectTarget(const char* classname,bool warn) const
 {
@@ -360 +374 @@
                                 vec->data+=d;
                                 }
-                        }
-                }
+                        return;
+                        }
+                }
+                //NO break;
+        case TUnknown:
+        case TInvalid:
+                FMprintf("ExtValue","operator+=",FMLV_WARN,"Can't add %s to %s",(const char*)src.typeDescription(),(const char*)typeDescription());
         default:;
         }
@@ -372 +391 @@
         case TInt: idata()-=src.getInt(); break;
         case TDouble: ddata()-=src.getDouble(); break;
+        case TString: case TObj: case TUnknown: case TInvalid:
+                FMprintf("ExtValue","operator-=",FMLV_WARN,"Can't subtract %s from %s",(const char*)src.typeDescription(),(const char*)typeDescription());
+                break;
         default:;
         }
@@ -408 +430 @@
                                         }
                                 }
-                        }
+                        return;
+                        }
+                }
+                //NO break;
+        case TUnknown: case TInvalid:
+                FMprintf("ExtValue","operator*=",FMLV_WARN,"Can't multiply %s by %s",(const char*)typeDescription(),(const char*)src.typeDescription());
                 break;
-                }
         default:;
         }
@@ -463 +489 @@
                 break;
 
+        case TString: case TObj: case TUnknown: case TInvalid:
+                FMprintf("ExtValue","operator/=",FMLV_WARN,"Can't divide %s by %s",(const char*)typeDescription(),(const char*)src.typeDescription());
+                break;
+
         default:;
         }
@@ -563 +593 @@
         }
         break;
+
+        case TObj: case TUnknown: case TInvalid:
+                FMprintf("ExtValue","operator%=",FMLV_WARN,"Can't apply modulo to %s",(const char*)typeDescription());
 
         default:;

cpp/frams/util/extvalue.h

@@ -157 +157 @@
 ExtObject getObject() const;
 bool isNull() const {return (type==TUnknown)||((type==TObj)&&odata().isEmpty());}
+SString typeDescription() const;//< @return human readable type name (used in error messages)
 const char* parseNumber(const char* in);
 const char* deserialize(const char* in);//< @return first character after the succesfully parsed string or NULL if failed