Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv13033/src/rfta
Modified Files:
CodeModel.cpp CodeModelExpressions.cpp CodeRewriter.cpp
Log Message:
* declarator are stored using smart pointer in declarator expression (more robust)
Index: CodeModel.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeModel.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CodeModel.cpp 24 Mar 2003 07:57:51 -0000 1.9
--- CodeModel.cpp 6 Apr 2003 07:42:16 -0000 1.10
***************
*** 318,322 ****
for ( int index = 0; index < expression->getChildCount(); ++index )
{
! const Declarator &declarator =
makeVariableDeclarator( expression->getChildAt( index ) );
--- 318,322 ----
for ( int index = 0; index < expression->getChildCount(); ++index )
{
! DeclaratorPtr declarator =
makeVariableDeclarator( expression->getChildAt( index ) );
***************
*** 340,344 ****
! const Declarator
Generator::makeVariableDeclarator( const ASTNodePtr &node )
{
--- 340,344 ----
! DeclaratorPtr
Generator::makeVariableDeclarator( const ASTNodePtr &node )
{
***************
*** 359,366 ****
node->getProperty( ASTNodeProperties::variableInitializerProperty );
if ( !initializerNode )
! return Declarator( type, name, typeSuffix );
ExpressionPtr initializer = makeVariableInitializerExpression( initializerNode );
! return Declarator( type, name, typeSuffix, initializer );
}
--- 359,366 ----
node->getProperty( ASTNodeProperties::variableInitializerProperty );
if ( !initializerNode )
! return DeclaratorPtr( new Declarator( type, name, typeSuffix ) );
ExpressionPtr initializer = makeVariableInitializerExpression( initializerNode );
! return DeclaratorPtr( new Declarator( type, name, typeSuffix, initializer ) );
}
Index: CodeModelExpressions.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeModelExpressions.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CodeModelExpressions.cpp 6 Apr 2003 07:20:23 -0000 1.11
--- CodeModelExpressions.cpp 6 Apr 2003 07:42:16 -0000 1.12
***************
*** 107,118 ****
! Declarator &
! DeclaratorExpression::getDeclaratorAt( int index )
! {
! return declarators_.at( index );
! }
!
!
! const Declarator &
DeclaratorExpression::getDeclaratorAt( int index ) const
{
--- 107,111 ----
! DeclaratorPtr
DeclaratorExpression::getDeclaratorAt( int index ) const
{
***************
*** 123,127 ****
void
DeclaratorExpression::insertDeclaratorAt( int index,
! const Declarator &declarator )
{
declarators_.insert( declarators_.begin() + index, declarator );
--- 116,120 ----
void
DeclaratorExpression::insertDeclaratorAt( int index,
! const DeclaratorPtr &declarator )
{
declarators_.insert( declarators_.begin() + index, declarator );
***************
*** 130,134 ****
void
! DeclaratorExpression::appendDeclarator( const Declarator &declarator )
{
declarators_.push_back( declarator );
--- 123,127 ----
void
! DeclaratorExpression::appendDeclarator( const DeclaratorPtr &declarator )
{
declarators_.push_back( declarator );
Index: CodeRewriter.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeRewriter.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** CodeRewriter.cpp 6 Apr 2003 07:20:23 -0000 1.35
--- CodeRewriter.cpp 6 Apr 2003 07:42:16 -0000 1.36
***************
*** 349,356 ****
insertText( declarators->getPrimaryType()->getTypeText() );
! const Declarator &declarator = declarators->getDeclaratorAt(0);
! insertText( declarator.getType() );
! insertText( declarator.getName() );
! insertText( declarator.getTypeSuffix() );
endInsertNewStatement();
--- 349,356 ----
insertText( declarators->getPrimaryType()->getTypeText() );
! DeclaratorPtr declarator = declarators->getDeclaratorAt(0);
! insertText( declarator->getType() );
! insertText( declarator->getName() );
! insertText( declarator->getTypeSuffix() );
endInsertNewStatement();
|
