Gcc 3.4.2 20040728.

1 files changed, 34 insertions, 32 deletions

diff --git a/contrib/gcc/et-forest.h b/contrib/gcc/et-forest.h
index 8f4290c1193e..833146d61470 100644
--- a/contrib/gcc/et-forest.h
+++ b/contrib/gcc/et-forest.h
@@ -1,5 +1,5 @@
-/* Et-forest data structure implementation.  
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* Et-forest data structure implementation.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,33 +15,33 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* This package implements ET forest data structure. Each tree in 
+/* This package implements ET forest data structure. Each tree in
    the structure maintains a tree structure and offers logarithmic time
    for tree operations (insertion and removal of nodes and edges) and
-   poly-logarithmic time for nearest common ancesto.
- 
-   ET tree strores its structue as a sequence of symbols obtained 
+   poly-logarithmic time for nearest common ancestor.
+
+   ET tree stores its structure as a sequence of symbols obtained
    by dfs(root)
 
-   dfs (node) 
+   dfs (node)
    {
      s = node;
      for each child c of node do
        s = concat (s, c, node);
      return s;
    }
-   
+
    For example for tree
- 
+
             1
           / | \
          2  3  4
        / |
       4  5
- 
+
    the sequence is 1 2 4 2 5 3 1 3 1 4 1.
- 
-   The sequence is stored in a sligtly modified splay tree.
+
+   The sequence is stored in a slightly modified splay tree.
    In order to support various types of node values, a hashtable
    is used to convert node values to the internal representation.  */
 
@@ -55,26 +55,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 extern "C" {
 #endif /* __cplusplus */
 
-typedef struct et_forest *et_forest_t;
-typedef struct et_forest_node *et_forest_node_t;
-
-extern et_forest_t et_forest_create PARAMS ((void));
-
-extern void et_forest_delete PARAMS ((et_forest_t));
-
-extern et_forest_node_t et_forest_add_node PARAMS ((et_forest_t, void *));
-extern int et_forest_add_edge PARAMS ((et_forest_t, et_forest_node_t, 
-					et_forest_node_t));
-extern void et_forest_remove_node PARAMS ((et_forest_t, et_forest_node_t));
-extern int et_forest_remove_edge PARAMS ((et_forest_t, et_forest_node_t,
-					   et_forest_node_t));
-extern et_forest_node_t et_forest_parent PARAMS ((et_forest_t, et_forest_node_t));
-extern et_forest_node_t et_forest_common_ancestor PARAMS ((et_forest_t,
-							  et_forest_node_t,
-							  et_forest_node_t));
-extern void * et_forest_node_value PARAMS ((et_forest_t, et_forest_node_t));
-extern int et_forest_enumerate_sons PARAMS ((et_forest_t, et_forest_node_t,
-					     et_forest_node_t *));
+/* The node representing the node in an et tree.  */
+struct et_node
+{
+  void *data;			/* The data represented by the node.  */
+
+  int dfs_num_in, dfs_num_out;	/* Number of the node in the dfs ordering.  */
+
+  struct et_node *father;	/* Father of the node.  */
+  struct et_node *son;		/* The first of the sons of the node.  */
+  struct et_node *left;
+  struct et_node *right;	/* The brothers of the node.  */
+
+  struct et_occ *rightmost_occ;	/* The rightmost occurence.  */
+  struct et_occ *parent_occ;	/* The occurence of the parent node.  */
+};
+
+struct et_node *et_new_tree (void *data);
+void et_free_tree (struct et_node *);
+void et_set_father (struct et_node *, struct et_node *);
+void et_split (struct et_node *);
+struct et_node *et_nca (struct et_node *, struct et_node *);
+bool et_below (struct et_node *, struct et_node *);
 
 #ifdef __cplusplus
 }