]> granicus.if.org Git - graphviz/log
graphviz
2 years agocommon sizeArray: remove platform-conditional struct code smattr/7274ea57-04ed-4877-918e-989acc6cae8b
Matthew Fernandez [Tue, 11 Oct 2022 04:40:59 +0000 (21:40 -0700)]
common sizeArray: remove platform-conditional struct code

08f481fa36bbf199e0f8fbf862639d8fc4e575ab made this initialization platform
dependent and its commit message does not explain why. Both statements are
equivalent; the value of `Agstrictdirected` _is_ `{ 1, 1, 0, 1 }`. This change
removes the Windows branch of this which was causing warnings under MinGW
12.2.0:

  lib/common/htmltable.c:1472:5: error: missing initializer for field 'flatlock'
    of 'Agdesc_t' {aka 'struct Agdesc_s'} [-Werror=missing-field-initializers]
   1472 |     Agdesc_t dir = { 1, 1, 0, 1 };
        |     ^~~~~~~~
  In file included from lib/common/types.h:41,
                   from lib/common/render.h:29,
                   from lib/common/htmltable.c:32:
  lib/cgraph/cgraph.h:166:14: note: 'flatlock' declared here
    166 |     unsigned flatlock:1;        /* if sets are flattened into lists…
        |              ^~~~~~~~

2 years agoGD plugin gd_format: use C99 zero initialization for 'gd_context'
Matthew Fernandez [Tue, 11 Oct 2022 04:06:15 +0000 (21:06 -0700)]
GD plugin gd_format: use C99 zero initialization for 'gd_context'

This moves to a more uniform initialization style that will enable us to ratchet
up -Wmissing-field-initializers warnings in future.

2 years agoMerge branch 'smattr/8908405f-7c1a-4657-8118-0c64f585ee8b' into 'main'
Matthew Fernandez [Tue, 11 Oct 2022 04:33:44 +0000 (04:33 +0000)]
Merge branch 'smattr/8908405f-7c1a-4657-8118-0c64f585ee8b' into 'main'

sfio: squash some compiler warnings

See merge request graphviz/graphviz!2884

2 years agosfio _Sftable: use C99 designated field initializers
Matthew Fernandez [Fri, 7 Oct 2022 03:46:28 +0000 (20:46 -0700)]
sfio _Sftable: use C99 designated field initializers

Squashes a number of -Wmissing-field-initializer warnings.

2 years agosfio sfcvinit: use more appropriate types, squashing -Wconversion warnings
Matthew Fernandez [Fri, 7 Oct 2022 03:46:01 +0000 (20:46 -0700)]
sfio sfcvinit: use more appropriate types, squashing -Wconversion warnings

2 years agosfio sfsync: realign 'mode' type with its use
Matthew Fernandez [Fri, 7 Oct 2022 03:25:30 +0000 (20:25 -0700)]
sfio sfsync: realign 'mode' type with its use

Squashes a -Wsign-conversion warning.

2 years agosfio sfsync: realign 'pool' type with its use
Matthew Fernandez [Fri, 7 Oct 2022 03:13:09 +0000 (20:13 -0700)]
sfio sfsync: realign 'pool' type with its use

Squashes a -Wsign-conversion warning.

2 years agosfio sfswap: realign 'f1mode' type with its use
Matthew Fernandez [Fri, 7 Oct 2022 03:00:33 +0000 (20:00 -0700)]
sfio sfswap: realign 'f1mode' type with its use

Squashes three -Wsign-conversion warnings.

2 years agoMerge branch 'smattr/2fd13139-2ce0-4774-bd07-42eaf6061030' into 'main'
Matthew Fernandez [Tue, 11 Oct 2022 03:23:37 +0000 (03:23 +0000)]
Merge branch 'smattr/2fd13139-2ce0-4774-bd07-42eaf6061030' into 'main'

glcomp: remove dead code

See merge request graphviz/graphviz!2879

2 years agoglcomp: remove 'glCompButton.glyphPos' and associated constants
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove 'glCompButton.glyphPos' and associated constants

These have seemingly never been used.

2 years agoglcomp: remove unused 'glCompLabel.autosize'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove unused 'glCompLabel.autosize'

This field has seemingly never been used.

2 years agoglcomp: remove unnecessary casts of 'compset' member
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove unnecessary casts of 'compset' member

2 years agoglcomp: remove unused 'C_DPI', 'R_DPI'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove unused 'C_DPI', 'R_DPI'

The last uses of these were removed in 8444026daa5f5ba70dcc2a719f9ad23b927e88ce.

2 years agoglcomp: remove unused 'FONT_MAX_LEN'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove unused 'FONT_MAX_LEN'

The last use of this was removed in ed74e24b8020a70678d05489639e0e8c4574f87d.

2 years agoglcomp: remove unused 'FONT_TAB_SPACE'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove unused 'FONT_TAB_SPACE'

The last use of this was removed in 8444026daa5f5ba70dcc2a719f9ad23b927e88ce.

2 years agoglcomp: remove unused 'GLCOMPSET_DEFAULT_PAD'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove unused 'GLCOMPSET_DEFAULT_PAD'

The last use of this was removed in 8444026daa5f5ba70dcc2a719f9ad23b927e88ce.

2 years agoglcomp: remove unused 'glCompTrackBar'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
glcomp: remove unused 'glCompTrackBar'

The last use of this was removed in 8444026daa5f5ba70dcc2a719f9ad23b927e88ce. We
also remove `glCompOrientation` which was only used within this struct.

2 years agoMerge branch 'smattr/e78584c4-bddc-43a8-8d67-715eb74454c9' into 'main'
Matthew Fernandez [Tue, 11 Oct 2022 01:40:17 +0000 (01:40 +0000)]
Merge branch 'smattr/e78584c4-bddc-43a8-8d67-715eb74454c9' into 'main'

neatogen: progress on using cgraph wrappers for allocation

See merge request graphviz/graphviz!2885

2 years agoneatogen print_bounding_box: use cgraph wrappers for allocation
Matthew Fernandez [Fri, 7 Oct 2022 02:37:52 +0000 (19:37 -0700)]
neatogen print_bounding_box: use cgraph wrappers for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

2 years agoneatogen OverlapSmoother_new: use cgraph wrappers for allocation
Matthew Fernandez [Fri, 7 Oct 2022 02:37:07 +0000 (19:37 -0700)]
neatogen OverlapSmoother_new: use cgraph wrappers for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

2 years agoneatogen relative_position_constraints_new: use cgraph wrapper for allocation
Matthew Fernandez [Fri, 7 Oct 2022 02:36:26 +0000 (19:36 -0700)]
neatogen relative_position_constraints_new: use cgraph wrapper for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

2 years agoneatogen get_overlap_graph: use cgraph wrappers for allocation
Matthew Fernandez [Fri, 7 Oct 2022 02:35:41 +0000 (19:35 -0700)]
neatogen get_overlap_graph: use cgraph wrappers for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

2 years agoMerge branch 'smattr/80a44ae4-4b4f-4df6-9e97-b9eea6f522f1' into 'main'
Matthew Fernandez [Mon, 10 Oct 2022 15:57:23 +0000 (15:57 +0000)]
Merge branch 'smattr/80a44ae4-4b4f-4df6-9e97-b9eea6f522f1' into 'main'

tclpkg: some minor clean up

See merge request graphviz/graphviz!2897

2 years agotclpkg graphcmd: shrink a buffer
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
tclpkg graphcmd: shrink a buffer

Only 12 characters are needed to print a NUL terminated 32-bit integer.

2 years agotclpkg graphcmd: remove some uses of bare 'sprintf'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
tclpkg graphcmd: remove some uses of bare 'sprintf'

Gitlab: #1950

2 years agotclpkg: remove 'Tcl_Alloc' failure handling code
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
tclpkg: remove 'Tcl_Alloc' failure handling code

`Tcl_Alloc` panics the containing TCL interpreter on error.¹ There is no need to
anticipate it returning `NULL`.

¹ https://www.tcl-lang.org/man/tcl/TclLib/Alloc.htm

2 years agotclpkg GdPtrTypeUpdate: remove a use of bare 'sprintf'
Matthew Fernandez [Thu, 8 Sep 2022 00:27:49 +0000 (17:27 -0700)]
tclpkg GdPtrTypeUpdate: remove a use of bare 'sprintf'

Gitlab: #1950

2 years agoMerge branch 'automatic-artifact-filename-base-in-overlap-tests' into 'main'
Magnus Jacobsson [Mon, 10 Oct 2022 10:06:50 +0000 (10:06 +0000)]
Merge branch 'automatic-artifact-filename-base-in-overlap-tests' into 'main'

tests: use the AUTO_NAME macro in all tests

See merge request graphviz/graphviz!2883

2 years agotests: use the AUTO_NAME macro in all tests
Magnus Jacobsson [Fri, 7 Oct 2022 12:16:47 +0000 (14:16 +0200)]
tests: use the AUTO_NAME macro in all tests

This macro was mistakenly not used when the
test_edge_node_overlap_all_primitive_edge_arrows,
test_edge_node_overlap_normal_and_inv_edge_arrows and
test_edge_node_overlap_normal_and_inv_edge_arrows_all_modifiers tests
were introduced.

This ensures that the generated artifact file names begin with the
same name as the test case file.

2 years agoMerge branch 'lib-dox' into 'main'
Matthew Fernandez [Fri, 7 Oct 2022 01:14:30 +0000 (01:14 +0000)]
Merge branch 'lib-dox' into 'main'

Doxygen comments for libs

See merge request graphviz/graphviz!2878

2 years agoxdot: doxygen comment
Costa Shulyupin [Wed, 5 Oct 2022 15:45:37 +0000 (18:45 +0300)]
xdot: doxygen comment

2 years agovpsc: doxygen comment
Costa Shulyupin [Wed, 5 Oct 2022 15:45:18 +0000 (18:45 +0300)]
vpsc: doxygen comment

2 years agoortho: fix doxygen reference
Costa Shulyupin [Wed, 5 Oct 2022 15:44:19 +0000 (18:44 +0300)]
ortho: fix doxygen reference

2 years agoglcomp: doxygen comment
Costa Shulyupin [Wed, 5 Oct 2022 15:43:46 +0000 (18:43 +0300)]
glcomp: doxygen comment

2 years agoexpr: doxygen comment
Costa Shulyupin [Wed, 5 Oct 2022 15:43:21 +0000 (18:43 +0300)]
expr: doxygen comment

2 years agolib/common: : doxygen comment
Costa Shulyupin [Wed, 5 Oct 2022 15:42:13 +0000 (18:42 +0300)]
lib/common: : doxygen comment

2 years agoMerge branch 'cgraph-module' into 'main'
Matthew Fernandez [Thu, 6 Oct 2022 16:44:48 +0000 (16:44 +0000)]
Merge branch 'cgraph-module' into 'main'

doxygen module/group cgraph_api

See merge request graphviz/graphviz!2877

2 years agodoxygen module cgraph_api
Costa Shulyupin [Wed, 5 Oct 2022 15:21:37 +0000 (18:21 +0300)]
doxygen module cgraph_api

2 years agoMerge branch 'include-rankdir-in-artifact-filenames' into 'main'
Magnus Jacobsson [Thu, 6 Oct 2022 09:30:05 +0000 (09:30 +0000)]
Merge branch 'include-rankdir-in-artifact-filenames' into 'main'

Include rankdir in artifact filenames

See merge request graphviz/graphviz!2875

2 years agotest_edge_node_overlap_polygon_node_shapes: include rankdir in filename
Magnus Jacobsson [Tue, 4 Oct 2022 10:58:34 +0000 (12:58 +0200)]
test_edge_node_overlap_polygon_node_shapes: include rankdir in filename

2 years agotest_edge_node_overlap_point_node_shape: include rankdir in filename
Magnus Jacobsson [Tue, 4 Oct 2022 10:57:57 +0000 (12:57 +0200)]
test_edge_node_overlap_point_node_shape: include rankdir in filename

2 years agotest_edge_node_overlap_ellipse_node_shapes_except_point: include rankdir in filename
Magnus Jacobsson [Tue, 4 Oct 2022 10:57:02 +0000 (12:57 +0200)]
test_edge_node_overlap_ellipse_node_shapes_except_point: include rankdir in filename

2 years agotest_edge_node_overlap_cylinder_node_shape: include rankdir in filename
Magnus Jacobsson [Tue, 4 Oct 2022 10:47:06 +0000 (12:47 +0200)]
test_edge_node_overlap_cylinder_node_shape: include rankdir in filename

2 years agoMerge branch 'common-doxygen' into 'main'
Matthew Fernandez [Wed, 5 Oct 2022 15:57:16 +0000 (15:57 +0000)]
Merge branch 'common-doxygen' into 'main'

doxygen comments in lib/common

See merge request graphviz/graphviz!2876

2 years agotextspan: doxygen comments
Costa Shulyupin [Tue, 4 Oct 2022 15:51:25 +0000 (18:51 +0300)]
textspan: doxygen comments

2 years agoxml: doxygen comment
Costa Shulyupin [Tue, 4 Oct 2022 15:38:18 +0000 (18:38 +0300)]
xml: doxygen comment

2 years agons: doxygen comment
Costa Shulyupin [Tue, 4 Oct 2022 15:32:56 +0000 (18:32 +0300)]
ns: doxygen comment

2 years agogeomprocs: doxygen comment
Costa Shulyupin [Tue, 4 Oct 2022 15:31:35 +0000 (18:31 +0300)]
geomprocs: doxygen comment

2 years agogeom: doxygen comment
Costa Shulyupin [Tue, 4 Oct 2022 15:30:55 +0000 (18:30 +0300)]
geom: doxygen comment

2 years agoemit: doxygen comment
Costa Shulyupin [Tue, 4 Oct 2022 15:30:41 +0000 (18:30 +0300)]
emit: doxygen comment

2 years agoMerge branch 'smattr/cb76abb9-9046-4de3-a70f-289acba7b52d' into 'main'
Matthew Fernandez [Wed, 5 Oct 2022 02:02:05 +0000 (02:02 +0000)]
Merge branch 'smattr/cb76abb9-9046-4de3-a70f-289acba7b52d' into 'main'

remove SWIG setup steps in Windows build preparation script

See merge request graphviz/graphviz!2870

2 years agoremove SWIG setup steps in Windows build preparation script
Matthew Fernandez [Fri, 30 Sep 2022 04:18:58 +0000 (21:18 -0700)]
remove SWIG setup steps in Windows build preparation script

As discussed on Gitlab,¹ this Windows build script tries to discover SWIG, but
none of the Windows options for building Graphviz support compiling any of the
components that use SWIG.

¹ https://gitlab.com/graphviz/graphviz/-/issues/2277#note_1100714918

2 years agoMerge branch 'smattr/711fa74b-6b92-4189-8033-1a6347315391' into 'main'
Matthew Fernandez [Wed, 5 Oct 2022 01:00:38 +0000 (01:00 +0000)]
Merge branch 'smattr/711fa74b-6b92-4189-8033-1a6347315391' into 'main'

sccmap: re-enable non-silent output when '-v' is passed

See merge request graphviz/graphviz!2873

2 years agosccmap: re-enable non-silent output when '-v' is passed
Matthew Fernandez [Sat, 1 Oct 2022 02:12:32 +0000 (19:12 -0700)]
sccmap: re-enable non-silent output when '-v' is passed

Unix command line tools generally have a “last option wins” kind of semantics,
wherein it is valid to pass options multiple times or in combination with other
options that do their opposite. Thus when calling `sccmap -S -v`, the user could
reasonably expect that `-v` (“verbose”) reversed the effect of `-S` (“silent”).
This is also what the man page implies. But this was not what the code was
doing.

2 years agosccmap: fix missing '-S' in usage summary
Matthew Fernandez [Sat, 1 Oct 2022 02:10:45 +0000 (19:10 -0700)]
sccmap: fix missing '-S' in usage summary

2 years agoMerge branch 'smattr/dcfd6cd8-86b5-45bc-9037-39c47f7c003a' into 'main'
Matthew Fernandez [Mon, 3 Oct 2022 01:26:36 +0000 (01:26 +0000)]
Merge branch 'smattr/dcfd6cd8-86b5-45bc-9037-39c47f7c003a' into 'main'

cmds/tools: progress towards using cgraph wrappers for allocation

See merge request graphviz/graphviz!2852

2 years agoremove unnecessary 'usershape_t.data' casts
Matthew Fernandez [Wed, 21 Sep 2022 04:47:44 +0000 (21:47 -0700)]
remove unnecessary 'usershape_t.data' casts

2 years agogvpack: use cgraph wrappers for allocation
Matthew Fernandez [Thu, 22 Sep 2022 04:13:13 +0000 (21:13 -0700)]
gvpack: use cgraph wrappers for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

2 years agogvpack: replace CDT pair dictionaries with 'std::multiset'
Matthew Fernandez [Thu, 22 Sep 2022 04:04:35 +0000 (21:04 -0700)]
gvpack: replace CDT pair dictionaries with 'std::multiset'

This is intended to be a non-functional change with a number of benefits:

  1. This is C++ code, so no need for custom CDT data structures. The STL
     equivalents are likely more optimized, better understood by the compiler,
     and more familiar to human readers.

  2. We avoid the lib/common allocation routines (`NEW` macro and friends). Now
     allocation failures naturally propagate outwards as `std::bad_alloc`
     exceptions without any custom handling.

  3. Related to (2), we no longer need to manually free any of these objects.
     RAII takes care of all of this.

2 years agogvpack: replace CDT attribute dictionaries with std::maps
Matthew Fernandez [Thu, 22 Sep 2022 03:33:41 +0000 (20:33 -0700)]
gvpack: replace CDT attribute dictionaries with std::maps

This is intended to be a non-functional change with a number of benefits:

  1. This is C++ code, so no need for custom CDT data structures. The STL
     equivalents are likely more optimized, better understood by the compiler,
     and more familiar to human readers.

  2. We avoid the lib/common allocation routines (`NEW` macro and friends). Now
     allocation failures naturally propagate outwards as `std::bad_alloc`
     exceptions without any custom handling.

  3. Related to (2), we no longer need to manually free any of these objects.
     RAII takes care of all of this.

2 years agomm2gv makeDotGraph: use cgraph wrappers for allocation
Matthew Fernandez [Thu, 22 Sep 2022 02:51:58 +0000 (19:51 -0700)]
mm2gv makeDotGraph: use cgraph wrappers for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

2 years agoMerge branch 'main' into 'main'
Matthew Fernandez [Sat, 1 Oct 2022 02:00:44 +0000 (02:00 +0000)]
Merge branch 'main' into 'main'

Make vimdot work with $EDITOR that is not a full path

See merge request graphviz/graphviz!2872

2 years agoMake vimdot work with $EDITOR that is not a full path
Jakub Kaczor [Fri, 30 Sep 2022 10:06:20 +0000 (10:06 +0000)]
Make vimdot work with $EDITOR that is not a full path

2 years agoMerge branch 'smattr/084fe373-a609-4015-855e-3a366c9415ac' into 'main'
Matthew Fernandez [Fri, 30 Sep 2022 05:02:34 +0000 (05:02 +0000)]
Merge branch 'smattr/084fe373-a609-4015-855e-3a366c9415ac' into 'main'

mingle: delete some dead code

See merge request graphviz/graphviz!2869

2 years agoremove unused 'MATRIX_SKEW' flag
Matthew Fernandez [Thu, 29 Sep 2022 04:36:30 +0000 (21:36 -0700)]
remove unused 'MATRIX_SKEW' flag

This property is sometimes set on matrices but then never read.

2 years agoremove unused 'MATRIX_HERMITIAN' flag
Matthew Fernandez [Thu, 29 Sep 2022 04:35:06 +0000 (21:35 -0700)]
remove unused 'MATRIX_HERMITIAN' flag

This property is sometimes set on matrices but then never read.

2 years agosparse SparseMatrix_init: remove dead stores to 'property'
Matthew Fernandez [Thu, 29 Sep 2022 04:32:32 +0000 (21:32 -0700)]
sparse SparseMatrix_init: remove dead stores to 'property'

`property` is cleared immediately before these lines.

2 years agomingle: remove dead store to 'dim' local
Matthew Fernandez [Thu, 29 Sep 2022 02:33:45 +0000 (19:33 -0700)]
mingle: remove dead store to 'dim' local

2 years agomingle: remove a 'flag' parameter that is always set to 0
Matthew Fernandez [Thu, 29 Sep 2022 02:00:58 +0000 (19:00 -0700)]
mingle: remove a 'flag' parameter that is always set to 0

2 years agomingle: remove 'OPENGL' guarded code
Matthew Fernandez [Thu, 29 Sep 2022 01:58:52 +0000 (18:58 -0700)]
mingle: remove 'OPENGL' guarded code

Nothing in the build systems defines this.

2 years agomingle: remove 'open_gl' parameter that is always 0
Matthew Fernandez [Thu, 29 Sep 2022 01:58:07 +0000 (18:58 -0700)]
mingle: remove 'open_gl' parameter that is always 0

2 years agoMerge branch 'smattr/b11d77f1-490c-47a6-83af-656fd86d2318' into 'main'
Matthew Fernandez [Fri, 30 Sep 2022 00:59:23 +0000 (00:59 +0000)]
Merge branch 'smattr/b11d77f1-490c-47a6-83af-656fd86d2318' into 'main'

tests: idiomatic use of Catch2’s 'INFO' macro

See merge request graphviz/graphviz!2867

2 years agotests: idiomatic use of Catch2’s 'INFO' macro
Matthew Fernandez [Wed, 28 Sep 2022 15:32:45 +0000 (08:32 -0700)]
tests: idiomatic use of Catch2’s 'INFO' macro

This is slightly more concise, efficient, and readable.

2 years agoMerge branch 'smattr/ccdbc8f7-27f6-4157-87aa-efdb65bf9bcc' into 'main'
Matthew Fernandez [Thu, 29 Sep 2022 16:36:24 +0000 (16:36 +0000)]
Merge branch 'smattr/ccdbc8f7-27f6-4157-87aa-efdb65bf9bcc' into 'main'

fix erroneous commas in JSON output of graphs with only clusters

Closes #2282

See merge request graphviz/graphviz!2868

2 years agofix erroneous commas in JSON output of graphs with only clusters
Matthew Fernandez [Thu, 29 Sep 2022 01:26:34 +0000 (18:26 -0700)]
fix erroneous commas in JSON output of graphs with only clusters

When a graph or subgraph contained exclusively subnodes that were clusters (that
is, it contained a non-zero number of subnodes, but all of them were clusters),
the output of `-Tjson` would contain an extra comma. This malformed JSON could
not be ingested by most downstream parsers.

This appears to have been a mistake in f82c51fc9644047e9ce80d860fea562e98d3311c
that introduced cluster skipping in the loop that emits nodes in JSON. It did
not account for the earlier part of the containing function that was intended to
early-exit if the loop would have a 0 iteration count.

As noted in the discussion of #2282, a couple of the maintainers believe this
manual JSON writing code is inherently fragile and likely contains more latent
bugs. But we do not have maintainer consensus on migrating to an established
JSON-writing library. This fix attempts to surgically address the current known
bug. But I cannot guarantee it does not introduce others.

Gitlab: fixes #2282

2 years agoMerge branch 'add-fedora-cmake-build-and-test-jobs-to-ci' into 'main'
Magnus Jacobsson [Thu, 29 Sep 2022 15:35:28 +0000 (15:35 +0000)]
Merge branch 'add-fedora-cmake-build-and-test-jobs-to-ci' into 'main'

Add Fedora CMake build and test jobs to CI

See merge request graphviz/graphviz!2866

2 years agoCI: add fedora36-cmake-test job
Magnus Jacobsson [Wed, 28 Sep 2022 12:26:38 +0000 (14:26 +0200)]
CI: add fedora36-cmake-test job

2 years agoCI: add fedora36-cmake-build job
Magnus Jacobsson [Wed, 28 Sep 2022 12:26:32 +0000 (14:26 +0200)]
CI: add fedora36-cmake-build job

2 years agoCI: add fedora35-cmake-test job
Magnus Jacobsson [Wed, 28 Sep 2022 12:25:05 +0000 (14:25 +0200)]
CI: add fedora35-cmake-test job

2 years agoCI: add fedora35-cmake-build job
Magnus Jacobsson [Wed, 28 Sep 2022 12:24:57 +0000 (14:24 +0200)]
CI: add fedora35-cmake-build job

2 years agoMerge branch 'add-ubuntu-20.04-cmake-jobs-to-ci' into 'main'
Magnus Jacobsson [Thu, 29 Sep 2022 13:44:34 +0000 (13:44 +0000)]
Merge branch 'add-ubuntu-20.04-cmake-jobs-to-ci' into 'main'

Add Ubuntu 20.04 CMake jobs to CI

See merge request graphviz/graphviz!2865

2 years agoCI: add ubuntu-20.04-cmake-test job
Magnus Jacobsson [Wed, 28 Sep 2022 12:02:53 +0000 (14:02 +0200)]
CI: add ubuntu-20.04-cmake-test job

2 years agoCI: add ubuntu-20.04-cmake-build job
Magnus Jacobsson [Wed, 28 Sep 2022 12:02:38 +0000 (14:02 +0200)]
CI: add ubuntu-20.04-cmake-build job

2 years agoCI: Install CMake in Ubuntu 20.04 image
Magnus Jacobsson [Wed, 28 Sep 2022 13:05:09 +0000 (15:05 +0200)]
CI: Install CMake in Ubuntu 20.04 image

2 years agoMerge branch 'consistent-os-naming-in-ci' into 'main'
Magnus Jacobsson [Thu, 29 Sep 2022 09:06:14 +0000 (09:06 +0000)]
Merge branch 'consistent-os-naming-in-ci' into 'main'

Rename CI jobs to be consistent with Docker images

See merge request graphviz/graphviz!2864

2 years agoCI: rename ubuntu-22-04* jobs to ubuntu-22.04*
Magnus Jacobsson [Wed, 28 Sep 2022 11:45:09 +0000 (13:45 +0200)]
CI: rename ubuntu-22-04* jobs to ubuntu-22.04*

This is the naming scheme that the Docker images use.

2 years agoCI: rename ubuntu22-04* jobs to ubuntu-22.04*
Magnus Jacobsson [Wed, 28 Sep 2022 11:45:09 +0000 (13:45 +0200)]
CI: rename ubuntu22-04* jobs to ubuntu-22.04*

This is the naming scheme that the Docker images use.

2 years agoCI: rename ubuntu20-04* jobs to ubuntu-20.04*
Magnus Jacobsson [Wed, 28 Sep 2022 11:45:09 +0000 (13:45 +0200)]
CI: rename ubuntu20-04* jobs to ubuntu-20.04*

This is the naming scheme that the Docker images use.

2 years agoCI: rename ubuntu18-04* jobs to ubuntu-18.04*
Magnus Jacobsson [Wed, 28 Sep 2022 11:45:09 +0000 (13:45 +0200)]
CI: rename ubuntu18-04* jobs to ubuntu-18.04*

This is the naming scheme that the Docker images use.

2 years agoMerge branch 'smattr/3b2dd4ad-92ff-457e-9f25-39ed4dab87de' into 'main'
Matthew Fernandez [Wed, 28 Sep 2022 15:53:03 +0000 (15:53 +0000)]
Merge branch 'smattr/3b2dd4ad-92ff-457e-9f25-39ed4dab87de' into 'main'

core plugin: some simplification and clean up of the JSON renderer

See merge request graphviz/graphviz!2863

2 years agocore plugin: pass around 'has_subgs' as a C99 bool
Matthew Fernandez [Tue, 27 Sep 2022 15:31:18 +0000 (08:31 -0700)]
core plugin: pass around 'has_subgs' as a C99 bool

This makes the intent and usage of this variable a little clearer.

2 years agocore plugin: pass around 'top' as a C99 bool
Matthew Fernandez [Tue, 27 Sep 2022 15:28:59 +0000 (08:28 -0700)]
core plugin: pass around 'top' as a C99 bool

This makes the intent and usage of this variable a little clearer.

2 years agocore plugin: make 'IS_CLUSTER' macro a function
Matthew Fernandez [Tue, 27 Sep 2022 15:23:27 +0000 (08:23 -0700)]
core plugin: make 'IS_CLUSTER' macro a function

This improves type safety, while still being inline-able by the compiler.

2 years agocore plugin: abbreviate 'IS_CLUSTER' macro
Matthew Fernandez [Tue, 27 Sep 2022 15:22:28 +0000 (08:22 -0700)]
core plugin: abbreviate 'IS_CLUSTER' macro

2 years agocore plugin isXDot: return a C99 bool
Matthew Fernandez [Tue, 27 Sep 2022 15:21:16 +0000 (08:21 -0700)]
core plugin isXDot: return a C99 bool

This makes the intent of this function slightly clearer.

2 years agocore plugin isXDot: take parameter as a const
Matthew Fernandez [Tue, 27 Sep 2022 15:20:22 +0000 (08:20 -0700)]
core plugin isXDot: take parameter as a const

This function does not modify its input.

2 years agocore plugin isXDot: remove string compare micro-optimization
Matthew Fernandez [Tue, 27 Sep 2022 15:19:14 +0000 (08:19 -0700)]
core plugin isXDot: remove string compare micro-optimization

Modern compilers are able to do this transformation themselves if they have
worked out that it will be faster.

2 years agoMerge branch 'articulation_pos' into 'main'
Mark Hansen [Wed, 28 Sep 2022 08:42:43 +0000 (08:42 +0000)]
Merge branch 'articulation_pos' into 'main'

Remove unused articulation_pos attribute

See merge request graphviz/graphviz!2862

2 years agoRemove unused articulation_pos attribute
Mark Hansen [Tue, 27 Sep 2022 08:07:30 +0000 (18:07 +1000)]
Remove unused articulation_pos attribute

This is never read, and seems to never have been, even going back to the
initial Graphviz git commit 17 years ago.

Towards https://gitlab.com/graphviz/graphviz.gitlab.io/-/issues/75

2 years agoMerge branch 'smattr/a089ff42-68a4-4dcc-8786-eed9d3962195' into 'main'
Matthew Fernandez [Wed, 28 Sep 2022 01:19:59 +0000 (01:19 +0000)]
Merge branch 'smattr/a089ff42-68a4-4dcc-8786-eed9d3962195' into 'main'

smyrna gvpr_select: remove unnecessary dynamic allocation

See merge request graphviz/graphviz!2860