cpptool-cvs

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

Update of /cvsroot/cpptool/rfta/include/rfta/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv10947/include/rfta/parser

Modified Files:
	ASTNodeForward.h CPPParser.h SourceASTNode.h 
Log Message:
-- integrated preprocessor (replaced all NonSemanticBlanker)

Index: ASTNodeForward.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/parser/ASTNodeForward.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ASTNodeForward.h	22 Dec 2002 16:03:50 -0000	1.2
--- ASTNodeForward.h	13 Jan 2004 22:30:44 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
  class ASTNodeVisitor;
  class SourceASTNode;
+ class Source;
  
  typedef boost::shared_ptr<ASTNode> ASTNodePtr;
***************
*** 25,28 ****
--- 26,31 ----
  typedef boost::shared_ptr<SourceASTNode> SourceASTNodePtr;
  typedef boost::weak_ptr<SourceASTNode> SourceASTNodeWeakPtr;
+ typedef boost::weak_ptr<Source> SourceWeakPtr;
+ typedef boost::shared_ptr<Source> SourcePtr;
  
  } // namespace Refactoring

Index: CPPParser.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/parser/CPPParser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CPPParser.h	29 Apr 2003 22:00:50 -0000	1.3
--- CPPParser.h	13 Jan 2004 22:30:44 -0000	1.4
***************
*** 28,31 ****
--- 28,34 ----
     void parseAll();
  
+    int getPreProcessedPosition(int ofs);
+    SourceRange getPreProcessedRange(SourceRange orignal);
+ 
  private:
     ASTNodePtr findFunctionImplementationAt( int position, 
***************
*** 34,37 ****
--- 37,41 ----
  private:
     SourceASTNodePtr sourceNode_;
+    SourcePtr sourceDoc_;
  };
  

Index: SourceASTNode.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/parser/SourceASTNode.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SourceASTNode.h	4 May 2003 07:34:06 -0000	1.9
--- SourceASTNode.h	13 Jan 2004 22:30:44 -0000	1.10
***************
*** 24,28 ****
      */
     static SourceASTNodePtr create( const std::string &blankedSource,
!                                    const std::string &realSource );
     
     /// Destructor.
--- 24,29 ----
      */
     static SourceASTNodePtr create( const std::string &blankedSource,
!                                    const std::string &realSource,
!                                    const SourcePtr sourceDoc );
     
     /// Destructor.
***************
*** 41,52 ****
     Xtl::CStringView getOriginalSource() const;
  
  
  protected:
     /*! Constructs a SourceASTNode object.
-     * \exception std::invalid_argument if blankedSource & realSource lengths are
-     *            not equal.
      */
     SourceASTNode( const std::string &blankedSource,
!                   const std::string &realSource );
     
  private:
--- 42,54 ----
     Xtl::CStringView getOriginalSource() const;
  
+    SourcePtr getSource() const;
+ 
  
  protected:
     /*! Constructs a SourceASTNode object.
      */
     SourceASTNode( const std::string &blankedSource,
!                   const std::string &realSource,
!                   const SourcePtr sourceDoc );
     
  private:
***************
*** 54,57 ****
--- 56,60 ----
     const std::string realSource_;
     const char *blankedSourceStart_;
+    const SourcePtr sourceDoc_;  // Source Container
  };