ICU-6.2.22.tar.gz

[apple/icu.git] / icuSources / common / rbbitblb.h

diff --git a/icuSources/common/rbbitblb.h b/icuSources/common/rbbitblb.h
index 47f7de27a2f384f2b0b2eef8b7a0c55d09a2cfbe..e4a2b890bd16fbdafa3d37e6f5d282842cbb2dab 100644 (file)
--- a/icuSources/common/rbbitblb.h
+++ b/icuSources/common/rbbitblb.h
@@ -4,7 +4,7 @@
 
 /*
 **********************************************************************
 
 /*
 **********************************************************************

-*   Copyright (c) 2002, International Business Machines
+*   Copyright (c) 2002-2004, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */


@@ -38,21 +38,24 @@ public:
     ~RBBITableBuilder();
 
     void     build();
     ~RBBITableBuilder();
 
     void     build();

-    int32_t  getTableSize();            // Return the runtime size in bytes of
+    int32_t  getTableSize() const;      // Return the runtime size in bytes of

                                         //     the built state table
     void     exportTable(void *where);  // fill in the runtime state table.
                                         //     Sufficient memory must exist at
                                         //     the specified location.
 
                                         //     the built state table
     void     exportTable(void *where);  // fill in the runtime state table.
                                         //     Sufficient memory must exist at
                                         //     the specified location.
 

+

 private:
     void     calcNullable(RBBINode *n);
     void     calcFirstPos(RBBINode *n);
     void     calcLastPos(RBBINode  *n);
     void     calcFollowPos(RBBINode *n);
 private:
     void     calcNullable(RBBINode *n);
     void     calcFirstPos(RBBINode *n);
     void     calcLastPos(RBBINode  *n);
     void     calcFollowPos(RBBINode *n);

+    void     calcChainedFollowPos(RBBINode *n);

     void     buildStateTable();
     void     flagAcceptingStates();
     void     flagLookAheadStates();
     void     flagTaggedStates();
     void     buildStateTable();
     void     flagAcceptingStates();
     void     flagLookAheadStates();
     void     flagTaggedStates();

+    void     mergeRuleStatusVals();

 
     // Set functions for UVector.
     //   TODO:  make a USet subclass of UVector
 
     // Set functions for UVector.
     //   TODO:  make a USet subclass of UVector


@@ -60,10 +63,20 @@ private:
     void     setAdd(UVector *dest, UVector *source);
     UBool    setEquals(UVector *a, UVector *b);
 
     void     setAdd(UVector *dest, UVector *source);
     UBool    setEquals(UVector *a, UVector *b);
 

+    void     sortedAdd(UVector **dest, int32_t val);
+
+public:
+#ifdef RBBI_DEBUG

     void     printSet(UVector *s);
     void     printSet(UVector *s);

-    void     printPosSets(RBBINode *n = NULL);
+    void     printPosSets(RBBINode *n /* = NULL*/);

     void     printStates();
     void     printStates();

-
+    void     printRuleStatusTable();
+#else
+    #define  printSet(s)
+    #define  printPosSets(n)
+    #define  printStates()
+    #define  printRuleStatusTable()
+#endif

 
 private:
     RBBIRuleBuilder  *fRB;
 
 private:
     RBBIRuleBuilder  *fRB;


@@ -75,6 +88,7 @@ private:
                                            //  Index is state number
                                            //  Contents are RBBIStateDescriptor pointers.
 
                                            //  Index is state number
                                            //  Contents are RBBIStateDescriptor pointers.
 

+

     RBBITableBuilder(const RBBITableBuilder &other); // forbid copying of this class
     RBBITableBuilder &operator=(const RBBITableBuilder &other); // forbid copying of this class
 };
     RBBITableBuilder(const RBBITableBuilder &other); // forbid copying of this class
     RBBITableBuilder &operator=(const RBBITableBuilder &other); // forbid copying of this class
 };


@@ -87,7 +101,8 @@ public:
     UBool            fMarked;
     int32_t          fAccepting;
     int32_t          fLookAhead;
     UBool            fMarked;
     int32_t          fAccepting;
     int32_t          fLookAhead;

-    int32_t          fTagVal;
+    UVector          *fTagVals;
+    int32_t          fTagsIdx;

     UVector          *fPositions;          // Set of parse tree positions associated
                                            //   with this state.  Unordered (it's a set).
                                            //   UVector contents are RBBINode *
     UVector          *fPositions;          // Set of parse tree positions associated
                                            //   with this state.  Unordered (it's a set).
                                            //   UVector contents are RBBINode *