Merge remote-tracking branch 'origin/maint'

[bison.git] / src / relation.h

diff --git a/src/relation.h b/src/relation.h
index 8a82b8547dfa4de8f029ed909da0ff9d87ee2202..b44e1a7f9856190d7536d798bf983ee9248f6518 100644 (file)
--- a/src/relation.h
+++ b/src/relation.h
@@ -1,22 +1,21 @@
 /* Binary relations.
-   Copyright (C) 2002  Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2004, 2009-2013 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify
+   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, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful,
+   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 Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #ifndef RELATION_H_
@@ -24,27 +23,27 @@
 
 /* Performing operations on graphs coded as list of adjacency.
 
-   If GRAPH is a relation_t, then GRAPH[Node] is a list of adjacent
-   nodes, ended with -1.  */
+   If GRAPH is a relation, then GRAPH[Node] is a list of adjacent
+   nodes, ended with END_NODE.  */
+
+# define END_NODE ((relation_node) -1)
 
-typedef short relation_node_t;
-typedef relation_node_t *relation_nodes_t;
-typedef relation_nodes_t *relation_t;
+typedef size_t relation_node;
+typedef relation_node *relation_nodes;
+typedef relation_nodes *relation;
 
 
-/* Report a RELATION that has SIZE vertices.  */
-void relation_print PARAMS ((relation_t relation, size_t size,
-                            FILE *out));
+/* Report a relation R that has SIZE vertices.  */
+void relation_print (relation r, relation_node size, FILE *out);
 
-/* Compute the transitive closure of the FUNCTION on the RELATION with
-   SIZE vertices.
+/* Compute the transitive closure of the FUNCTION on the relation R
+   with SIZE vertices.
 
-   If RELATION (NODE-1, NODE-2) then on exit FUNCTION[NODE-1] was
-   extended (unioned) with FUNCTION[NODE-2].  */
-void relation_digraph PARAMS ((relation_t relation, size_t size,
-                              bitsetv *function));
+   If R (NODE-1, NODE-2) then on exit FUNCTION[NODE - 1] was extended
+   (unioned) with FUNCTION[NODE - 2].  */
+void relation_digraph (relation r, relation_node size, bitsetv *function);
 
 /* Destructively transpose *R_ARG, of size N.  */
-void relation_transpose PARAMS ((relation_t *R_arg, int n));
+void relation_transpose (relation *R_arg, relation_node n);
 
 #endif /* ! RELATION_H_ */