From 4bac2671b43cb04bd64f9bead3144cc5f7f87c8c Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Thu, 21 Nov 2013 16:29:41 -0800
Subject: [PATCH] Fix bug with AST output

---
 astprinter.d           |  2 +-
 scripts/README.md      | 10 ++++++++
 scripts/importgraph.sh |  9 +++++++
 scripts/uml.sh         |  3 +++
 scripts/uml.xsl        | 55 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 scripts/README.md
 create mode 100755 scripts/importgraph.sh
 create mode 100755 scripts/uml.sh
 create mode 100644 scripts/uml.xsl

diff --git a/astprinter.d b/astprinter.d
index f6c2d47..1b7ed06 100644
--- a/astprinter.d
+++ b/astprinter.d
@@ -322,7 +322,7 @@ class XMLPrinter : ASTVisitor
 			output.writeln("<continueStatement/>");
 		else
 			output.writeln("<continueStatement label=\"",
-				continueStatement.label, "\"/>");
+				continueStatement.label.value, "\"/>");
 	}
 
 	override void visit(DebugCondition debugCondition)
diff --git a/scripts/README.md b/scripts/README.md
new file mode 100644
index 0000000..d339b6f
--- /dev/null
+++ b/scripts/README.md
@@ -0,0 +1,10 @@
+# Extra Scripts
+Extra scripts that use DScanner to produce their output. These scripts assume a UNIX environment.
+
+### importgraph.sh
+Displays a graph of the imports of the given D files.
+Requires Imagemagick and Graphviz
+
+### uml.sh
+Displays a basic class diagram of classes, structs, and interfaces in the given D file.
+Requires Imagemagic, XSLTProc, and Graphviz
\ No newline at end of file
diff --git a/scripts/importgraph.sh b/scripts/importgraph.sh
new file mode 100755
index 0000000..0c9c1a1
--- /dev/null
+++ b/scripts/importgraph.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+output=$(echo "digraph {")
+for i in "$@"; do
+    m=$(echo $i | sed -e "s/^\.\///" -e "s/\//\./g" -e "s/\.d$//")
+    output=$output$(dscanner --imports $i 2>/dev/null | sort | uniq | xargs -I{} echo "\"" $m "\"->\"" {} "\";")
+done
+output=$output$(echo "}")
+echo $output | unflatten -l 3 -f | dot -Tpng > out.png
+display out.png
diff --git a/scripts/uml.sh b/scripts/uml.sh
new file mode 100755
index 0000000..51ae6b9
--- /dev/null
+++ b/scripts/uml.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+dscanner $1 --ast | xsltproc uml.xsl - | dot -Tpng > $(basename $1 .d).png
+#dscanner $1 --ast | xsltproc uml.xsl - | dot -Tpng | display -
\ No newline at end of file
diff --git a/scripts/uml.xsl b/scripts/uml.xsl
new file mode 100644
index 0000000..bba7b60
--- /dev/null
+++ b/scripts/uml.xsl
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+    <xsl:output indent="no" omit-xml-declaration="yes"/>
+    <xsl:template match="module">
+digraph {
+        <xsl:for-each select="//interfaceDeclaration">
+            <xsl:value-of select="./name"/>
+            <xsl:value-of select="'[shape=&quot;record&quot; label=&quot;{'"/>
+            <xsl:value-of select="'&lt;&lt;interface&gt;&gt;\n'"/>
+            <xsl:value-of select="./name"/>
+            <xsl:call-template name="bodyHandler"/>
+        </xsl:for-each>    
+        <xsl:for-each select="//structDeclaration">
+            <xsl:value-of select="./name"/>
+            <xsl:value-of select="'[shape=&quot;record&quot; label=&quot;{'"/>
+            <xsl:value-of select="'&lt;&lt;struct&gt;&gt;\n'"/>
+            <xsl:value-of select="./name"/>
+            <xsl:call-template name="bodyHandler"/>
+        </xsl:for-each>
+        <xsl:for-each select="//classDeclaration">
+            <xsl:value-of select="./name"/>
+            <xsl:value-of select="'[shape=&quot;record&quot; label=&quot;{'"/>
+            <xsl:value-of select="./name"/>
+            <xsl:call-template name="bodyHandler"/>
+        </xsl:for-each>
+}
+    </xsl:template>
+    <xsl:template name="bodyHandler">
+        <xsl:value-of select="'|'"/>
+        <xsl:for-each select="./structBody/declaration/functionDeclaration">
+            <xsl:value-of select="name"/>
+            <xsl:value-of select="'('"/>
+            <xsl:for-each select="./parameters/parameter">
+                <xsl:value-of select="./name"/>
+                <xsl:value-of select="' : '"/>
+                <xsl:value-of select="./type/@pretty"/>
+            </xsl:for-each>
+            <xsl:value-of select="')'"/>
+            <xsl:value-of select="' : '"/>
+            <xsl:value-of select="./type/@pretty"/>
+            <xsl:value-of select="'\l'"/>
+        </xsl:for-each>
+        <xsl:value-of select="'|'"/>
+        <xsl:for-each select="./structBody/declaration/variableDeclaration">
+            <xsl:variable name="type" select="./type/@pretty"/>
+            <xsl:for-each select="./declarator">
+                <xsl:value-of select="name"/>
+                <xsl:value-of select="' : '"/>
+                <xsl:value-of select="$type"/>
+                <xsl:value-of select="'\l'"/>
+            </xsl:for-each>
+        </xsl:for-each>
+        <xsl:value-of select="'}&quot;];'"/>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file