Re-do isIn() function to use agcontains() from cgraph.

diff --git a/cmd/gvpr/compile.c b/cmd/gvpr/compile.c
index 47802ac9ff2cdeed64c9f1ab880adb5021c6ea96..be5fa0145515ece07ea79d7becdf5a6b530484d6 100644 (file)
--- a/cmd/gvpr/compile.c
+++ b/cmd/gvpr/compile.c
@@ -730,7 +730,7 @@ getval(Expr_t * pgm, Exnode_t * node, Exid_t * sym, Exref_t * ref,
                error(ERROR_WARNING, "NULL object passed to isIn()");
                v.integer = 0;
            } else
-               v.integer = isIn(gp, objp);
+               v.integer = agcontains (gp, objp);
            break;
        case F_compof:
            gp = INT2PTR(Agraph_t *, args[0].integer);

diff --git a/cmd/gvpr/gvpr.1 b/cmd/gvpr/gvpr.1
index ad294a18240d0442607d943db6f67744d0f5c115..2978d0fd2a28b281288072e2b0aec4d2ab99e0e0 100644 (file)
--- a/cmd/gvpr/gvpr.1
+++ b/cmd/gvpr/gvpr.1
@@ -466,8 +466,6 @@ If \fIx\fP is a graph or subgraph, it is closed unless \fIx\fP is locked.
 .TP
 \fBisIn\fP(\fIg\fP : \fBgraph_t\fP, \fIx\fP : \fBobj_t\fP) : \fBint\fP
 returns true if \fIx\fP is in subgraph \fIg\fP.
-If \fIx\fP is a graph, this indicates that \fIg\fP is the immediate parent
-graph of \fIx\fP.
 .TP
 \fBclone\fP(\fIg\fP : \fBgraph_t\fP, \fIx\fP : \fBobj_t\fP) : \fBobj_t\fP
 creates a clone of object \fIx\fP in graph \fIg\fP.