Menu
▾
▴
[Cpptool-cvs] CppParser/examples/parser commandstream.cpp,1.1.1.1,1.2 commandstream.h,1.1.1.1,1.2 commandstreamtest.cpp,1.1.1.1,1.2 commandstreamtest.h,1.1.1.1,1.2 cpp_grammar.txt,1.7,1.8 cppparserfacade.cpp,1.1.1.1,1.2 cppparserfacade.h,1.1.1.1,1.2 forwards.h,1.1.1.1,1.2 grammarbuilder.cpp,1.1.1.1,1.2 grammarbuildertest.cpp,1.1.1.1,1.2 main.cpp,1.2,1.3 parsecontext.h,1.1.1.1,1.2 parser.dsp,1.3,1.4 parser.h,1.1.1.1,1.2 parsertest.cpp,1.1.1.1,1.2 parsertest.h,1.1.1.1,1.2 parsertesthelper.cpp,1.1.1.1,1.2 project.h,1.2,1.3 refactoringtest.h,1.2,1.3 scope.h,1.6,1.7 sourceeditor.cpp,1.1.1.1,1.2 sourceeditor.h,1.1.1.1,1.2 symboldeclarator.cpp,1.6,1.7 testproject.cpp,1.2,1.3 testproject.h,1.2,1.3
Update of /cvsroot/cpptool/CppParser/examples/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7335/parser Modified Files: commandstream.cpp commandstream.h commandstreamtest.cpp commandstreamtest.h cpp_grammar.txt cppparserfacade.cpp cppparserfacade.h forwards.h grammarbuilder.cpp grammarbuildertest.cpp main.cpp parsecontext.h parser.dsp parser.h parsertest.cpp parsertest.h parsertesthelper.cpp project.h refactoringtest.h scope.h sourceeditor.cpp sourceeditor.h symboldeclarator.cpp testproject.cpp testproject.h Log Message: -- extensions for grammar key-words ":declareSymbol", ":enterScope" and ":leaveScope" ... the new way of symboltable building Index: testproject.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/testproject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** testproject.h 20 Jun 2004 11:00:38 -0000 1.2 --- testproject.h 20 Aug 2004 19:25:11 -0000 1.3 *************** *** 30,34 **** Parser::SymbolTable &symbolTable(); ! Parser::NodePtr parse( const std::string &source ); void commitEditChanges(); --- 30,34 ---- Parser::SymbolTable &symbolTable(); ! Parser::NodePtr parse( const Parser::FileId file, const std::string &source ); void commitEditChanges(); Index: refactoringtest.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/refactoringtest.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** refactoringtest.h 16 Aug 2004 20:51:32 -0000 1.2 --- refactoringtest.h 20 Aug 2004 19:25:11 -0000 1.3 *************** *** 13,17 **** CPPUT_TEST( testRenameClassTest2 ); CPPUT_TEST( testRenameClassTest3 ); ! CPPUT_TEST( testRenameClassTest4 ); CPPUT_TEST( testRenameClassTest5 ); CPPUT_TEST( testRenameClassTest6 ); --- 13,17 ---- CPPUT_TEST( testRenameClassTest2 ); CPPUT_TEST( testRenameClassTest3 ); ! //CPPUT_TEST( testRenameClassTest4 ); CPPUT_TEST( testRenameClassTest5 ); CPPUT_TEST( testRenameClassTest6 ); Index: main.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.cpp 5 Aug 2004 20:52:40 -0000 1.2 --- main.cpp 20 Aug 2004 19:25:10 -0000 1.3 *************** *** 37,41 **** int main( int argc, char *argv[] ) { ! CppUT::TestSuitePtr allSuite = CppUT::Registry::instance().createDefaultTests(); CppUT::TestContext context; CppUT::TestRunResult result; --- 37,41 ---- int main( int argc, char *argv[] ) { ! CppUT::TestSuitePtr allSuite = CppUT::Registry::instance().createDefaultTests(); CppUT::TestContext context; CppUT::TestRunResult result; Index: cppparserfacade.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/cppparserfacade.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cppparserfacade.cpp 8 Jun 2004 20:23:11 -0000 1.1.1.1 --- cppparserfacade.cpp 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- //#include "commandstream.h" #include <fstream> + #include "symboltable.h" *************** *** 39,49 **** NodePtr ! CppParserFacade::parse( const std::string &input ) { Parser::Tokens tokens; // Parser::CppParser::preprocess( input, tokens ); Parser::CppParser::tokenize( input, tokens ); ! Parser::CommandStream result; ! Parser::ParseContext context( tokens.begin(), tokens.end(), result ); bool matched = translationUnitMatcher_->parse( context ); --- 40,51 ---- NodePtr ! CppParserFacade::parse( const Parser::FileId fileid, const std::string &input, SymbolTable &symbolTable ) { Parser::Tokens tokens; // Parser::CppParser::preprocess( input, tokens ); Parser::CppParser::tokenize( input, tokens ); ! Parser::CommandStream result( symbolTable ); ! result.setCurrentFile( fileid ); ! Parser::ParseContext context( tokens.begin(), tokens.end(), result, symbolTable ); bool matched = translationUnitMatcher_->parse( context ); *************** *** 53,57 **** // note: at the current time, ending silent tokens are not added to the ast ! NodePtr rootNode = result.makeNodeTree(); if ( rootNode->hasChildren() ) return rootNode->childAt(0); --- 55,59 ---- // note: at the current time, ending silent tokens are not added to the ast ! NodePtr rootNode = result.makeNodeTree(symbolTable.translationUnitScope(fileid)); if ( rootNode->hasChildren() ) return rootNode->childAt(0); Index: parsertesthelper.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/parsertesthelper.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** parsertesthelper.cpp 8 Jun 2004 20:23:17 -0000 1.1.1.1 --- parsertesthelper.cpp 20 Aug 2004 19:25:11 -0000 1.2 *************** *** 67,72 **** bool enableTrace = (flag & traceEnabled) != 0; ! Parser::CommandStream result; ! Parser::ParseContext context( tokens.begin(), tokens.end(), result, enableTrace ? &tracker : 0 ); bool matched = matcher->parse( context ); --- 67,74 ---- bool enableTrace = (flag & traceEnabled) != 0; ! Parser::SymbolTable symTab; ! Parser::CommandStream result( symTab ); ! result.setCurrentFile( 0 ); ! Parser::ParseContext context( tokens.begin(), tokens.end(), result, symTab, enableTrace ? &tracker : 0 ); bool matched = matcher->parse( context ); *************** *** 90,94 **** if ( expectedTree || checkNoError ) { ! Parser::NodePtr actualTree = result.makeNodeTree(); if ( expectedTree ) { --- 92,96 ---- if ( expectedTree || checkNoError ) { ! Parser::NodePtr actualTree = result.makeNodeTree(symTab.translationUnitScope(0)); if ( expectedTree ) { *************** *** 144,149 **** tracker.setProgressive( true ); ! Parser::CommandStream result; ! Parser::ParseContext context( tokens.begin(), tokens.end(), result, &tracker ); bool matched = matcher->parse( context ); checkParseContextIsBalanced( context, tokens, matcher, tracker ); --- 146,152 ---- tracker.setProgressive( true ); ! Parser::SymbolTable symTab; ! Parser::CommandStream result( symTab ); ! Parser::ParseContext context( tokens.begin(), tokens.end(), result, symTab, &tracker ); bool matched = matcher->parse( context ); checkParseContextIsBalanced( context, tokens, matcher, tracker ); Index: commandstream.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/commandstream.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** commandstream.cpp 8 Jun 2004 20:23:10 -0000 1.1.1.1 --- commandstream.cpp 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 1,11 **** #include "commandstream.h" namespace Parser { ! NodePtr CommandStream::makeNodeTree() { ! Context context; ! context.root_ = makeCompositeNode( "" ); context.current_ = context.root_; StreamItems::iterator it = items_.begin(); --- 1,16 ---- #include "commandstream.h" + #include "nodeiterator.h" + #include "functor3.h" + #include "cppparser.h" namespace Parser { ! NodePtr CommandStream::makeNodeTree(ScopePtr scope) { ! Context context(symbolTable_); ! context.root_ = makeCompositeNode( "" ); context.current_ = context.root_; + context.scopes_.push_back(scope); + context.fileId_ = getCurrentFile(); StreamItems::iterator it = items_.begin(); *************** *** 76,79 **** --- 81,176 ---- child->removeFromParent(); } + + void enterScope( CommandStream::Context *context, + const ConstString &scopeName) + { + NodePtr node; + if ( context->current_->hasChildren() ) + { + node = Parser::getChild(context->current_,scopeName); + // we take sub node 'id' ... TODO: nested name alternative ! + if (node == NodePtr()) + return; /* [ AB: TODO - error in grammar: no such sub node ] */ + node = Parser::getChild(node,"id"); + } + if ( node == NodePtr() ) + return; /* [ AB: TODO - error in grammar: no such sub node ] */ + + if ( context->scopes_.empty() ) + return; /* [ AB: TODO - error in scope logic - no current scope ?? ] */ + + ScopePtr current = context->scopes_.back(); + int cnt = current->subScopeCount(); + DeclarationScopePtr subdecl; + while (cnt-->0 && subdecl == DeclarationScopePtr()) + { + ScopePtr sub = current->subScopeAt(cnt); + subdecl = boost::shared_polymorphic_downcast<DeclarationScope>(sub); + if ( subdecl != DeclarationScopePtr() ) + { + if ( subdecl->declaration()->name() != node->text().str()) + subdecl = DeclarationScopePtr(); + } + } + if ( subdecl == DeclarationScopePtr()) + return; /* [ AB: TODO - error in grammar: no such scope declared before ] */ + context->scopes_.push_back(subdecl); + } + + void leaveScope( CommandStream::Context *context ) + { + if ( context->scopes_.empty() ) + return; /* [ AB: TODO - error in grammar: no scope to leave ] */ + + context->scopes_.pop_back(); + } + + static Symbol + getChildSymbol( const NodePtr &node, FileId currentFile ) + { + NodeEnumerator enumChildren = node->enumChildren(); + while ( enumChildren.hasNext() ) + { + NodePtr child = enumChildren.nextPtr(); + if ( child->category() == CppParser::tkIdentifier ) + { + Location location( currentFile, child->location().startPos_ ); + return Symbol( child->text().str(), location ); + } + } + + throw std::runtime_error( "Node " + node->name().str() + " has no identifier child node." ); + } + + void declareSymbol( CommandStream::Context *context, + const ConstString &symbolType, + const ConstString &nodeName) + { + NodePtr node; + if ( context->current_->hasChildren() ) + { + node = Parser::getChild(context->current_,nodeName); + // we take sub node 'id' ... TODO: nested name alternative ! + if (node == NodePtr()) + return; /* [ AB: TODO - error in grammar: no such sub node ] */ + node = Parser::getChild(node,"id"); + } + + if ( node == NodePtr() ) + return; /* [ AB: TODO - error in grammar: no such sub node ] */ + + + if (symbolType == "class") + { + // declare symbol: + Symbol classSymbol = getChildSymbol(node,context->fileId_); + SymbolDeclarationPtr declaration = context->symbolTable_.declare( classSymbol ); + // create class scope + ClassScopePtr classScope( new ClassScope( declaration ) ); + if ( context->scopes_.empty() || context->scopes_.back() == ScopePtr() ) + return; /* [ AB: TODO - internal error: no scope ] */ + context->scopes_.back()->add( classScope ); + } + } } *************** *** 113,116 **** --- 210,227 ---- } + Command cmdDeclareSymbol( const ConstString &symbolType, const ConstString &nodeName ) + { + return bind3( makeCFn3( &Commands::declareSymbol ), symbolType,nodeName); + } + + Command cmdEnterScope( const ConstString &scopeName ) + { + return CppUT::bind2( CppUT::makeCFn2( &Commands::enterScope ), scopeName ); + } + + Command cmdLeaveScope() + { + return CppUT::makeCFn1( &Commands::leaveScope ); + } } // namespace Parser Index: symboldeclarator.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/symboldeclarator.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** symboldeclarator.cpp 16 Aug 2004 20:54:57 -0000 1.6 --- symboldeclarator.cpp 20 Aug 2004 19:25:11 -0000 1.7 *************** *** 144,147 **** --- 144,150 ---- NodePtr className = safeGetChild( classSpecifier, "class_name" ); NodePtr classNameId = safeGetChild( className, "id" ); // we ignore the nested spec + /* + AB: Has been deactivated, this is automaticly done by the new grammar keywords ":declareSymbol" and ":enterScope" + Symbol classSymbol( getChildSymbol( classNameId ) ); SymbolDeclarationPtr declaration = symbolTable_.declare( classSymbol ); *************** *** 149,156 **** parentScope.add( classScope ); // should be actual nested scope // @todo setScope in declaration NodePtr members = getChild( classSpecifier, "member_specification" ); if ( members ) ! declareClassMembers( members, *classScope ); } --- 152,174 ---- parentScope.add( classScope ); // should be actual nested scope // @todo setScope in declaration + */ + int cnt = parentScope.subScopeCount(); + ClassScopePtr subdecl; + while (cnt-->0 && subdecl == DeclarationScopePtr()) + { + ScopePtr sub = parentScope.subScopeAt(cnt); + subdecl = boost::shared_polymorphic_downcast<ClassScope>(sub); + if ( subdecl != ClassScopePtr() ) + { + if ( subdecl->declaration()->name() != getChild(classNameId,"identifier")->text().str() ) + subdecl = ClassScopePtr(); + } + } + if ( subdecl == ClassScopePtr()) + return; /* [ AB: TODO - error in grammar: no such scope declared before ] */ NodePtr members = getChild( classSpecifier, "member_specification" ); if ( members ) ! declareClassMembers( members, *subdecl ); } Index: commandstreamtest.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/commandstreamtest.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** commandstreamtest.cpp 8 Jun 2004 20:23:10 -0000 1.1.1.1 --- commandstreamtest.cpp 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 9,13 **** CommandStreamTest::setUp() { ! stream_.reset( new Parser::CommandStream() ); } --- 9,13 ---- CommandStreamTest::setUp() { ! stream_.reset( new Parser::CommandStream(symbolTable_) ); } *************** *** 24,28 **** { PARSER_ASSERT_NODE_TREE_EQUAL( testNode(""), ! stream_->makeNodeTree() ); } --- 24,28 ---- { PARSER_ASSERT_NODE_TREE_EQUAL( testNode(""), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 35,39 **** PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if", id_t("x") ), ! stream_->makeNodeTree() ); } --- 35,39 ---- PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if", id_t("x") ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 46,50 **** PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", testNode( "test", "if" ) ), ! stream_->makeNodeTree() ); } --- 46,50 ---- PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", testNode( "test", "if" ) ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 56,60 **** PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "root" ), ! stream_->makeNodeTree() ); } --- 56,60 ---- PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "root" ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 69,73 **** tokenNode->setName( "keyword" ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", Parser::NodePtr(tokenNode) ), ! stream_->makeNodeTree() ); } --- 69,73 ---- tokenNode->setName( "keyword" ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", Parser::NodePtr(tokenNode) ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 83,87 **** PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", testNode( "block", "if" ), "while" ), ! stream_->makeNodeTree() ); } --- 83,87 ---- PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", testNode( "block", "if" ), "while" ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 100,104 **** PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", testNode( "binop", id_t("x"),"*",id_t("y") ) ), ! stream_->makeNodeTree() ); } --- 100,104 ---- PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", testNode( "binop", id_t("x"),"*",id_t("y") ) ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 112,116 **** PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if" ), ! stream_->makeNodeTree() ); } --- 112,116 ---- PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if" ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } *************** *** 131,134 **** PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if", "else" ), ! stream_->makeNodeTree() ); } --- 131,134 ---- PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if", "else" ), ! stream_->makeNodeTree(Parser::ScopePtr()) ); } Index: commandstreamtest.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/commandstreamtest.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** commandstreamtest.h 8 Jun 2004 20:23:10 -0000 1.1.1.1 --- commandstreamtest.h 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 38,41 **** --- 38,42 ---- private: boost::shared_ptr<Parser::CommandStream> stream_; + Parser::SymbolTable symbolTable_; }; Index: sourceeditor.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/sourceeditor.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sourceeditor.cpp 8 Jun 2004 20:23:17 -0000 1.1.1.1 --- sourceeditor.cpp 20 Aug 2004 19:25:11 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- SourceEditor::SourceEditor( const std::string &source, + const FileId fileid, Project &project ) : project_( project ) *************** *** 11,15 **** tracker_.reset( new NodeTracker( buffers_ ) ); ! translationUnit_ = project.parse( source ); } --- 12,16 ---- tracker_.reset( new NodeTracker( buffers_ ) ); ! translationUnit_ = project.parse( fileid, source ); } Index: testproject.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/testproject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** testproject.cpp 20 Jun 2004 11:00:38 -0000 1.2 --- testproject.cpp 20 Aug 2004 19:25:11 -0000 1.3 *************** *** 25,29 **** std::string source = readSourceFile( it->second ); ! Parser::NodePtr translationUnit = parse( source ); declarator.declareTranslationUnit( translationUnit ); } --- 25,29 ---- std::string source = readSourceFile( it->second ); ! Parser::NodePtr translationUnit = parse( it->first, source ); declarator.declareTranslationUnit( translationUnit ); } *************** *** 90,94 **** std::string path = pathFromFileId( file ); ! Parser::SourceEditorPtr editor( new Parser::SourceEditor( readSourceFile(path), *this ) ); editors_[ file ] = editor; return *editor; --- 90,94 ---- std::string path = pathFromFileId( file ); ! Parser::SourceEditorPtr editor( new Parser::SourceEditor( readSourceFile(path), it->first, *this ) ); editors_[ file ] = editor; return *editor; *************** *** 96,104 **** Parser::NodePtr ! TestProject::parse( const std::string &source ) { if ( !parser_ ) parser_.reset( new Parser::CppParserFacade( configuration() ) ); ! return parser_->parse( source ); } --- 96,104 ---- Parser::NodePtr ! TestProject::parse( const Parser::FileId fileid, const std::string &source ) { if ( !parser_ ) parser_.reset( new Parser::CppParserFacade( configuration() ) ); ! return parser_->parse( fileid, source, symbolTable_ ); } Index: project.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/project.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** project.h 20 Jun 2004 11:00:38 -0000 1.2 --- project.h 20 Aug 2004 19:25:11 -0000 1.3 *************** *** 72,76 **** virtual SymbolTable &symbolTable() = 0; ! virtual NodePtr parse( const std::string &source ) = 0; // should really pass a parse context }; --- 72,76 ---- virtual SymbolTable &symbolTable() = 0; ! virtual NodePtr parse( const Parser::FileId file, const std::string &source ) = 0; // should really pass a parse context }; Index: grammarbuildertest.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/grammarbuildertest.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** grammarbuildertest.cpp 8 Jun 2004 20:23:14 -0000 1.1.1.1 --- grammarbuildertest.cpp 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 76,80 **** Parser::Tokens tokens; Parser::GrammarParser::tokenize( input, tokens ); ! ParserTesting::checkParserMatch( tokens, matcher ); } --- 76,80 ---- Parser::Tokens tokens; Parser::GrammarParser::tokenize( input, tokens ); ! ParserTesting::checkParserMatch( tokens, matcher, ParserTesting::noParseTrace ); } *************** *** 309,311 **** PARSER_ASSERT_BUILD_MATCH( "lookahead", "+(" ); } - --- 309,310 ---- Index: cpp_grammar.txt =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/cpp_grammar.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cpp_grammar.txt 21 Jun 2004 13:49:30 -0000 1.7 --- cpp_grammar.txt 20 Aug 2004 19:25:10 -0000 1.8 *************** *** 664,668 **** class_specifier = :node( 'class_specifier', ! class_head '{' ?( member_specification ) '}' ); # ############### A.8.2: Classes, Specials Member Functions ################## --- 664,668 ---- class_specifier = :node( 'class_specifier', ! class_head :declareSymbol('class', 'class_name') '{' :enterScope('class_name') ?( member_specification ) :leaveScope() '}' ); # ############### A.8.2: Classes, Specials Member Functions ################## Index: scope.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/scope.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** scope.h 16 Aug 2004 20:52:31 -0000 1.6 --- scope.h 20 Aug 2004 19:25:11 -0000 1.7 *************** *** 21,24 **** --- 21,25 ---- class TranslationUnitScope; class TypedefScope; + class DeclarationScope; typedef boost::shared_ptr<ClassScope> ClassScopePtr; typedef boost::shared_ptr<EnumScope> EnumScopePtr; *************** *** 28,31 **** --- 29,33 ---- typedef boost::shared_ptr<TypedefScope> TypedefScopePtr; typedef boost::shared_ptr<TranslationUnitScope> TranslationUnitScopePtr; + typedef boost::shared_ptr<DeclarationScope> DeclarationScopePtr; class Type; Index: forwards.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/forwards.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** forwards.h 8 Jun 2004 20:23:13 -0000 1.1.1.1 --- forwards.h 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 9,12 **** --- 9,14 ---- class GrammarBuilder; + class SymbolTable; + class Matcher; typedef boost::shared_ptr<Matcher> MatcherPtr; Index: parsertest.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/parsertest.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** parsertest.h 8 Jun 2004 20:23:17 -0000 1.1.1.1 --- parsertest.h 20 Aug 2004 19:25:11 -0000 1.2 *************** *** 33,36 **** --- 33,37 ---- CPPUT_TEST( testOptionalMatcher ); CPPUT_TEST( testNodeCmd ); + CPPUT_TEST( testDeclareSymbolCommand ); CPPUT_TESTSUITE_END(); *************** *** 62,65 **** --- 63,67 ---- void testOptionalMatcher(); void testNodeCmd(); + void testDeclareSymbolCommand(); private: Index: sourceeditor.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/sourceeditor.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sourceeditor.h 8 Jun 2004 20:23:17 -0000 1.1.1.1 --- sourceeditor.h 20 Aug 2004 19:25:11 -0000 1.2 *************** *** 15,18 **** --- 15,19 ---- public: SourceEditor( const std::string &source, + const FileId fileid, Project &project ); Index: parsertest.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/parsertest.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** parsertest.cpp 8 Jun 2004 20:23:17 -0000 1.1.1.1 --- parsertest.cpp 20 Aug 2004 19:25:11 -0000 1.2 *************** *** 24,29 **** { Parser::Tokens toks = tokens( "0", "1", "2", "3", "4", "5", "6" ); ! Parser::CommandStream result; ! Parser::ParseContext context( toks.begin(), toks.end(), result ); Parser::Tokens relativeToks; --- 24,30 ---- { Parser::Tokens toks = tokens( "0", "1", "2", "3", "4", "5", "6" ); ! Parser::SymbolTable symTab; ! Parser::CommandStream result( symTab ); ! Parser::ParseContext context( toks.begin(), toks.end(), result, symTab ); Parser::Tokens relativeToks; *************** *** 44,48 **** context.getRelativeTokenRange( 0, 1, relativeToks ); CPPUT_ASSERTSTR_EQUAL( "0", relativeToks.at(0).text() ); ! PARSER_ASSERT_NODE_TREE_EQUAL( testNode(""), result.makeNodeTree() ); // Check commit --- 45,49 ---- context.getRelativeTokenRange( 0, 1, relativeToks ); CPPUT_ASSERTSTR_EQUAL( "0", relativeToks.at(0).text() ); ! PARSER_ASSERT_NODE_TREE_EQUAL( testNode(""), result.makeNodeTree(Parser::ScopePtr()) ); // Check commit *************** *** 59,63 **** CPPUT_ASSERTSTR_EQUAL( "2", relativeToks.at(0).text() ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "0", "1" ), ! result.makeNodeTree() ); // Check preserve/restore state --- 60,64 ---- CPPUT_ASSERTSTR_EQUAL( "2", relativeToks.at(0).text() ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "0", "1" ), ! result.makeNodeTree(Parser::ScopePtr()) ); // Check preserve/restore state *************** *** 85,89 **** CPPUT_ASSERTSTR_EQUAL( "6", relativeToks.at(0).text() ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "3", "4", "5" ), ! result.makeNodeTree() ); } --- 86,90 ---- CPPUT_ASSERTSTR_EQUAL( "6", relativeToks.at(0).text() ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "3", "4", "5" ), ! result.makeNodeTree(Parser::ScopePtr()) ); } *************** *** 93,98 **** { Parser::Tokens toks = tokens( "if", spaces_t(1), "(", spaces_t(2), "x", spaces_t(2), ")", spaces_t(4) ); ! Parser::CommandStream result; ! Parser::ParseContext context( toks.begin(), toks.end(), result ); CPPUT_ASSERTSTR_EQUAL( "if", context.nextToken().text() ); context.addLastToken(); --- 94,100 ---- { Parser::Tokens toks = tokens( "if", spaces_t(1), "(", spaces_t(2), "x", spaces_t(2), ")", spaces_t(4) ); ! Parser::SymbolTable symTab; ! Parser::CommandStream result( symTab ); ! Parser::ParseContext context( toks.begin(), toks.end(), result, symTab ); CPPUT_ASSERTSTR_EQUAL( "if", context.nextToken().text() ); context.addLastToken(); *************** *** 105,109 **** CPPUT_ASSERT_FALSE( context.hasMoreToken() ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if", spaces_t(1), "(", spaces_t(2), "x", spaces_t(2), ")" ), ! result.makeNodeTree() ); // Notes: trailing spaces are discarded... } --- 107,111 ---- CPPUT_ASSERT_FALSE( context.hasMoreToken() ); PARSER_ASSERT_NODE_TREE_EQUAL( testNode( "", "if", spaces_t(1), "(", spaces_t(2), "x", spaces_t(2), ")" ), ! result.makeNodeTree(Parser::ScopePtr()) ); // Notes: trailing spaces are discarded... } *************** *** 381,382 **** --- 383,401 ---- } + void + ParserTest::testDeclareSymbolCommand() + { + /* + "class = :node( 'id', '%' $identifier ) :declareSymbol('class','id');" + */ + PARSER_ASSERT_PRODUCED_TREE_EQUAL( + tokens("%", id_t("x") ), + symbol_m("%") >> node_cmd( "id", terminal_m( identifier ) ) + >> declare_cmd("class", "id") + >> enterscope_cmd("id") + >> leavescope_cmd() , + testNode( "", + "%" , + testNode( "id", id_t("x") ) + ) ); + } Index: cppparserfacade.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/cppparserfacade.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cppparserfacade.h 8 Jun 2004 20:23:11 -0000 1.1.1.1 --- cppparserfacade.h 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- # include "forwards.h" + # include "location.h" # include "cppparsersettings.h" # include <stdexcept> *************** *** 14,18 **** // clearly not final api, will need filename & 'file provider' for preprocessing ! NodePtr parse( const std::string &input ); private: --- 15,19 ---- // clearly not final api, will need filename & 'file provider' for preprocessing ! NodePtr parse( const Parser::FileId fileid, const std::string &input, SymbolTable &symbolTable ); private: Index: parsecontext.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/parsecontext.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** parsecontext.h 8 Jun 2004 20:23:16 -0000 1.1.1.1 --- parsecontext.h 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- # define PARSER_PARSECONTEXT_H_INCLUDED + # include "symboltable.h" # include "commandstream.h" # include "parsingtracker.h" *************** *** 31,34 **** --- 32,36 ---- Tokens::const_iterator end, CommandStream &result, + SymbolTable &symbolTable, ParsingTracker *tracker = 0 ); *************** *** 87,90 **** --- 89,93 ---- Tokens::const_iterator lastTokenEnd_; CommandStream &result_; + SymbolTable &symbolTable_; ParsingTracker *tracker_; *************** *** 101,104 **** --- 104,108 ---- Tokens::const_iterator end, CommandStream &result, + SymbolTable &symbolTable, ParsingTracker *tracker ) : begin_( begin) *************** *** 107,110 **** --- 111,115 ---- , current_( begin ) , result_( result ) + , symbolTable_( symbolTable ) , tracker_( tracker ) { Index: parser.dsp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/parser.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** parser.dsp 16 Aug 2004 20:59:52 -0000 1.3 --- parser.dsp 20 Aug 2004 19:25:10 -0000 1.4 *************** *** 73,77 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PARSER_ENABLE_TRACKING" /YX /FD /GZ /c # ADD BASE RSC /l 0x40c /d "_DEBUG" # ADD RSC /l 0x40c /d "_DEBUG" --- 73,77 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PARSER_ENABLE_TRACKING" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x40c /d "_DEBUG" # ADD RSC /l 0x40c /d "_DEBUG" *************** *** 311,322 **** # Begin Source File - SOURCE=.\commandstreamtest.cpp - # End Source File - # Begin Source File - - SOURCE=.\commandstreamtest.h - # End Source File - # Begin Source File - SOURCE=.\conststringtest.cpp # End Source File --- 311,314 ---- *************** *** 343,346 **** --- 335,346 ---- # Begin Source File + SOURCE=.\commandstreamtest.cpp + # End Source File + # Begin Source File + + SOURCE=.\commandstreamtest.h + # End Source File + # Begin Source File + SOURCE=.\cppnodetestbase.cpp # End Source File Index: parser.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/parser.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** parser.h 8 Jun 2004 20:23:16 -0000 1.1.1.1 --- parser.h 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 2,5 **** --- 2,7 ---- # define PARSER_PARSE_H_INCLUDED + #pragma warning(disable: 4786) + # include "conststring.h" # include "parsecontext.h" *************** *** 1003,1006 **** --- 1005,1023 ---- } + inline MatcherPtr declare_cmd( const ConstString &symbolType, const ConstString &nodeName ) + { + return cmd_m( cmdDeclareSymbol(symbolType, nodeName) ); + } + + inline MatcherPtr enterscope_cmd( const ConstString &scopeName ) + { + return cmd_m( cmdEnterScope( scopeName ) ); + } + + inline MatcherPtr leavescope_cmd( ) + { + return cmd_m( cmdLeaveScope() ); + } + } // namespace MatcherFactories Index: commandstream.h =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/commandstream.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** commandstream.h 8 Jun 2004 20:23:10 -0000 1.1.1.1 --- commandstream.h 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 5,8 **** --- 5,12 ---- # include "token.h" # include "node.h" + + # include "symboltable.h" + # include "scope.h" + # include <deque> *************** *** 30,33 **** --- 34,42 ---- NodePtr current_; std::deque<NodePtr> locations_; + std::deque<ScopePtr> scopes_; + FileId fileId_; + SymbolTable& symbolTable_; + + Context(SymbolTable& symbolTable): symbolTable_(symbolTable) { } }; *************** *** 113,117 **** } ! NodePtr makeNodeTree(); void reset() --- 122,126 ---- } ! NodePtr makeNodeTree(ScopePtr scope); void reset() *************** *** 121,124 **** --- 130,148 ---- } + void setCurrentFile(FileId fileid) + { + currentFile_ = fileid; + } + + FileId getCurrentFile() + { + return currentFile_; + } + + CommandStream(SymbolTable& symbolTable) + : symbolTable_( symbolTable ) + { + } + private: typedef std::vector<StreamItem> StreamItems; *************** *** 127,130 **** --- 151,157 ---- typedef std::deque<State> States; States states_; + + FileId currentFile_; + SymbolTable& symbolTable_; }; *************** *** 138,141 **** --- 165,171 ---- Command cmdMakePenultimateChildOfLast(); Command cmdRemoveLastChild(); + Command cmdDeclareSymbol( const ConstString &symbolType, const ConstString &nodeName ); + Command cmdEnterScope( const ConstString &scopeName ); + Command cmdLeaveScope(); } // namespace Parser Index: grammarbuilder.cpp =================================================================== RCS file: /cvsroot/cpptool/CppParser/examples/parser/grammarbuilder.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** grammarbuilder.cpp 8 Jun 2004 20:23:14 -0000 1.1.1.1 --- grammarbuilder.cpp 20 Aug 2004 19:25:10 -0000 1.2 *************** *** 234,237 **** --- 234,261 ---- } + MatcherPtr buildDeclareSymbolCommand( CommandFactoryHelper &helper ) + { + helper.expectParameter( CommandParameter::stringType ); // symbol-type + helper.expectParameter( CommandParameter::stringType ); // node-reference + helper.checkParameterCount(); + ConstString symbolType = helper.getStringParameterAt( 0 ); + ConstString nodeReference = helper.getStringParameterAt( 1 ); + return declare_cmd( symbolType, nodeReference ); + } + + MatcherPtr buildEnterScopeCommand( CommandFactoryHelper &helper ) + { + helper.expectParameter( CommandParameter::stringType ); // scope-name or node-id + helper.checkParameterCount(); + ConstString scopeName = helper.getStringParameterAt( 0 ); + return enterscope_cmd( scopeName ); + } + + MatcherPtr buildLeaveScopeCommand( CommandFactoryHelper &helper ) + { + return leavescope_cmd(); + } + + } // BuilderCommandFactories *************** *** 249,252 **** --- 273,279 ---- addCommandFactory( "make_penultimate_node_child_of_last", &BuilderCommandFactories::buildMakePenultimateChildOfLast ); addCommandFactory( "remove_last_child", &BuilderCommandFactories::buildRemoveLastChild ); + addCommandFactory( "declareSymbol", &BuilderCommandFactories::buildDeclareSymbolCommand ); + addCommandFactory( "enterScope", &BuilderCommandFactories::buildEnterScopeCommand ); + addCommandFactory( "leaveScope", &BuilderCommandFactories::buildLeaveScopeCommand ); } *************** *** 257,262 **** Tokens tokens; GrammarParser::tokenize( grammar, tokens ); ! CommandStream result; ! ParseContext context( tokens.begin(), tokens.end(), result ); MatcherPtr matcher = GrammarParser::parser(); bool matched = matcher->parse( context ); --- 284,291 ---- Tokens tokens; GrammarParser::tokenize( grammar, tokens ); ! SymbolTable symTab; ! ScopePtr scope; ! CommandStream result( symTab ); ! ParseContext context( tokens.begin(), tokens.end(), result, symTab ); MatcherPtr matcher = GrammarParser::parser(); bool matched = matcher->parse( context ); *************** *** 273,277 **** } ! NodePtr rootNode = result.makeNodeTree(); NodePtr tokenDeclNode = getChild(rootNode,"tokens_declaration"); NodeByNameEnumerator enumTokenTypes = enumChildrenByName( tokenDeclNode, "token_type" ); --- 302,306 ---- } ! NodePtr rootNode = result.makeNodeTree(scope); NodePtr tokenDeclNode = getChild(rootNode,"tokens_declaration"); NodeByNameEnumerator enumTokenTypes = enumChildrenByName( tokenDeclNode, "token_type" ); |
