Add filenames in vhier --xml cells, update vhier --inputs format

Author: wsnyder

Changes

@@ -6,6 +6,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 * Verilog-Perl 3.473 devel
 
+****  Add filenames in vhier --xml cells.
+
 ****  Fix duplicates in vhier --includes. [Gregory Pierce]
 
 

t/85_vhier_xml.out

@@ -1,12 +1,12 @@
 <vhier>
  <cells>
-  <cell name="v_hier_top" submodname="v_hier_top" hier="v_hier_top">
-    <cell name="recursive" submodname="v_recursive" hier="v_hier_top.recursive">
+  <cell name="v_hier_top" submodname="v_hier_top" hier="v_hier_top" filename="verilog/v_hier_top.v">
+    <cell name="recursive" submodname="v_recursive" hier="v_hier_top.recursive" filename="verilog/v_recursive.v">
     </cell>
-    <cell name="sub" submodname="v_hier_sub" hier="v_hier_top.sub">
-      <cell name="subsub0" submodname="v_hier_subsub" hier="v_hier_top.sub.subsub0">
+    <cell name="sub" submodname="v_hier_sub" hier="v_hier_top.sub" filename="verilog/v_hier_sub.v">
+      <cell name="subsub0" submodname="v_hier_subsub" hier="v_hier_top.sub.subsub0" filename="verilog/v_hier_subsub.v">
       </cell>
-      <cell name="subsub2" submodname="v_hier_subsub" hier="v_hier_top.sub.subsub2">
+      <cell name="subsub2" submodname="v_hier_subsub" hier="v_hier_top.sub.subsub2" filename="verilog/v_hier_subsub.v">
       </cell>
     </cell>
   </cell>
@@ -25,8 +25,9 @@
   <file>verilog/v_recursive.v</file>
  </input_files>
  <includes>
-  <file>verilog/v_hier_top.v</file>
-    <inc>v_hier_inc.vh</inc>
+  <file name="verilog/v_hier_top.v">
+    <inc name="v_hier_inc.vh" />
+  </file>
  </includes>
  <missing_modules>
   <module name="missing" />

vhier

@@ -204,11 +204,12 @@ sub vhier {
 	$fh->print(" <includes>\n") if $Opt_Xml;
 	foreach my $filename (sort keys %{$Opt->includes}) {
 	    $fh->print("  $filename\n") if !$Opt_Xml;
-	    $fh->print("  <file>$filename</file>\n") if $Opt_Xml;
+	    $fh->print("  <file name=\"$filename\">\n") if $Opt_Xml;
 	    foreach my $incname (sort keys %{$Opt->{includes}{$filename}}) {
 		$fh->print("    $incname\n") if !$Opt_Xml;
-		$fh->print("    <inc>$incname</inc>\n") if $Opt_Xml;
+		$fh->print("    <inc name=\"$incname\" />\n") if $Opt_Xml;
 	    }
+	    $fh->print("  </file>\n") if $Opt_Xml;
 	}
 	$fh->print(" </includes>\n") if $Opt_Xml;
     }
@@ -347,12 +348,14 @@ sub show_hier {
     my $instance = $parcell ? $parcell->name : $name;
 
     # print the mod instance
-    $Opt_Xml ?
-        $fh->printf("%s<cell name=\"%s\" submodname=\"%s\" hier=\"%s\">\n",
-            $indent, $parcell ? $parcell->name : $name, $name, $hier) :
-            $Opt_Instance ?
-                $fh->printf("%s%s %s\n", $indent, $instance, $name) :
-                $fh->printf("%s%s\n",    $indent,            $name);
+    $fh->printf("%s<cell name=\"%s\" submodname=\"%s\" hier=\"%s\" filename=\"%s\">\n",
+		$indent, ($parcell ? $parcell->name : $name), $name, $hier,
+		$mod->filename)
+        if $Opt_Xml;
+    $fh->printf("%s%s %s\n", $indent, $instance, $name)
+	if !$Opt_Xml && $Opt_Instance;
+    $fh->printf("%s%s\n",    $indent,            $name)
+	if !$Opt_Xml && !$Opt_Instance;
 
     # print the design hierarchy of each cell in mod
     my $i = 0;