summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2012-11-22 15:27:16 +0000
committerhallgren <hallgren@chalmers.se>2012-11-22 15:27:16 +0000
commitdb544b1cc9ee72c87dd6bbd094f6985b9e436186 (patch)
treec96255a4a7f7bb39343c2fe7c5252af8d86651da /src
parentbac6b7fe6438d06fab3451263d4d94e9055f6f88 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/runtime/haskell/PGF.hs2
-rw-r--r--src/runtime/haskell/PGF/VisualizeTree.hs3
-rw-r--r--src/server/PGFService.hs2
3 files changed, 6 insertions, 1 deletions
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