X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fet-forest.h;h=8f49a82ad62b6f31aab94b589b0adb715bb9549c;hp=b4ac5500ca88ce96e5ca643e22c9f7ac41936e96;hb=56f06eefe91d32c510a389a65078d2b040ca8108;hpb=35cb52328130204135957d24fa9d6df39585ca64

diff --git a/gcc/et-forest.h b/gcc/et-forest.h
index b4ac5500ca8..8f49a82ad62 100644
--- a/gcc/et-forest.h
+++ b/gcc/et-forest.h
@@ -1,26 +1,26 @@
 /* Et-forest data structure implementation.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2007 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
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
 
 /* 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 ancestor.
 
-   ET tree strores its structue as a sequence of symbols obtained
+   ET tree stores its structure as a sequence of symbols obtained
    by dfs(root)
 
    dfs (node)
@@ -41,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
    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,31 @@ 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 (void);
-
-extern void et_forest_delete (et_forest_t);
-
-extern et_forest_node_t et_forest_add_node (et_forest_t, void *);
-extern int et_forest_add_edge (et_forest_t, et_forest_node_t,
-			       et_forest_node_t);
-extern void et_forest_remove_node (et_forest_t, et_forest_node_t);
-extern int et_forest_remove_edge (et_forest_t, et_forest_node_t,
-				  et_forest_node_t);
-extern et_forest_node_t et_forest_parent (et_forest_t, et_forest_node_t);
-extern et_forest_node_t et_forest_common_ancestor (et_forest_t,
-						   et_forest_node_t,
-						   et_forest_node_t);
-extern void * et_forest_node_value (et_forest_t, et_forest_node_t);
-extern int et_forest_enumerate_sons (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 occurrence.  */
+  struct et_occ *parent_occ;	/* The occurrence of the parent node.  */
+};
+
+struct et_node *et_new_tree (void *data);
+void et_free_tree (struct et_node *);
+void et_free_tree_force (struct et_node *);
+void et_free_pools (void);
+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 *);
+struct et_node *et_root (struct et_node *);
 
 #ifdef __cplusplus
 }