Update graphviz to 9.0.0 (#77)

Author: chtenb

GraphvizWrapper/GraphvizWrapper.h

@@ -39,8 +39,8 @@ static int rj_flush(void* stream)
     return 0;
 }
 
-static Agiodisc_t memIoDisc = { rj_afread, rj_putstr, rj_flush };
-static Agdisc_t memDisc = { 0, 0, &memIoDisc };
+static Agiodisc_t ioDisc = { rj_afread, rj_putstr, rj_flush };
+static Agdisc_t disc = { 0, &ioDisc };
 
 extern "C" {
 

GraphvizWrapper/Main.cpp

@@ -16,25 +16,25 @@ void free_str(char* str) {
 Agraph_t* rj_agopen(char* name, int graphtype)
 {
     if (graphtype == 0)
-        return agopen(name, Agdirected, &memDisc);
+        return agopen(name, Agdirected, &disc);
     if (graphtype == 1)
-        return agopen(name, Agstrictdirected, &memDisc);
+        return agopen(name, Agstrictdirected, &disc);
     if (graphtype == 2)
-        return agopen(name, Agundirected, &memDisc);
+        return agopen(name, Agundirected, &disc);
     if (graphtype == 3)
-        return agopen(name, Agstrictundirected, &memDisc);
+        return agopen(name, Agstrictundirected, &disc);
     return 0;
 }
 
 Agraph_t* rj_agmemread(const char* s)
 {
     stringstream stream;
     stream << s;
-    Agraph_t* g = agread(&stream, &memDisc);
+    Agraph_t* g = agread(&stream, &disc);
     return g;
 }
 
-// Note: for this function to work, the graph has to be created with the memDisc, e.g. using rj_agopen
+// Note: for this function to work, the graph has to be created with the disc, e.g. using rj_agopen
 // This function transfers ownership of the string result.
 // The caller has to call free_str to free it.
 const char* rj_agmemwrite(Agraph_t* g)

GraphvizWrapper/graphvizfiles/Debug/acyclic.exe

@@ -2,6 +2,12 @@
  * @file
  * @brief container data types API
  * @ingroup public_apis
+ *
+ * **CDT** manages run-time dictionaries using standard container data types:
+ * unordered set/multiset, ordered set/multiset, list, stack, and queue.
+ *
+ * [man 3 cdt](https://graphviz.org/pdf/cdt.3.pdf)
+ *
  */
 
 #pragma once
@@ -42,11 +48,9 @@ typedef struct _dt_s		Dict_t;	/* for libdict compatibility */
 typedef struct _dtstat_s	Dtstat_t;
 typedef void*			(*Dtmemory_f)(Dt_t*,void*,size_t,Dtdisc_t*);
 typedef void*			(*Dtsearch_f)(Dt_t*,void*,int);
-typedef void* 		(*Dtmake_f)(Dt_t*,void*,Dtdisc_t*);
-typedef void 			(*Dtfree_f)(Dt_t*,void*,Dtdisc_t*);
+typedef void* 		(*Dtmake_f)(void*,Dtdisc_t*);
+typedef void 			(*Dtfree_f)(void*,Dtdisc_t*);
 typedef int			(*Dtcompar_f)(Dt_t*,void*,void*,Dtdisc_t*);
-typedef unsigned int		(*Dthash_f)(Dt_t*,void*,Dtdisc_t*);
-typedef int			(*Dtevent_f)(Dt_t*,int,void*,Dtdisc_t*);
 
 struct _dtlink_s
 {	Dtlink_t*	right;	/* right child		*/
@@ -79,8 +83,6 @@ struct _dtdata_s
 	int		ntab;	/* number of hash slots			*/
 	int		size;	/* number of objects			*/
 	int		loop;	/* number of nested loops		*/
-	int		minp;	/* min path before splay, always even	*/
-				/* for hash dt, > 0: fixed table size 	*/
 };
 
 /* structure to hold methods that manipulate an object */
@@ -91,16 +93,14 @@ struct _dtdisc_s
 	Dtmake_f	makef;	/* object constructor			*/
 	Dtfree_f	freef;	/* object destructor			*/
 	Dtcompar_f	comparf;/* to compare two objects		*/
-	Dthash_f	hashf;	/* to compute hash value of an object	*/
 	Dtmemory_f	memoryf;/* to allocate/free memory		*/
-	Dtevent_f	eventf;	/* to process events			*/
 };
 
-#define DTDISC(dc,ky,sz,lk,mkf,frf,cmpf,hshf,memf,evf) \
+#define DTDISC(dc, ky, sz, lk, mkf, frf, cmpf, memf) \
 	( (dc)->key = (ky), (dc)->size = (sz), (dc)->link = (lk), \
 	  (dc)->makef = (mkf), (dc)->freef = (frf), \
-	  (dc)->comparf = (cmpf), (dc)->hashf = (hshf), \
-	  (dc)->memoryf = (memf), (dc)->eventf = (evf) )
+	  (dc)->comparf = (cmpf), \
+	  (dc)->memoryf = (memf) )
 
 /* the dictionary structure itself */
 struct _dt_s
@@ -130,19 +130,11 @@ struct _dtstat_s
 
 /* supported storage methods */
 #define DT_SET		0000001	/* set with unique elements		*/
-#define DT_BAG		0000002	/* multiset				*/
 #define DT_OSET		0000004	/* ordered set (self-adjusting tree)	*/
 #define DT_OBAG		0000010	/* ordered multiset			*/
-#define DT_LIST		0000020	/* linked list				*/
-#define DT_STACK	0000040	/* stack: insert/delete at top		*/
 #define DT_QUEUE	0000100	/* queue: insert at top, delete at tail	*/
-#define DT_DEQUE	0000200 /* deque: insert at top, append at tail	*/
 #define DT_METHODS	0000377	/* all currently supported methods	*/
 
-/* asserts to dtdisc() */
-#define DT_SAMECMP	0000001	/* compare methods equivalent		*/
-#define DT_SAMEHASH	0000002	/* hash methods equivalent		*/
-
 /* types of search */
 #define DT_INSERT	0000001	/* insert object if not found		*/
 #define DT_DELETE	0000002	/* delete object if found		*/
@@ -155,54 +147,34 @@ struct _dtstat_s
 #define DT_LAST		0000400	/* get last object			*/
 #define DT_MATCH	0001000	/* find object matching key		*/
 #define DT_VSEARCH	0002000	/* search using internal representation	*/
-#define DT_ATTACH	0004000	/* attach an object to the dictionary	*/
 #define DT_DETACH	0010000	/* detach an object from the dictionary	*/
-#define DT_APPEND	0020000	/* used on Dtlist to append an object	*/
-
-/* events */
-#define DT_OPEN		1	/* a dictionary is being opened		*/
-#define DT_CLOSE	2	/* a dictionary is being closed		*/
-#define DT_DISC		3	/* discipline is about to be changed	*/
-#define DT_METH		4	/* method is about to be changed	*/
-#define DT_ENDOPEN	5	/* dtopen() is done			*/
-#define DT_ENDCLOSE	6	/* dtclose() is done			*/
-#define DT_HASHSIZE	7	/* setting hash table size		*/
 
 CDT_API extern Dtmethod_t* 	Dtset; ///< set with unique elements
-CDT_API extern Dtmethod_t* 	Dtbag; ///< multiset
 CDT_API extern Dtmethod_t* 	Dtoset; ///< ordered set (self-adjusting tree)
 CDT_API extern Dtmethod_t* 	Dtobag; ///< ordered multiset
-CDT_API extern Dtmethod_t*	Dtlist; ///< linked list
-CDT_API extern Dtmethod_t*	Dtstack; ///< stack: insert/delete at top
 CDT_API extern Dtmethod_t*	Dtqueue; ///< queue: insert at top, delete at tail
-CDT_API extern Dtmethod_t*	Dtdeque; ///< deque: insert at top, append at tail
 
-CDT_API extern Dtmethod_t*	Dtorder;
 CDT_API extern Dtmethod_t*	Dttree;
-CDT_API extern Dtmethod_t*	Dthash;
 CDT_API extern Dtmethod_t	_Dttree;
-CDT_API extern Dtmethod_t	_Dthash;
-CDT_API extern Dtmethod_t	_Dtlist;
 CDT_API extern Dtmethod_t	_Dtqueue;
-CDT_API extern Dtmethod_t	_Dtstack;
 
 CDT_API Dt_t*		dtopen(Dtdisc_t*, Dtmethod_t*);
 CDT_API int		dtclose(Dt_t*);
 CDT_API Dt_t*		dtview(Dt_t*, Dt_t*);
-CDT_API Dtdisc_t*	dtdisc(Dt_t* dt, Dtdisc_t*, int);
+CDT_API Dtdisc_t*	dtdisc(Dt_t *dt, Dtdisc_t*);
 CDT_API Dtmethod_t*	dtmethod(Dt_t*, Dtmethod_t*);
 
 CDT_API Dtlink_t*	dtflatten(Dt_t*);
 CDT_API Dtlink_t*	dtextract(Dt_t*);
 CDT_API int		dtrestore(Dt_t*, Dtlink_t*);
 
-CDT_API int		dtwalk(Dt_t*, int(*)(Dt_t*,void*,void*), void*);
+CDT_API int		dtwalk(Dt_t*, int(*)(void*,void*), void*);
 
 CDT_API void*		dtrenew(Dt_t*, void*);
 
 CDT_API int		dtsize(Dt_t*);
 CDT_API int		dtstat(Dt_t*, Dtstat_t*, int);
-CDT_API unsigned int	dtstrhash(unsigned int, void*, int);
+CDT_API unsigned int dtstrhash(void*, int);
 
 /* internal functions for translating among holder, object and key */
 #define _DT(dt)		((Dt_t*)(dt))
@@ -215,41 +187,6 @@ CDT_API unsigned int	dtstrhash(unsigned int, void*, int);
 #define _DTCMP(dt,k1,k2,dc,cmpf,sz) \
 			(cmpf ? (*cmpf)(dt,k1,k2,dc) : \
 			 (sz <= 0 ? strcmp(k1,k2) : memcmp(k1,k2,(size_t)sz)) )
-#define _DTHSH(dt,ky,dc,sz) (dc->hashf ? (*dc->hashf)(dt,ky,dc) : dtstrhash(0,ky,sz) )
-
-/* special search function for tree structure only */
-#define _DTMTCH(dt,key,action) \
-	do { Dtlink_t* _e; void *_o, *_k, *_key; Dtdisc_t* _dc; \
-	     int _ky, _sz, _lk, _cmp; Dtcompar_f _cmpf; \
-	     _dc = (dt)->disc; _DTDSC(_dc, _ky, _sz, _lk, _cmpf); \
-	     _key = (key); \
-	     for(_e = (dt)->data->here; _e; _e = _cmp < 0 ? _e->hl._left : _e->right) \
-	     {	_o = _DTOBJ(_e, _lk); _k = _DTKEY(_o, _ky, _sz); \
-		if((_cmp = _DTCMP((dt), _key, _k, _dc, _cmpf, _sz)) == 0) \
-			break; \
-	     } \
-	     action (_e ? _o : (void*)0); \
-	} while(0)
-
-#define _DTSRCH(dt,obj,action) \
-	do { Dtlink_t* _e; void *_o, *_k, *_key; Dtdisc_t* _dc; \
-	     int _ky, _sz, _lk, _cmp; Dtcompar_f _cmpf; \
-	     _dc = (dt)->disc; _DTDSC(_dc, _ky, _sz, _lk, _cmpf); \
-	     _key = _DTKEY(obj, _ky, _sz); \
-	     for(_e = (dt)->data->here; _e; _e = _cmp < 0 ? _e->hl._left : _e->right) \
-	     {	_o = _DTOBJ(_e, _lk); _k = _DTKEY(_o, _ky, _sz); \
-		if((_cmp = _DTCMP((dt), _key, _k, _dc, _cmpf, _sz)) == 0) \
-			break; \
-	     } \
-	     action (_e ? _o : (void*)0); \
-	} while(0)
-
-#define DTTREEMATCH(dt,key,action)	_DTMTCH(_DT(dt),(void*)(key),action)
-#define DTTREESEARCH(dt,obj,action)	_DTSRCH(_DT(dt),(void*)(obj),action)
-
-#define dtvnext(d)	(_DT(d)->view)
-#define dtvcount(d)	(_DT(d)->nview)
-#define dtvhere(d)	(_DT(d)->walk)
 
 #define dtlink(d,e)	(((Dtlink_t*)(e))->right)
 #define dtobj(d,e)	_DTOBJ((e), _DT(d)->disc->link)
@@ -264,19 +201,19 @@ CDT_API unsigned int	dtstrhash(unsigned int, void*, int);
 #define dtsearch(d,o)	(*(_DT(d)->searchf))((d),(void*)(o),DT_SEARCH)
 #define dtmatch(d,o)	(*(_DT(d)->searchf))((d),(void*)(o),DT_MATCH)
 #define dtinsert(d,o)	(*(_DT(d)->searchf))((d),(void*)(o),DT_INSERT)
-#define dtappend(d,o)	(*(_DT(d)->searchf))((d),(void*)(o),DT_INSERT|DT_APPEND)
 #define dtdelete(d,o)	(*(_DT(d)->searchf))((d),(void*)(o),DT_DELETE)
-#define dtattach(d,o)	(*(_DT(d)->searchf))((d),(void*)(o),DT_ATTACH)
 #define dtdetach(d,o)	(*(_DT(d)->searchf))((d),(void*)(o),DT_DETACH)
 #define dtclear(d)	(*(_DT(d)->searchf))((d),(void*)(0),DT_CLEAR)
 #define dtfound(d)	(_DT(d)->type & DT_FOUND)
 
 #define DT_PRIME	17109811 /* 2#00000001 00000101 00010011 00110011 */
-#define dtcharhash(h,c) (((unsigned int)(h) + (unsigned int)(c)) * DT_PRIME )
 
 /**
  * @dir lib/cdt
  * @brief container data types, API cdt.h
+ *
+ * [man 3 cdt](https://graphviz.org/pdf/cdt.3.pdf)
+ *
  */
 
 #ifdef __cplusplus