[Cpptool-cvs] CppParser/examples/parser cpp_grammar.txt,1.5,1.6 cppparsertest.cpp,1.5,1.6

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

Update of /cvsroot/cpptool/CppParser/examples/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32609/examples/parser

Modified Files:
	cpp_grammar.txt cppparsertest.cpp 
Log Message:
* refactoring occurence of cv_qualifiers_seq workaround_type_specifier cv_qualifiers_seq to type_specifier.

Index: cpp_grammar.txt
===================================================================
RCS file: /cvsroot/cpptool/CppParser/examples/parser/cpp_grammar.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cpp_grammar.txt	19 Jun 2004 14:53:07 -0000	1.5
--- cpp_grammar.txt	19 Jun 2004 14:55:52 -0000	1.6
***************
*** 590,595 ****
  
  # fixed bug: added support for pointer return types
! function_return_type = ?(cv_qualifier_seq) workaround_type_specifier 
!                         ?(cv_qualifier_seq)
                          ?( :node( 'ptr_operator_declarator', +( ptr_operator ) ) );
  
--- 590,594 ----
  
  # fixed bug: added support for pointer return types
! function_return_type = type_specifier 
                          ?( :node( 'ptr_operator_declarator', +( ptr_operator ) ) );
  

Index: cppparsertest.cpp
===================================================================
RCS file: /cvsroot/cpptool/CppParser/examples/parser/cppparsertest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cppparsertest.cpp	19 Jun 2004 14:51:22 -0000	1.5
--- cppparsertest.cpp	19 Jun 2004 14:55:52 -0000	1.6
***************
*** 983,991 ****
  {
     CPPPARSER_ASSERT_TREE( "void initialize(){}", "function_definition",
!                            testNode( "function_definition",
!                                        testNode( "function_return_type", fundamentalTypeNode("void") ),
!                                        declaratorIdNode( "initialize", 1 ),
!                                        testNode( "function_parameters", "(", ")" ),
!                                        jokerNode( "compound_statement" ) ) );
     CPPPARSER_ASSERT_MATCH( "void initialize() {}", "function_definition" );
     CPPPARSER_ASSERT_MATCH( "void initialize() const volatile {}", "function_definition" );
--- 983,992 ----
  {
     CPPPARSER_ASSERT_TREE( "void initialize(){}", "function_definition",
!       testNode( "function_definition",
!                   testNode( "function_return_type", 
!                      testNode( "type_specifier", fundamentalTypeNode("void") ) ),
!                   declaratorIdNode( "initialize", 1 ),
!                   testNode( "function_parameters", "(", ")" ),
!                   jokerNode( "compound_statement" ) ) );
     CPPPARSER_ASSERT_MATCH( "void initialize() {}", "function_definition" );
     CPPPARSER_ASSERT_MATCH( "void initialize() const volatile {}", "function_definition" );