Implement changes from #24

Author: Jose Storopoli

Project.toml

@@ -11,7 +11,7 @@ SimpleTraits = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"
 [compat]
 EzXML = "1"
 Graphs = "1.4"
-ParserCombinator = "2"
+ParserCombinator = "2.1"
 Requires = "1"
 SimpleTraits = "0.9"
 julia = "1"

src/DOT/Dot.jl

@@ -58,27 +58,24 @@ function _dot_read_one_graph(pg::Parsers.DOT.Graph)
     return g
 end
 
+_name(pg::Parsers.DOT.Graph) =
+    pg.id !== nothing ? pg.id.id :
+    Parsers.DOT.StringID(pg.directed ? "digraph" : "graph")
+
 function loaddot(io::IO, gname::String)
     p = Parsers.DOT.parse_dot(read(io, String))
     for pg in p
-        isdir = pg.directed
-        possname = isdir ? Parsers.DOT.StringID("digraph") : Parsers.DOT.StringID("graph")
-        name = get(pg.id, possname).id
-        name == gname && return _dot_read_one_graph(pg)
+        _name(pg) == gname && return _dot_read_one_graph(pg)
     end
     error("Graph $gname not found")
 end
 
 function loaddot_mult(io::IO)
     p = Parsers.DOT.parse_dot(read(io, String))
-
     graphs = Dict{String,AbstractGraph}()
 
     for pg in p
-        isdir = pg.directed
-        possname = isdir ? Parsers.DOT.StringID("digraph") : Parsers.DOT.StringID("graph")
-        name = get(pg.id, possname).id
-        graphs[name] = _dot_read_one_graph(pg)
+        graphs[_name(pg)] = _dot_read_one_graph(pg)
     end
     return graphs
 end

test/graphio.jl

@@ -19,8 +19,8 @@ function gettempname()
     (f, fio) = mktemp()
     close(fio)
     return f
-end 
-        
+end
+
 function read_test(format::Graphs.AbstractGraphFormat, g::Graphs.AbstractGraph, gname::String="g",
     fname::AbstractString=""; testfail=false)
     @test loadgraph(fname, gname, format) == g
@@ -33,7 +33,7 @@ end
 function read_test_mult(format::Graphs.AbstractGraphFormat, d::Dict{String,G}, fname::AbstractString="") where G<: AbstractGraph
     rd = loadgraphs(fname, format)
     @test rd == d
-    
+
 end
 
 function write_test(format::Graphs.AbstractGraphFormat, g::Graphs.AbstractGraph, gname::String="g",