Changeset 1315
- Timestamp:
- 07/11/24 17:26:06 (3 months ago)
- Location:
- cpp/frams/param
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/param/param.cpp
r1302 r1315 1 1 // This file is a part of Framsticks SDK. http://www.framsticks.com/ 2 // Copyright (C) 1999-202 2Maciej Komosinski and Szymon Ulatowski.2 // Copyright (C) 1999-2024 Maciej Komosinski and Szymon Ulatowski. 3 3 // See LICENSE.txt for details. 4 4 … … 21 21 #define SAVE_SELECTED_NAMES 22 22 #define WARN_MISSING_NAME 23 24 char MakeCodeGuardHappy;25 23 26 24 ParamEntry empty_paramtab[] = … … 559 557 const char* fname = f->VgetPath(); 560 558 if (fname != NULL) 561 559 { 562 560 fileinfo = SString::sprintf(" while reading from '%s'", fname); 563 561 if (options.linenum) 564 562 fileinfo += SString::sprintf(" (line %d)", *options.linenum); 565 563 } 566 564 return fileinfo; 567 565 } … … 613 611 if (seen[i]) 614 612 { 615 SString fileinfo = getFileMessageFor(f, options);613 SString fileinfo = getFileMessageFor(f, options); 616 614 logPrintf("ParamInterface", "load", LOG_WARN, "Multiple '%s.%s' properties found%s", getName(), id(i), fileinfo.c_str()); 617 615 } … … 622 620 if (p0[p_len + 1] == '~') 623 621 { 624 if (p0[p_len +2])622 if (p0[p_len + 2]) 625 623 { 626 SString fileinfo = getFileMessageFor(f, options);627 logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unexpected characters after '~': '%s' in '%s:'%s", p0 +p_len+1, id(i), fileinfo.c_str());624 SString fileinfo = getFileMessageFor(f, options); 625 logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unexpected characters after '~': '%s' in '%s:'%s", p0 + p_len + 1, id(i), fileinfo.c_str()); 628 626 } 629 627 630 628 SString s; 631 629 if (!readUntilTilde(f, s)) … … 939 937 { 940 938 case 'd': t += "integer"; 941 { paInt a, b, c; int n = getMinMaxIntFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %d..%d", a, b); if (n >= 3) t += SString::sprintf(" (default %d)", c); }939 { paInt a, b, c; int n = getMinMaxIntFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %d..%d", a, b); if (n >= 3) t += SString::sprintf(" (default %d)", c); } 942 940 break; 943 941 case 'f': t += "float"; 944 { double a, b, c; int n = getMinMaxDoubleFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %g..%g", a, b); if (n >= 3) t += SString::sprintf(" (default %g)", c); }942 { double a, b, c; int n = getMinMaxDoubleFromTypeDef(type, a, b, c); if ((n >= 2) && (b >= a)) t += SString::sprintf(" %g..%g", a, b); if (n >= 3) t += SString::sprintf(" (default %g)", c); } 945 943 break; 946 944 case 's': t += "string"; 947 { int a, b; SString c; int n = getMinMaxStringFromTypeDef(type, a, b, c); if ((n >= 2) && (b > 0)) t += SString::sprintf(", max %d chars", b); if (n >= 3) t += SString::sprintf(" (default \"%s\")", c.c_str()); }945 { int a, b; SString c; int n = getMinMaxStringFromTypeDef(type, a, b, c); if ((n >= 2) && (b > 0)) t += SString::sprintf(", max %d chars", b); if (n >= 3) t += SString::sprintf(" (default \"%s\")", c.c_str()); } 948 946 break; 949 947 case 'x': t += "untyped value"; break; -
cpp/frams/param/param.h
r1184 r1315 1 1 // This file is a part of Framsticks SDK. http://www.framsticks.com/ 2 // Copyright (C) 1999-202 2Maciej Komosinski and Szymon Ulatowski.2 // Copyright (C) 1999-2024 Maciej Komosinski and Szymon Ulatowski. 3 3 // See LICENSE.txt for details. 4 4 … … 216 216 // implementations: 217 217 218 extern char MakeCodeGuardHappy;219 220 218 #define PROCOFFSET(_proc_) ( (void (*)(void*,ExtValue*,ExtValue*)) &(FIELDSTRUCT :: _proc_ ## _statrick)) 221 219 #define STATICPROCOFFSET(_proc_) ( (void (*)(void*,ExtValue*,ExtValue*)) &(FIELDSTRUCT :: _proc_)) … … 223 221 #define SETOFFSET(_proc_) ( (int (*)(void*,const ExtValue*)) &(FIELDSTRUCT :: _proc_ ## _statrick)) 224 222 225 #define FIELDOFFSET(_fld_) ((intptr_t) ((char*)(&((FIELDSTRUCT*)&MakeCodeGuardHappy)->_fld_)-((char*)((FIELDSTRUCT*)&MakeCodeGuardHappy))))223 #define FIELDOFFSET(_fld_) ((intptr_t)offsetof(FIELDSTRUCT, _fld_)) // https://stackoverflow.com/questions/177885/looking-for-something-similar-to-offsetof-for-non-pod-types , https://stackoverflow.com/questions/713963/why-does-this-implementation-of-offsetof-work 226 224 227 225 #ifdef _DEBUG … … 349 347 350 348 #ifdef CHECK_PARAMENTRY_COUNT 351 349 352 350 template <int COUNT> 353 Param(ParamEntry (&t)[COUNT],void* o = 0, const char*n = 0) :SimpleAbstractParam(o, n), tab(t)351 Param(ParamEntry(&t)[COUNT], void* o = 0, const char*n = 0) :SimpleAbstractParam(o, n), tab(t) 354 352 { 355 if (!n &&tab) myname = tab[0].name;353 if (!n && tab) myname = tab[0].name; 356 354 //printf("Param(ParamEntry t[%d]) %s\n",COUNT,myname?myname:"unknown name"); 357 355 if (tab) 358 359 int in_array = COUNT -1-tab[0].group;356 { 357 int in_array = COUNT - 1 - tab[0].group; 360 358 if (tab[0].flags != in_array) 361 printf("\nCHECK_PARAMENTRY_COUNT: %d items in ParamEntry[] array, declared %d (%s)\n\n", in_array, tab[0].flags, myname?myname:"unknown name");362 if (in_array >0 && tab[COUNT-1].id != NULL) //in_array>0 -> completely empty paramtab can't end with the usual zero row because that's also its first row363 printf("\nCHECK_PARAMENTRY_COUNT: last entry is not null (%s)\n\n", myname?myname:"unknown name");364 359 printf("\nCHECK_PARAMENTRY_COUNT: %d items in ParamEntry[] array, declared %d (%s)\n\n", in_array, tab[0].flags, myname ? myname : "unknown name"); 360 if (in_array > 0 && tab[COUNT - 1].id != NULL) //in_array>0 -> completely empty paramtab can't end with the usual zero row because that's also its first row 361 printf("\nCHECK_PARAMENTRY_COUNT: last entry is not null (%s)\n\n", myname ? myname : "unknown name"); 362 } 365 363 } 366 364 367 template<typename T, typename std::enable_if_t<std::is_same<ParamEntry*, T>::value>* = nullptr > //SFINAE-fu because the normal ParamEntry* overload would be also called for ParamEntry[COUNT] argument365 template<typename T, typename std::enable_if_t<std::is_same<ParamEntry*, T>::value>* = nullptr > //SFINAE-fu because the normal ParamEntry* overload would be also called for ParamEntry[COUNT] argument 368 366 Param(T t, void* o = 0, const char*n = 0) :SimpleAbstractParam(o, n), tab(t) 369 367 { 370 368 //printf("Param(ParamEntry* t) %s\n",tab?tab[0].name:""); 371 if (!n &&tab) myname = tab[0].name;369 if (!n && tab) myname = tab[0].name; 372 370 } 373 371 … … 378 376 379 377 #else // CHECK_PARAMENTRY_COUNT 380 381 Param(ParamEntry *t = 0, void* o = 0, const char*n = 0) : SimpleAbstractParam(o, n), tab(t)378 379 Param(ParamEntry *t = 0, void* o = 0, const char*n = 0) : SimpleAbstractParam(o, n), tab(t) 382 380 { 383 if (!n &&tab) myname = tab[0].name;381 if (!n && tab) myname = tab[0].name; 384 382 } 385 383 386 384 #endif // CHECK_PARAMENTRY_COUNT 387 385 388 386 Param(const Param& p) :SimpleAbstractParam(p.object, p.myname), tab(p.tab) {} 389 387 void operator=(const Param&p) { object = p.object; myname = p.myname; tab = p.tab; }
Note: See TracChangeset
for help on using the changeset viewer.