Menu
▾
▴
[Cpptool-cvs] rfta/src/rfta IdentifierResolverTest.cpp,1.8,1.9
|
From: <net...@us...> - 2003-09-15 09:22:09
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv7251/rfta
Modified Files:
IdentifierResolverTest.cpp
Log Message:
-- changed interface for variable declaration
Index: IdentifierResolverTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/IdentifierResolverTest.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IdentifierResolverTest.cpp 6 Sep 2003 21:50:51 -0000 1.8
--- IdentifierResolverTest.cpp 15 Sep 2003 09:22:05 -0000 1.9
***************
*** 79,85 ****
strategy_->setRecordMode();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
! strategy_->declareLocalVariable( getVariableNode( "y.0" ) );
! strategy_->declareLocalVariable( getVariableNode( "z.0" ) );
strategy_->leaveUnnamedSubScope();
--- 79,85 ----
strategy_->setRecordMode();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "x.0" ), IdentifierAttributes::NoAttribute );
! strategy_->declareIdentifier( getVariableNode( "y.0" ), IdentifierAttributes::NoAttribute );
! strategy_->declareIdentifier( getVariableNode( "z.0" ), IdentifierAttributes::NoAttribute );
strategy_->leaveUnnamedSubScope();
***************
*** 98,103 ****
strategy_->setRecordMode();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
! strategy_->declareLocalVariable( getVariableNode( "y.0" ) );
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "x.1" ) );
strategy_->leaveUnnamedSubScope();
--- 98,103 ----
strategy_->setRecordMode();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "x.0" ), IdentifierAttributes::NoAttribute );
! strategy_->declareIdentifier( getVariableNode( "y.0" ), IdentifierAttributes::NoAttribute );
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "x.1" ) );
strategy_->leaveUnnamedSubScope();
***************
*** 138,145 ****
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "y.0" ) );
strategy_->leaveUnnamedSubScope();
--- 138,145 ----
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "x.0" ), IdentifierAttributes::NoAttribute );
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "y.0" ), IdentifierAttributes::NoAttribute );
strategy_->leaveUnnamedSubScope();
***************
*** 163,174 ****
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "y.0" ) );
strategy_->leaveUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "z.0" ) );
strategy_->leaveUnnamedSubScope();
--- 163,174 ----
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "x.0" ), IdentifierAttributes::NoAttribute );
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "y.0" ), IdentifierAttributes::NoAttribute );
strategy_->leaveUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "z.0" ), IdentifierAttributes::NoAttribute );
strategy_->leaveUnnamedSubScope();
***************
*** 190,197 ****
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "c.0" ) );
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "y.0" ) );
strategy_->leaveUnnamedSubScope();
--- 190,197 ----
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "c.0" ), IdentifierAttributes::NoAttribute );
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "y.0" ), IdentifierAttributes::NoAttribute );
strategy_->leaveUnnamedSubScope();
***************
*** 215,224 ****
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "index.0" ) );
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "index.1" ) );
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "index.2" ) );
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
strategy_->leaveUnnamedSubScope();
--- 215,224 ----
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "index.0" ), IdentifierAttributes::NoAttribute );
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "index.1" ) );
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "index.2" ) );
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "x.0" ), IdentifierAttributes::NoAttribute );
strategy_->leaveUnnamedSubScope();
***************
*** 244,248 ****
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "c.0" ) );
strategy_->enterUnnamedSubScope();
--- 244,248 ----
strategy_->enterUnnamedSubScope();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "c.0" ), IdentifierAttributes::NoAttribute );
strategy_->enterUnnamedSubScope();
***************
*** 261,288 ****
IdentifierResolverTest::testClassScope()
{
! builder_->addKeyingMid( "class ", "CL_X", " {", "x.0" );
! builder_->addKeyingMid( "static int ", "c", ";", "c.0" );
! builder_->addKeyingMid( "static int ", "f", "()", "f.0" );
! builder_->addKeyingMid( " { ","c"," = 0; }", "c.2" );
builder_->add( "};" );
! builder_->addKeyingMid( "int ", "X::c", "=0;", "c.1" );
parse((DeclarationListParser*)0);
! strategy_->setRecordMode();
! ASTNodePtr classSpecifier = boost::make_shared(getIdentifierNode( "x.0" )->getParentNode());
! strategy_->declareClass( classSpecifier );
strategy_->enterNamedSubScope("CL_X");
! strategy_->declareLocalVariable( getIdentifierNode( "c.0" ) );
! // TODO: function identifiers not yet implemented
! // strategy_->declareFunctionIdentifier( getIdentifierNode( "f.0" ) );
strategy_->enterUnnamedSubScope();
! strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "c.2" ) );
strategy_->leaveUnnamedSubScope();
- strategy_->leaveNamedSubScope();
- // TODO: global resolver has to check redeclarations !
- strategy_->declareLocalVariable( getIdentifierNode( "c.1" ) );
! checkResolution();
}
--- 261,299 ----
IdentifierResolverTest::testClassScope()
{
! builder_->addKeyingMid( "class ", "CL_X", " {", "CLX.0" ); // 0 11
! builder_->addKeyingMid( "static int ", "sc", ";", "sc.0" ); // 12 25
! builder_->addKeyingMid( "int ", "c", ";", "c.0" ); // 26 32
! builder_->addKeyingMid( "int ", "f", "()", "f.0" );
! builder_->addKeyingMid( " { ","c"," = 0; }", "c.1" );
! builder_->addKeyingMid( "int ","f2","();", "f2.0" );
builder_->add( "};" );
! builder_->addKeyingMid( "int ", "CL_X", "" , "CLX.1" );
! builder_->addKeyingMid( "::" , "sc", "=0;", "sc.1");
! builder_->addKeyingMid( "int ", "CL_X", "" , "CLX.2" );
! builder_->addKeyingMid( "::" , "f2", "()", "f2.1");
! builder_->addKeyingMid( " {" , "c", "=2; }", "c.2");
parse((DeclarationListParser*)0);
! strategy_->setRecordMode();
! strategy_->declareIdentifier( getIdentifierNode( "CLX.0" ), IdentifierAttributes::ClassIdentifier );
strategy_->enterNamedSubScope("CL_X");
! strategy_->declareIdentifier( getIdentifierNode( "sc.0" ), IdentifierAttributes::NoAttribute );
! strategy_->declareIdentifier( getIdentifierNode( "c.0" ), IdentifierAttributes::NoAttribute );
! strategy_->declareIdentifier( getIdentifierNode( "f.0" ), IdentifierAttributes::NoAttribute );
strategy_->enterUnnamedSubScope();
! strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "c.1" ) );
! strategy_->leaveUnnamedSubScope();
! strategy_->declareIdentifier( getIdentifierNode( "f2.0" ), IdentifierAttributes::NoAttribute );
! strategy_->leaveNamedSubScope();
! strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "CLX.1" ));
! strategy_->declareIdentifier( getIdentifierNode( "sc.1" ), IdentifierAttributes::NoAttribute );
! strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "CLX.2" ));
! strategy_->declareIdentifier( getIdentifierNode( "f2.1" ), IdentifierAttributes::NoAttribute );
! strategy_->enterUnnamedSubScope();
! strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "c.2" ) );
strategy_->leaveUnnamedSubScope();
! checkResolution();
}
***************
*** 307,311 ****
strategy_->setRecordMode();
strategy_->enterUnnamedSubScope();
! strategy_->declareLocalVariable( getVariableNode( "bigBuffer.0" ) );
strategy_->enterUnnamedSubScope();
--- 318,322 ----
strategy_->setRecordMode();
strategy_->enterUnnamedSubScope();
! strategy_->declareIdentifier( getVariableNode( "bigBuffer.0" ), IdentifierAttributes::NoAttribute );
strategy_->enterUnnamedSubScope();
|
