[Cpptool-cvs] rfta/src/rftaparser DeclarationListParser.cpp,1.4,1.5

[<bl...@us...>]

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

Modified Files:
	DeclarationListParser.cpp 
Log Message:
* fixed typo in keyword 'signals'
* refactored a bit

Index: DeclarationListParser.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/DeclarationListParser.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DeclarationListParser.cpp	28 Apr 2003 20:41:15 -0000	1.4
--- DeclarationListParser.cpp	29 Apr 2003 22:06:57 -0000	1.5
***************
*** 35,39 ****
   * unlike compound statement we seperate the file into ast nodes
   * as we understand the syntax now.
!  */
  bool 
  DeclarationListParser::tryParse()
--- 35,39 ----
   * unlike compound statement we seperate the file into ast nodes
   * as we understand the syntax now.
! */
  bool 
  DeclarationListParser::tryParse()
***************
*** 46,64 ****
     keywords.insert( "private" );
     keywords.insert( "protected" );
!    keywords.insert( "signal" );
  
     do {
        skipSpaces();
-       if (!hasNext()) break;
  
!       Xtl::CStringEnumerator en(Xtl::CStringView( current_, end_ ).enumerate() );
!       std::string ident;
  
!       ident = ParserTools::tryReadKeyword(en,keywords);
!       if (!ident.empty())
        {         
!          ParserTools::skipUntil(en,':');
           // @todo: store information on visibility
!          current_ = en.getCurrentPos();
           skipSpaces();
        }
--- 46,64 ----
     keywords.insert( "private" );
     keywords.insert( "protected" );
!    keywords.insert( "signals" );
  
     do {
        skipSpaces();
  
!       if ( !hasNext() ) 
!          break;
  
!       Xtl::CStringEnumerator current(Xtl::CStringView( current_, end_ ).enumerate() );
!       std::string keyword = ParserTools::tryReadKeyword(current,keywords);
!       if (!keyword.empty())
        {         
!          ParserTools::skipUntil(current,':');
           // @todo: store information on visibility
!          current_ = current.getCurrentPos();
           skipSpaces();
        }