Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/lib/rx.h

Timestamp:

2012-02-28T13:59:00+13:00 (12 years ago)

Author:

kjdon

Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

File:

• main/trunk/greenstone2/common-src/indexers/mg/lib/rx.h (modified) (17 diffs)

main/trunk/greenstone2/common-src/indexers/mg/lib/rx.h

@@ -22 +22 @@
 /*  t. lord Wed Sep 23 18:20:57 1992    */
 
-
-
-
-
-
-
-
+#include "mglong.h"
 
 #ifndef RX_WANT_SE_DEFS
@@ -91 +85 @@
   struct rx_hash_item * next_same_hash;
   struct rx_hash * table;
-  unsigned long hash;
+  mg_u_long hash;
   void * data;
   void * binding;
@@ -273 +267 @@
    */
   void * buffer;
-  unsigned long allocated;
+  mg_u_long allocated;
 
   /* Clients of RX can ask for some extra storage in the space pointed
@@ -280 +274 @@
    * at (buffer + allocated - reserved)
    */
-  unsigned long reserved;
+  mg_u_long reserved;
 
   /* --------- The remaining fields are for internal use only. --------- */
@@ -1274 +1268 @@
 
   void * buffer;        /* Malloced memory for the nfa. */
-  unsigned long allocated;  /* Size of that memory. */
+  mg_u_long allocated;  /* Size of that memory. */
 
   /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
@@ -1580 +1574 @@
                       rx_Bitset a, rx_Bitset b);
 RX_DECL void rx_bitset_xor (int size, rx_Bitset a, rx_Bitset b);
-RX_DECL unsigned long rx_bitset_hash (int size, rx_Bitset b);
+RX_DECL mg_u_long rx_bitset_hash (int size, rx_Bitset b);
 RX_DECL struct rx_hash_item * rx_hash_find (struct rx_hash * table,
-                        unsigned long hash,
+                        mg_u_long hash,
                         void * value,
                         struct rx_hash_rules * rules);
 RX_DECL struct rx_hash_item * rx_hash_store (struct rx_hash * table,
-                         unsigned long hash,
+                         mg_u_long hash,
                          void * value,
                          struct rx_hash_rules * rules);
@@ -1637 +1631 @@
 RX_DECL void rx_delete_epsilon_transitions (struct rx *rx);
 RX_DECL int rx_compactify_nfa (struct rx *rx,
-                   void **mem, unsigned long *size);
+                   void **mem, mg_u_long *size);
 RX_DECL void rx_release_superset (struct rx *rx,
                   struct rx_superset *set);
@@ -1665 +1659 @@
 RX_DECL void rx_bitset_revdifference ();
 RX_DECL void rx_bitset_xor ();
-RX_DECL unsigned long rx_bitset_hash ();
+RX_DECL mg_u_long rx_bitset_hash ();
 RX_DECL struct rx_hash_item * rx_hash_find ();
 RX_DECL struct rx_hash_item * rx_hash_store ();
@@ -2230 +2224 @@
 
 
-
 /* How many characters in the character set.  */
 #define CHAR_SET_SIZE (1 << CHARBITS)
@@ -2344 +2337 @@
 RX_DECL __inline__ int
 rx_search  (struct re_pattern_buffer * rxb,
-        int startpos,
+        intptr_t startpos,
         int range,
         int stop,
@@ -2361 +2354 @@
         app_closure, regs, resume_state, save_state)
      struct re_pattern_buffer * rxb;
-     int startpos;
+     intptr_t startpos;
      int range;
      int stop;
@@ -2739 +2732 @@
   {
     enum rx_test_match_entry test_pc;
-    int inx;
+    intptr_t inx;
     test_pc = search_state.test_match_resume_pt;
     if (test_pc == rx_test_start)
@@ -2839 +2832 @@
             ((struct rx_superstate *)
              ((char *)this_tr_table
-              - ((unsigned long)
+              - ((mg_u_long)
              ((struct rx_superstate *)0)->transitions)));
           
@@ -2904 +2897 @@
         ((struct rx_superstate *)
          ((char *)this_tr_table
-          - ((unsigned long)
+          - ((uintptr_t)
          ((struct rx_superstate *)0)->transitions)));
     }
@@ -2911 +2904 @@
      * Dispatch that instruction:
      */
-    inx = (int)search_state.ifr->inx;
+    inx = (intptr_t)search_state.ifr->inx;
 #ifdef RX_DEBUG_0
     if (rx_debug_trace)
@@ -2949 +2942 @@
           while (el)
         {
-          long effect;
-          effect = (long)el->car;
+          intptr_t effect;
+          effect = (intptr_t)el->car;
           if (effect < 0)
             {
@@ -2990 +2983 @@
                 = ((struct rx_superstate *)
                    ((char *)search_state.ifr->data
-                - (long)(((struct rx_superstate *)0)
+                - (intptr_t)(((struct rx_superstate *)0)
                      ->transitions)));
               goto top_of_cycle;