fix(dag_from_json): simplify by adding vertex constructors

Author: everythingfunctional

src/dag_s.f90

@@ -124,34 +124,7 @@ end function toposort
 
     select type (vertices => maybe_vertices%value_())
     type is (json_array_t)
-
-      associate(nvertices => vertices%length())
-        allocate(dag%vertices(nvertices))
-        block
-          integer i
-          call dag%vertices%set_vertex_id( [(i,i=1,nvertices)] )
-        end block
-      end associate
-
-      block
-        integer i
-        do i = 1, vertices%length()
-          associate(maybe_vertex => vertices%get_element(i))
-            associate(errors => maybe_vertex%errors())
-              call assert(.not. errors%has_any(), "dag_s construct_from_json: .not. errors%has_any()", char(errors%to_string()))
-            end associate
-
-            select type (vertex_json => maybe_vertex%value_())
-            class default
-              call assert(.false., "dag_s construct_from_json: vertex was not an object", char(vertex_json%to_compact_string()))
-            type is (json_object_t)
-              associate(dag_vertex => vertex_t(vertex_json))
-                call dag%vertices(i)%set_edges(dag_vertex%edges)
-              end associate
-            end select
-          end associate
-        end do
-      end block
+      dag%vertices = vertex_t(vertices%get_elements())
 
     class default
       call assert(.false., "dag%from_json: vertices was not an array", char(vertices%to_compact_string()))

src/vertex_m.f90

@@ -3,7 +3,7 @@ module vertex_m
   !! version: v1.0
   !! date: 2020-Nov-30
   !! license: Copyright (c) 2020-2021, Sourcery Institute, BSD 3-clause license Copyright (c) 2018 Jacob Williams
-    use jsonff, only : json_object_t
+    use jsonff, only : json_element_t, json_object_t, json_value_t
     use iso_varying_string, only : varying_string, len
 
     implicit none
@@ -38,13 +38,19 @@ module vertex_m
     end type vertex_t
 
     interface vertex_t
-      
-      module function from_json(json_object) result(vertex)
+
+      impure elemental module function from_json_element(json_element) result(vertex)
+        implicit none
+        type(json_element_t), intent(in) :: json_element
+        type(vertex_t) :: vertex
+      end function
+
+      module function from_json_value(json_value) result(vertex)
         implicit none
-        type(json_object_t), intent(in) :: json_object
+        class(json_value_t), intent(in) :: json_value
         type(vertex_t) :: vertex
       end function
-  
+
       pure module function construct_from_components(identifier, edges, label, attributes) result(vertex)
         implicit none
         integer, intent(in) :: identifier
@@ -53,11 +59,17 @@ pure module function construct_from_components(identifier, edges, label, attribu
         type(varying_string), intent(in), optional :: attributes
         type(vertex_t) vertex
       end function
-      
+
     end interface
 
     interface
 
+        module function from_json_object(json_object) result(vertex)
+          implicit none
+          type(json_object_t), intent(in) :: json_object
+          type(vertex_t) :: vertex
+        end function
+
        module subroutine set_edge_vector(self,edges)
          !! Define the vertices on which this vertex depends on
          implicit none

src/vertex_s.f90

@@ -3,7 +3,6 @@
       fallible_json_string_t, &
       fallible_json_value_t, &
       json_array_t, &
-      json_element_t, &
       json_number_t, &
       json_string_t, &
       json_integer_t
@@ -69,7 +68,20 @@
     vertex%defined_ = .true.
   end procedure
 
-  module procedure from_json
+  module procedure from_json_element
+    vertex = vertex_t(json_element%value_())
+  end procedure
+
+  module procedure from_json_value
+    select type (json_value)
+    type is (json_object_t)
+      vertex = from_json_object(json_value)
+    class default
+      call assert(.false., "vertex%from_json_value: vertex was not an object", char(json_value%to_compact_string()))
+    end select
+  end procedure
+
+  module procedure from_json_object
     type(error_list_t) :: errors
     type(fallible_json_value_t) :: maybe_edge
     type(fallible_json_value_t) :: maybe_edges