Changeset 412 in dev
- Timestamp:
- Mar 3, 2008, 10:11:34 PM (17 years ago)
- Location:
- trunk/abdev
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abdev/BasicCompiler32/NumOpe.cpp
r403 r412 407 407 408 408 if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){ 409 if( compiler.pCompilingClass == NULL ) 410 { 411 SetError(142,NULL,cp); 412 return false; 413 } 414 409 415 //Thisオブジェクト 410 416 resultType.SetType( DEF_OBJECT, compiler.pCompilingClass ); -
trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp
r402 r412 438 438 439 439 if(lstrcmpi(termFull,"This")==0){ 440 if( compiler.pCompilingClass == NULL ) 441 { 442 return false; 443 } 444 440 445 //Thisオブジェクト 441 446 resultType.SetType( DEF_OBJECT, compiler.pCompilingClass ); -
trunk/abdev/BasicCompiler_Common/error.cpp
r409 r412 213 213 if(num==140) lstrcpy(msg,"Align修飾子を構造体以外の型に指定することはできません。"); 214 214 if(num==141) lstrcpy(msg,"Blittable修飾子をクラス以外の型に指定することはできません。"); 215 if(num==142) lstrcpy(msg,"不正なThis参照です。"); 215 216 216 217 //Enum関連 -
trunk/abdev/BasicCompiler_Common/include/Class.h
r409 r412 564 564 std::string GetStaticDefiningStringAsMemberNames() const; 565 565 std::string GetStaticDefiningStringAsMemberTypeInfoNames() const; 566 std::string GetStaticDefiningStringAsMemberOffsets() const; 566 567 567 568 -
trunk/abdev/BasicCompiler_Common/src/Class.cpp
r409 r412 1382 1382 sprintf( 1383 1383 temporary, 1384 "tempType.SetMembers([%s],[%s], %d)",1384 "tempType.SetMembers([%s],[%s],[%s],%d)", 1385 1385 objClass.GetStaticDefiningStringAsMemberNames().c_str(), 1386 1386 objClass.GetStaticDefiningStringAsMemberTypeInfoNames().c_str(), 1387 objClass.GetStaticDefiningStringAsMemberOffsets().c_str(), 1387 1388 objClass.GetDynamicMembers().size() 1388 1389 ); … … 1555 1556 return result; 1556 1557 } 1557 1558 std::string CClass::GetStaticDefiningStringAsMemberOffsets() const 1559 { 1560 std::string result; 1561 1562 BOOST_FOREACH( const CMember *pMember, dynamicMembers ) 1563 { 1564 if( result.size() ) 1565 { 1566 result += ","; 1567 } 1568 1569 int offset = this->GetMemberOffset( pMember->GetName().c_str() ); 1570 1571 char temporary[255]; 1572 itoa( offset, temporary, 16 ); 1573 1574 result += (std::string)"&H" + temporary; 1575 } 1576 1577 return result; 1578 }
Note:
See TracChangeset
for help on using the changeset viewer.