[Cpptool-cvs] rfta/include/rfta/refactoring CodeModel.h,1.2,1.3 CodeModelExpressions.h,1.10,1.11 CodeModelForward.h,1.10,1.11

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

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

Modified Files:
	CodeModel.h CodeModelExpressions.h CodeModelForward.h 
Log Message:
* adding a separator between variable declaration.

Index: CodeModel.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/CodeModel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CodeModel.h	16 Mar 2003 13:44:24 -0000	1.2
--- CodeModel.h	24 Mar 2003 07:57:49 -0000	1.3
***************
*** 55,59 ****
     void setElementSource( Element &element, const ASTNodePtr &node );
  
!    const std::string getDeclaratorPrimaryType( const ASTNodePtr &declaratorNode );
     const Declarator makeVariableDeclarator( const ASTNodePtr &variableDeclaratorNode );
     ExpressionPtr makeVariableInitializerExpression( const ASTNodePtr &initializerNode );
--- 55,59 ----
     void setElementSource( Element &element, const ASTNodePtr &node );
  
!    TypePartPtr getDeclaratorPrimaryType( const ASTNodePtr &declaratorNode );
     const Declarator makeVariableDeclarator( const ASTNodePtr &variableDeclaratorNode );
     ExpressionPtr makeVariableInitializerExpression( const ASTNodePtr &initializerNode );

Index: CodeModelExpressions.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/CodeModelExpressions.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CodeModelExpressions.h	16 Mar 2003 16:18:39 -0000	1.10
--- CodeModelExpressions.h	24 Mar 2003 07:57:49 -0000	1.11
***************
*** 50,60 ****
  };
  
  class DeclaratorExpression : public Expression
  {
  public:
!    DeclaratorExpression( const std::string primaryType );
  
-    std::string getPrimaryType() const;
-    void setPrimaryType( const std::string &primaryType );
  
     int getDeclaratorCount() const;
--- 50,77 ----
  };
  
+ 
+ class TypePart : public Element
+ {
+ public:
+    TypePart( const std::string &typePart = "" );
+ 
+    std::string getTypeText() const;
+ 
+ private:
+    std::string typePart_;
+ };
+ 
+ 
  class DeclaratorExpression : public Expression
  {
  public:
!    DeclaratorExpression( const TypePartPtr &primaryType );
! 
!    TypePartPtr getPrimaryType() const;
! 
!    void setPrimaryType( const TypePartPtr &primaryType );
! 
!    Change getPrimaryTypeChange() const;
  
  
     int getDeclaratorCount() const;
***************
*** 72,76 ****
     typedef std::vector<Declarator> Declarators;
     Declarators declarators_;
!    std::string primaryType_;
  };
  
--- 89,93 ----
     typedef std::vector<Declarator> Declarators;
     Declarators declarators_;
!    ChangeTracker<TypePartPtr> primaryTypeTracker_;
  };
  

Index: CodeModelForward.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/CodeModelForward.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CodeModelForward.h	21 Mar 2003 07:32:25 -0000	1.10
--- CodeModelForward.h	24 Mar 2003 07:57:49 -0000	1.11
***************
*** 15,18 ****
--- 15,19 ----
  class Element;
  class Label;
+ class TypePart;
  
  class BreakStatement;
***************
*** 53,56 ****
--- 54,58 ----
  typedef boost::shared_ptr<Element> ElementPtr;
  typedef boost::shared_ptr<Label> LabelPtr;
+ typedef boost::shared_ptr<TypePart> TypePartPtr;
  typedef boost::shared_ptr<DeclaratorExpression> DeclaratorExpressionPtr;
  typedef boost::shared_ptr<Expression> ExpressionPtr;