Changeset 228
- Timestamp:
- 04/24/14 23:57:44 (10 years ago)
- Location:
- cpp/frams
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/genetics/defgenoconv.cpp
r197 r228 31 31 #include "f7/conv_f7.h" 32 32 #endif 33 #ifdef USE_GENCONV_f81 33 #ifdef USE_GENCONV_f81 34 34 #include "f8/conv_f8tof1.h" 35 35 #endif … … 68 68 #endif 69 69 #ifdef USE_GENCONV_f81 70 addConverter(new GenoConv_ f8ToF1());70 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 :/ 71 71 #endif 72 72 #ifdef USE_GENCONV_f90 -
cpp/frams/util/extvalue.cpp
r222 r228 222 222 /////////////////////////////////////// 223 223 224 SString ExtValue::typeDescription() const 225 { 226 switch(type) 227 { 228 case TInt: return SString("integer value"); 229 case TDouble: return SString("floating point value"); 230 case TString: return SString("text string"); 231 case TUnknown: return SString("null value"); 232 case TInvalid: return SString("invalid value"); 233 case TObj: return getObject().isEmpty()?SString("null"):(SString(getObject().interfaceName())+" object"); 234 } 235 return SString::empty(); 236 } 237 224 238 void *ExtValue::getObjectTarget(const char* classname,bool warn) const 225 239 { … … 360 374 vec->data+=d; 361 375 } 362 } 363 } 376 return; 377 } 378 } 379 //NO break; 380 case TUnknown: 381 case TInvalid: 382 FMprintf("ExtValue","operator+=",FMLV_WARN,"Can't add %s to %s",(const char*)src.typeDescription(),(const char*)typeDescription()); 364 383 default:; 365 384 } … … 372 391 case TInt: idata()-=src.getInt(); break; 373 392 case TDouble: ddata()-=src.getDouble(); break; 393 case TString: case TObj: case TUnknown: case TInvalid: 394 FMprintf("ExtValue","operator-=",FMLV_WARN,"Can't subtract %s from %s",(const char*)src.typeDescription(),(const char*)typeDescription()); 395 break; 374 396 default:; 375 397 } … … 408 430 } 409 431 } 410 } 432 return; 433 } 434 } 435 //NO break; 436 case TUnknown: case TInvalid: 437 FMprintf("ExtValue","operator*=",FMLV_WARN,"Can't multiply %s by %s",(const char*)typeDescription(),(const char*)src.typeDescription()); 411 438 break; 412 }413 439 default:; 414 440 } … … 463 489 break; 464 490 491 case TString: case TObj: case TUnknown: case TInvalid: 492 FMprintf("ExtValue","operator/=",FMLV_WARN,"Can't divide %s by %s",(const char*)typeDescription(),(const char*)src.typeDescription()); 493 break; 494 465 495 default:; 466 496 } … … 563 593 } 564 594 break; 595 596 case TObj: case TUnknown: case TInvalid: 597 FMprintf("ExtValue","operator%=",FMLV_WARN,"Can't apply modulo to %s",(const char*)typeDescription()); 565 598 566 599 default:; -
cpp/frams/util/extvalue.h
r222 r228 157 157 ExtObject getObject() const; 158 158 bool isNull() const {return (type==TUnknown)||((type==TObj)&&odata().isEmpty());} 159 SString typeDescription() const;//< @return human readable type name (used in error messages) 159 160 const char* parseNumber(const char* in); 160 161 const char* deserialize(const char* in);//< @return first character after the succesfully parsed string or NULL if failed
Note: See TracChangeset
for help on using the changeset viewer.