[Cpptool-cvs] rfta/src/rftaparser ASTNode.cpp,1.12,1.13 SourceASTNode.cpp,1.6,1.7

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

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

Modified Files:
	ASTNode.cpp SourceASTNode.cpp 
Log Message:
* deprecated old constructo and now using a SourceRange object to specify the node range.

Index: ASTNode.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/ASTNode.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ASTNode.cpp	22 Dec 2002 16:03:53 -0000	1.12
--- ASTNode.cpp	25 Dec 2002 22:39:02 -0000	1.13
***************
*** 25,33 ****
  ASTNode::create( const ASTNodeType &type,
                   const ASTNodeWeakPtr &parentNode,
!                  int startIndex,
!                  int length,
                   const SourceASTNodeWeakPtr &sourceNode )
  {
!    ASTNodePtr node( new ASTNode( type, parentNode, startIndex, length ) );
     node->setSourceNode( sourceNode );
  
--- 25,32 ----
  ASTNode::create( const ASTNodeType &type,
                   const ASTNodeWeakPtr &parentNode,
!                  const SourceRange &sourceRange,
                   const SourceASTNodeWeakPtr &sourceNode )
  {
!    ASTNodePtr node( new ASTNode( type, parentNode, sourceRange ) );
     node->setSourceNode( sourceNode );
  
***************
*** 36,46 ****
  
  
  ASTNode::ASTNode( const ASTNodeType &type,
                    const ASTNodeWeakPtr &parentNode,
!                   int startIndex,
!                   int length )
     : parentNode_( parentNode )
     , type_( type )
!    , range_( startIndex, length )
  {
  }
--- 35,58 ----
  
  
+ ASTNodePtr 
+ ASTNode::create( const ASTNodeType &type,
+                  const ASTNodeWeakPtr &parentNode,
+                  int startIndex,
+                  int length,
+                  const SourceASTNodeWeakPtr &sourceNode )
+ {
+    return create( type, 
+                   parentNode, 
+                   SourceRange( startIndex, length), 
+                   sourceNode );
+ }
+ 
+ 
  ASTNode::ASTNode( const ASTNodeType &type,
                    const ASTNodeWeakPtr &parentNode,
!                   const SourceRange &sourceRange )
     : parentNode_( parentNode )
     , type_( type )
!    , range_( sourceRange )
  {
  }

Index: SourceASTNode.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/SourceASTNode.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SourceASTNode.cpp	22 Dec 2002 16:03:53 -0000	1.6
--- SourceASTNode.cpp	25 Dec 2002 22:39:02 -0000	1.7
***************
*** 30,35 ****
     : ASTNode( ASTNodeTypes::source,
                ASTNodeWeakPtr(),
!               0,
!               blankedSource.length() )
     , blankedSource_( blankedSource )
     , realSource_( realSource )
--- 30,34 ----
     : ASTNode( ASTNodeTypes::source,
                ASTNodeWeakPtr(),
!               SourceRange( 0, blankedSource.length() ) )
     , blankedSource_( blankedSource )
     , realSource_( realSource )