From db544b1cc9ee72c87dd6bbd094f6985b9e436186 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Thu, 22 Nov 2012 15:27:16 +0000
Subject: [PATCH] PGFService.hs: fix type error caused by change to
 PGF.graphvizParseTree

Note that some of the graphviz functions have backwards incompatible changes
that might also affect other clients of the PGF run-time library.

Also added graphvizDefaults and export it together with GraphvizOptions from
the PGF run-time library.
---
 src/runtime/haskell/PGF.hs               | 2 ++
 src/runtime/haskell/PGF/VisualizeTree.hs | 3 +++
 src/server/PGFService.hs                 | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/runtime/haskell/PGF.hs b/src/runtime/haskell/PGF.hs
index 010c9a7ef..b368d583d 100644
--- a/src/runtime/haskell/PGF.hs
+++ b/src/runtime/haskell/PGF.hs
@@ -122,6 +122,8 @@ module PGF(
            graphvizBracketedString,
            graphvizAlignment,
            gizaAlignment,
+           GraphvizOptions(..),
+           graphvizDefaults,
  
            -- * Probabilities
            Probabilities,
diff --git a/src/runtime/haskell/PGF/VisualizeTree.hs b/src/runtime/haskell/PGF/VisualizeTree.hs
index c9a5686fc..0cb323b92 100644
--- a/src/runtime/haskell/PGF/VisualizeTree.hs
+++ b/src/runtime/haskell/PGF/VisualizeTree.hs
@@ -17,6 +17,7 @@
 
 module PGF.VisualizeTree 
              ( GraphvizOptions(..)
+             , graphvizDefaults
              , graphvizAbstractTree
              , graphvizParseTree
              , graphvizParseTreeOld
@@ -58,6 +59,8 @@ data GraphvizOptions = GraphvizOptions {noLeaves :: Bool,
                                         leafEdgeStyle :: String
                                        }
 
+graphvizDefaults = GraphvizOptions False False False "" "" "" "" "" ""
+
 
 -- | Renders abstract syntax tree in Graphviz format
 graphvizAbstractTree :: PGF -> (Bool,Bool) -> Tree -> String
diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index ebb32f4b9..908325c19 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -338,7 +338,7 @@ outputGraphviz code =
         _     -> "application/binary"
 
 abstrTree pgf tree      = PGF.graphvizAbstractTree pgf (True,True) tree
-parseTree pgf lang tree = PGF.graphvizParseTree pgf lang tree
+parseTree pgf lang tree = PGF.graphvizParseTree pgf lang PGF.graphvizDefaults tree
 alignment pgf tree      = PGF.graphvizAlignment pgf (PGF.languages pgf) tree
 
 pipeIt2graphviz :: String -> String -> IO BS.ByteString