[Cpptool-cvs] rfta/src/rftaparser UnparsedDeclarationMutatorTest.cpp,1.1,1.2 UnparsedDeclarationMutator.cpp,1.1,1.2

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

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

Modified Files:
	UnparsedDeclarationMutatorTest.cpp 
	UnparsedDeclarationMutator.cpp 
Log Message:
-- code refactoring (keystring)

Index: UnparsedDeclarationMutatorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/UnparsedDeclarationMutatorTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UnparsedDeclarationMutatorTest.cpp	26 Apr 2003 11:06:25 -0000	1.1
--- UnparsedDeclarationMutatorTest.cpp	28 Apr 2003 02:45:42 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
  #include "UnparsedDeclarationMutator.h"
  #include "UnparsedDeclarationMutatorTest.h"
+ #include "KeyedString.h"
  #include <rfta/parser/ASTNode.h>
  #include <rfta/parser/ASTNodes.h>
***************
*** 20,23 ****
--- 21,26 ----
  RFTAPARSER_TEST_SUITE_REGISTRATION( UnparsedDeclarationMutatorTest );
[...1021 lines suppressed...]
! {  
!    Testing::KeyedString source;
!    source.addKeyed(SPECIFIER , "struct c { int a; }" ) << " ";
!    source.addKeyed(SPECIFIER , "typedef" ) << " ";   
!    source.addKeyed(DECLARATOR, "* mystruct" ) << ";";         
     
     SourceASTNodePtr sourceAST = RFTA_ASSERT_DECLARATION_MUTATOR_PASS( source );
***************
*** 835,839 ****
  
     // check AST:
!    RFTA_ASSERT_DECLARATION(source,sourceAST,specStart,specLen,declStart,declLen);   
  
     // check declarator types:
--- 709,713 ----
  
     // check AST:
!    RFTA_ASSERT_DECLARATION( source, sourceAST );
  
     // check declarator types:

Index: UnparsedDeclarationMutator.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/UnparsedDeclarationMutator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UnparsedDeclarationMutator.cpp	26 Apr 2003 11:06:26 -0000	1.1
--- UnparsedDeclarationMutator.cpp	28 Apr 2003 02:45:42 -0000	1.2
***************
*** 857,863 ****
  
        // skip over the type-specifier and ptr-operator elements
!       readUntilNextOf("(");
!       if ( !tryReadNext("()") ) 
!          throwFailure( "Expect '()' after a conversion function operator" );
     }
  
--- 857,861 ----
  
        // skip over the type-specifier and ptr-operator elements
!       readUntilNextOf("(");      
     }