cpptool-cvs

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

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

Modified Files:
	MockIdentifierResolverStrategy.h 
	MockIdentifierResolverStrategy.cpp 
Log Message:
-- changed interface for variable declaration
-- additional declare/resolve calls for class & function declarations

Index: MockIdentifierResolverStrategy.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/MockIdentifierResolverStrategy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockIdentifierResolverStrategy.h	6 Sep 2003 21:48:01 -0000	1.2
--- MockIdentifierResolverStrategy.h	15 Sep 2003 09:22:51 -0000	1.3
***************
*** 32,36 ****
     void leaveUnnamedSubScope();
  
!    void declareLocalVariable( const ASTNodePtr &localVariableDeclNode );
  
     void resolveUnqualifiedIdentifier( const ASTNodePtr &identifierNode );
--- 32,36 ----
     void leaveUnnamedSubScope();
  
!    void declareIdentifier( const ASTNodePtr &identifierDeclNode, const IdentifierAttributes::type attr );
  
     void resolveUnqualifiedIdentifier( const ASTNodePtr &identifierNode );
***************
*** 45,49 ****
  
  private:
!    const std::string nodeToString( const ASTNodePtr &node );
  };
  
--- 45,50 ----
  
  private:
!    static const std::string nodeToString( const ASTNodePtr &node );
!    static const std::string attributeToString( const IdentifierAttributes::type attr );
  };
  

Index: MockIdentifierResolverStrategy.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/MockIdentifierResolverStrategy.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockIdentifierResolverStrategy.cpp	6 Sep 2003 21:48:01 -0000	1.2
--- MockIdentifierResolverStrategy.cpp	15 Sep 2003 09:22:51 -0000	1.3
***************
*** 6,9 ****
--- 6,10 ----
  #include "stdafx.h"
  #include "MockIdentifierResolverStrategy.h"
+ #include <boost/format.hpp>
  
  
***************
*** 38,46 ****
  
  void 
! MockIdentifierResolverStrategy::declareLocalVariable( 
!                                    const ASTNodePtr &localVariableDeclNode )
  {
!    addCall( "MockIdentifierResolverStrategy::declareLocalVariable( "
!             + nodeToString( localVariableDeclNode ) + ")" );
  }
  
--- 39,48 ----
  
  void 
! MockIdentifierResolverStrategy::declareIdentifier( 
!                                    const ASTNodePtr &identifierDeclNode,
!                                    const IdentifierAttributes::type attr)
  {
!    addCall( "MockIdentifierResolverStrategy::declareIdentifier( "
!             + nodeToString( identifierDeclNode ) + "," + attributeToString(attr) + ")" );
  }
  
***************
*** 79,82 ****
--- 81,108 ----
     addCall( "MockIdentifierResolverStrategy::removeScopeLookup( "
              + qualifiedName + ")" );
+ }
+ 
+ const std::string
+ MockIdentifierResolverStrategy::attributeToString( const IdentifierAttributes::type attr )
+ {
+    switch (attr)
+    {
+    case IdentifierAttributes::NoAttribute:
+       return "NoAttribute";
+    case IdentifierAttributes::ClassIdentifier:
+       return "ClassIdentifier";
+    case IdentifierAttributes::EnumIdentifier:
+       return "EnumIdentifier";
+    case IdentifierAttributes::UnionIdentifier:
+       return "UnionIdentifier";
+    case IdentifierAttributes::StructIdentifier:
+       return "StructIdentifier";
+    case IdentifierAttributes::NamespaceIdentifier:
+       return "NamespaceIdentifier";
+    default:
+       int i = (int)attr;
+       boost::format frmt( "IdentifierAttributes::value=%1%");
+       return (frmt % i).str();
+    }
  }