ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / common / rbbinode.cpp

diff --git a/icuSources/common/rbbinode.cpp b/icuSources/common/rbbinode.cpp
index 49e0ad3dfa43a8e4bd367be7a0370a6059a084c7..1468be9c10ceef4f60200dbd22d1da948a1ac1c1 100644 (file)
--- a/icuSources/common/rbbinode.cpp
+++ b/icuSources/common/rbbinode.cpp
@@ -1,6 +1,6 @@
 /*
 ***************************************************************************
 /*
 ***************************************************************************

-*   Copyright (C) 2002-2008 International Business Machines Corporation   *
+*   Copyright (C) 2002-2016 International Business Machines Corporation   *

 *   and others. All rights reserved.                                      *
 ***************************************************************************
 */
 *   and others. All rights reserved.                                      *
 ***************************************************************************
 */


@@ -56,6 +56,8 @@ RBBINode::RBBINode(NodeType t) : UMemory() {
     fLastPos      = 0;
     fNullable     = FALSE;
     fLookAheadEnd = FALSE;
     fLastPos      = 0;
     fNullable     = FALSE;
     fLookAheadEnd = FALSE;

+    fRuleRoot     = FALSE;
+    fChainIn      = FALSE;

     fVal          = 0;
     fPrecedence   = precZero;
 
     fVal          = 0;
     fPrecedence   = precZero;
 


@@ -86,6 +88,8 @@ RBBINode::RBBINode(const RBBINode &other) : UMemory(other) {
     fLastPos     = other.fLastPos;
     fNullable    = other.fNullable;
     fVal         = other.fVal;
     fLastPos     = other.fLastPos;
     fNullable    = other.fNullable;
     fVal         = other.fVal;

+    fRuleRoot    = FALSE;
+    fChainIn     = other.fChainIn;

     UErrorCode     status = U_ZERO_ERROR;
     fFirstPosSet = new UVector(status);   // TODO - get a real status from somewhere
     fLastPosSet  = new UVector(status);
     UErrorCode     status = U_ZERO_ERROR;
     fFirstPosSet = new UVector(status);   // TODO - get a real status from somewhere
     fLastPosSet  = new UVector(status);


@@ -161,6 +165,8 @@ RBBINode *RBBINode::cloneTree() {
             }
         }
     }
             }
         }
     }

+    n->fRuleRoot = this->fRuleRoot;
+    n->fChainIn  = this->fChainIn;

     return n;
 }
 
     return n;
 }
 


@@ -272,6 +278,12 @@ void   RBBINode::findNodes(UVector *dest, RBBINode::NodeType kind, UErrorCode &s
 //
 //-------------------------------------------------------------------------
 #ifdef RBBI_DEBUG
 //
 //-------------------------------------------------------------------------
 #ifdef RBBI_DEBUG

+
+static int32_t serial(const RBBINode *node) {
+    return (node == NULL? -1 : node->fSerialNum);
+}
+
+

 void RBBINode::printNode() {
     static const char * const nodeTypeNames[] = {
                 "setRef",
 void RBBINode::printNode() {
     static const char * const nodeTypeNames[] = {
                 "setRef",


@@ -295,9 +307,10 @@ void RBBINode::printNode() {
     if (this==NULL) {
         RBBIDebugPrintf("%10p", (void *)this);
     } else {
     if (this==NULL) {
         RBBIDebugPrintf("%10p", (void *)this);
     } else {

-        RBBIDebugPrintf("%10p  %12s  %10p  %10p  %10p      %4d     %6d   %d ",
-            (void *)this, nodeTypeNames[fType], (void *)fParent, (void *)fLeftChild, (void *)fRightChild,
-            fSerialNum, fFirstPos, fVal);
+        RBBIDebugPrintf("%10p %5d %12s %c%c  %5d       %5d     %5d       %6d     %d ",
+            (void *)this, fSerialNum, nodeTypeNames[fType],   fRuleRoot?'R':' ',  fChainIn?'C':' ',
+             serial(fLeftChild), serial(fRightChild), serial(fParent),
+            fFirstPos, fVal);

         if (fType == varRef) {
             RBBI_DEBUG_printUnicodeString(fText);
         }
         if (fType == varRef) {
             RBBI_DEBUG_printUnicodeString(fText);
         }


@@ -328,11 +341,13 @@ U_CFUNC void RBBI_DEBUG_printUnicodeString(const UnicodeString &s, int minWidth)
 //
 //-------------------------------------------------------------------------
 #ifdef RBBI_DEBUG
 //
 //-------------------------------------------------------------------------
 #ifdef RBBI_DEBUG

+void RBBINode::printNodeHeader() {
+    RBBIDebugPrintf(" Address   serial        type     LeftChild  RightChild   Parent   position value\n");
+}
+    

 void RBBINode::printTree(UBool printHeading) {
     if (printHeading) {
 void RBBINode::printTree(UBool printHeading) {
     if (printHeading) {

-        RBBIDebugPrintf( "-------------------------------------------------------------------\n"
-                         "    Address       type         Parent   LeftChild  RightChild    serial  position value\n"
-              );
+        printNodeHeader();

     }
     this->printNode();
     if (this != NULL) {
     }
     this->printNode();
     if (this != NULL) {