@@ -7379,101 +7379,119 @@ bool ValueType::fromLibraryType(const std::string &typestr, const Settings &sett
7379
7379
7380
7380
std::string ValueType::dump () const
7381
7381
{
7382
- std::ostringstream ret;
7382
+ std::string ret;
7383
7383
switch (type) {
7384
7384
case UNKNOWN_TYPE:
7385
7385
return " " ;
7386
7386
case NONSTD:
7387
- ret << " valueType-type=\" nonstd\" " ;
7387
+ ret += " valueType-type=\" nonstd\" " ;
7388
7388
break ;
7389
7389
case POD:
7390
- ret << " valueType-type=\" pod\" " ;
7390
+ ret += " valueType-type=\" pod\" " ;
7391
7391
break ;
7392
7392
case RECORD:
7393
- ret << " valueType-type=\" record\" " ;
7393
+ ret += " valueType-type=\" record\" " ;
7394
7394
break ;
7395
7395
case SMART_POINTER:
7396
- ret << " valueType-type=\" smart-pointer\" " ;
7396
+ ret += " valueType-type=\" smart-pointer\" " ;
7397
7397
break ;
7398
- case CONTAINER:
7399
- ret << " valueType-type=\" container\" " ;
7400
- ret << " valueType-containerId=\" " << container << " \" " ;
7398
+ case CONTAINER: {
7399
+ ret += " valueType-type=\" container\" " ;
7400
+ ret += " valueType-containerId=\" " ;
7401
+ ret += ptr_to_string (container);
7402
+ ret += " \" " ;
7401
7403
break ;
7404
+ }
7402
7405
case ITERATOR:
7403
- ret << " valueType-type=\" iterator\" " ;
7406
+ ret += " valueType-type=\" iterator\" " ;
7404
7407
break ;
7405
7408
case VOID:
7406
- ret << " valueType-type=\" void\" " ;
7409
+ ret += " valueType-type=\" void\" " ;
7407
7410
break ;
7408
7411
case BOOL:
7409
- ret << " valueType-type=\" bool\" " ;
7412
+ ret += " valueType-type=\" bool\" " ;
7410
7413
break ;
7411
7414
case CHAR:
7412
- ret << " valueType-type=\" char\" " ;
7415
+ ret += " valueType-type=\" char\" " ;
7413
7416
break ;
7414
7417
case SHORT:
7415
- ret << " valueType-type=\" short\" " ;
7418
+ ret += " valueType-type=\" short\" " ;
7416
7419
break ;
7417
7420
case WCHAR_T:
7418
- ret << " valueType-type=\" wchar_t\" " ;
7421
+ ret += " valueType-type=\" wchar_t\" " ;
7419
7422
break ;
7420
7423
case INT:
7421
- ret << " valueType-type=\" int\" " ;
7424
+ ret += " valueType-type=\" int\" " ;
7422
7425
break ;
7423
7426
case LONG:
7424
- ret << " valueType-type=\" long\" " ;
7427
+ ret += " valueType-type=\" long\" " ;
7425
7428
break ;
7426
7429
case LONGLONG:
7427
- ret << " valueType-type=\" long long\" " ;
7430
+ ret += " valueType-type=\" long long\" " ;
7428
7431
break ;
7429
7432
case UNKNOWN_INT:
7430
- ret << " valueType-type=\" unknown int\" " ;
7433
+ ret += " valueType-type=\" unknown int\" " ;
7431
7434
break ;
7432
7435
case FLOAT:
7433
- ret << " valueType-type=\" float\" " ;
7436
+ ret += " valueType-type=\" float\" " ;
7434
7437
break ;
7435
7438
case DOUBLE:
7436
- ret << " valueType-type=\" double\" " ;
7439
+ ret += " valueType-type=\" double\" " ;
7437
7440
break ;
7438
7441
case LONGDOUBLE:
7439
- ret << " valueType-type=\" long double\" " ;
7442
+ ret += " valueType-type=\" long double\" " ;
7440
7443
break ;
7441
7444
}
7442
7445
7443
7446
switch (sign) {
7444
7447
case Sign::UNKNOWN_SIGN:
7445
7448
break ;
7446
7449
case Sign::SIGNED:
7447
- ret << " valueType-sign=\" signed\" " ;
7450
+ ret += " valueType-sign=\" signed\" " ;
7448
7451
break ;
7449
7452
case Sign::UNSIGNED:
7450
- ret << " valueType-sign=\" unsigned\" " ;
7453
+ ret += " valueType-sign=\" unsigned\" " ;
7451
7454
break ;
7452
7455
}
7453
7456
7454
- if (bits > 0 )
7455
- ret << " valueType-bits=\" " << bits << ' \" ' ;
7457
+ if (bits > 0 ) {
7458
+ ret += " valueType-bits=\" " ;
7459
+ ret += std::to_string (bits);
7460
+ ret += ' \" ' ;
7461
+ }
7456
7462
7457
- if (pointer > 0 )
7458
- ret << " valueType-pointer=\" " << pointer << ' \" ' ;
7463
+ if (pointer > 0 ) {
7464
+ ret += " valueType-pointer=\" " ;
7465
+ ret += std::to_string (pointer);
7466
+ ret += ' \" ' ;
7467
+ }
7459
7468
7460
- if (constness > 0 )
7461
- ret << " valueType-constness=\" " << constness << ' \" ' ;
7469
+ if (constness > 0 ) {
7470
+ ret += " valueType-constness=\" " ;
7471
+ ret += std::to_string (constness);
7472
+ ret += ' \" ' ;
7473
+ }
7462
7474
7463
7475
if (reference == Reference::None)
7464
- ret << " valueType-reference=\" None\" " ;
7476
+ ret += " valueType-reference=\" None\" " ;
7465
7477
else if (reference == Reference::LValue)
7466
- ret << " valueType-reference=\" LValue\" " ;
7478
+ ret += " valueType-reference=\" LValue\" " ;
7467
7479
else if (reference == Reference::RValue)
7468
- ret << " valueType-reference=\" RValue\" " ;
7480
+ ret += " valueType-reference=\" RValue\" " ;
7469
7481
7470
- if (typeScope)
7471
- ret << " valueType-typeScope=\" " << typeScope << ' \" ' ;
7482
+ if (typeScope) {
7483
+ ret += " valueType-typeScope=\" " ;
7484
+ ret += ptr_to_string (typeScope);
7485
+ ret += ' \" ' ;
7486
+ }
7472
7487
7473
- if (!originalTypeName.empty ())
7474
- ret << " valueType-originalTypeName=\" " << ErrorLogger::toxml (originalTypeName) << ' \" ' ;
7488
+ if (!originalTypeName.empty ()) {
7489
+ ret += " valueType-originalTypeName=\" " ;
7490
+ ret += ErrorLogger::toxml (originalTypeName);
7491
+ ret += ' \" ' ;
7492
+ }
7475
7493
7476
- return ret. str () ;
7494
+ return ret;
7477
7495
}
7478
7496
7479
7497
bool ValueType::isConst (nonneg int indirect) const
0 commit comments