[Cpptool-cvs] rfta/src/rftaparser DeclarationParserTest.h,1.1,1.2 DeclarationParserTest.cpp,1.3,1.4 DeclarationParser.cpp,1.3,1.4

[<net...@us...>]

Update of /cvsroot/cpptool/rfta/src/rftaparser
In directory sc8-pr-cvs1:/tmp/cvs-serv20361/src/rftaparser

Modified Files:
	DeclarationParserTest.h DeclarationParserTest.cpp 
	DeclarationParser.cpp 
Log Message:
-- removed parsing of "typedef" within this context (moved to unparsed-declaration-mutator)

Index: DeclarationParserTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/DeclarationParserTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeclarationParserTest.h	12 Apr 2003 19:08:40 -0000	1.1
--- DeclarationParserTest.h	26 Apr 2003 10:50:16 -0000	1.2
***************
*** 20,24 ****
     CPPUNIT_TEST( testNamespaceParse );   
     CPPUNIT_TEST( testUsingNamespace );
-    CPPUNIT_TEST( testGlobalTypedef  );
     CPPUNIT_TEST( testLongUsingNamespace );
     CPPUNIT_TEST( testNamespaceAlias );
--- 20,23 ----
***************
*** 46,50 ****
     void testNamespaceParse();
     void testUsingNamespace();
-    void testGlobalTypedef();
     void testLongUsingNamespace();
     void testNamespaceAlias();
--- 45,48 ----

Index: DeclarationParserTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/DeclarationParserTest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DeclarationParserTest.cpp	15 Apr 2003 19:05:18 -0000	1.3
--- DeclarationParserTest.cpp	26 Apr 2003 10:50:17 -0000	1.4
***************
*** 116,134 ****
  
  void 
- DeclarationParserTest::testGlobalTypedef()
- {
-    const std::string source( " typedef struct x { int a; } x__;  " );
-    int startIndex = 1;
-    int endIndex = 33;
-    SourceASTNodePtr sourceAST = RFTA_ASSERT_PARSER_PASS( DeclarationParser,
-                                                          source,
-                                                          source.length()-2 );
-    RFTA_ASSERT_NODE_HAS( sourceAST->getChildAt(0),
-                          ASTNodeTypes::typedefStatement,
-                          startIndex,
-                          endIndex-startIndex );
- }
- 
- void 
  DeclarationParserTest::testSimpleLinkage()
  {
--- 116,119 ----

Index: DeclarationParser.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/DeclarationParser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DeclarationParser.cpp	15 Apr 2003 19:05:17 -0000	1.3
--- DeclarationParser.cpp	26 Apr 2003 10:50:17 -0000	1.4
***************
*** 157,169 ****
           current_ = parser.getCurrent();
           return true;
!       }
!       else if ( "typedef"          == identifier )
!       {
!          // call typedef parser
!          TypeDeclarationStatementParser parser( context_, start , end_ );            
!          parser.parse(current_);
!          current_ = parser.getCurrent();
!          return true;
!       }
        else if ( "namespace"        == identifier )
        {
--- 157,161 ----
           current_ = parser.getCurrent();
           return true;
!       }      
        else if ( "namespace"        == identifier )
        {