From e0dc9c80a6cbb45254f7e20d50894267aa2a3532 Mon Sep 17 00:00:00 2001 From: krasimir Date: Wed, 19 May 2010 13:32:39 +0000 Subject: now every BracketedString also has reference to the source expression(s) --- src/runtime/haskell/PGF/VisualizeTree.hs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/runtime/haskell/PGF/VisualizeTree.hs') diff --git a/src/runtime/haskell/PGF/VisualizeTree.hs b/src/runtime/haskell/PGF/VisualizeTree.hs index 098d6a07f..542044b2d 100644 --- a/src/runtime/haskell/PGF/VisualizeTree.hs +++ b/src/runtime/haskell/PGF/VisualizeTree.hs @@ -22,7 +22,7 @@ module PGF.VisualizeTree , graphvizBracketedString , graphvizAlignment , getDepLabels - ) where + ) where import PGF.CId (CId,showCId,ppCId,mkCId) import PGF.Data @@ -122,8 +122,8 @@ graphvizDependencyTree format debug mlab ms pgf lang t = render $ getLeaves parent bs = case bs of - Leaf w -> [(parent,w)] - Bracket _ fid _ bss -> concatMap (getLeaves fid) bss + Leaf w -> [(parent,w)] + Bracket _ fid _ _ bss -> concatMap (getLeaves fid) bss mkNode (p,i,w) = tag p <> text " [label = " <> doubleQuotes (int i <> char '.' <+> text w) <> text "] ;" @@ -234,13 +234,13 @@ graphvizBracketedString = render . lin2tree getLeaves level parent bs = case bs of - Leaf w -> [(level-1,parent,w)] - Bracket _ fid i bss -> concatMap (getLeaves (level+1) fid) bss + Leaf w -> [(level-1,parent,w)] + Bracket _ fid i _ bss -> concatMap (getLeaves (level+1) fid) bss getInterns level [] = [] getInterns level nodes = - nub [(level-1,parent,fid,showCId cat) | (parent,Bracket cat fid _ _) <- nodes] : - getInterns (level+1) [(fid,child) | (_,Bracket _ fid _ children) <- nodes, child <- children] + nub [(level-1,parent,fid,showCId cat) | (parent,Bracket cat fid _ _ _) <- nodes] : + getInterns (level+1) [(fid,child) | (_,Bracket _ fid _ _ children) <- nodes, child <- children] mkStruct l cs = struct l <> text "[label = \"" <> fields cs <> text "\"] ;" $$ vcat [link pl pid l id | (pl,pid,id,_) <- cs] @@ -290,8 +290,8 @@ graphvizAlignment pgf langs = render . lin2graph . linsBracketed getLeaves parent bs = case bs of - Leaf w -> [(parent,w)] - Bracket _ fid _ bss -> concatMap (getLeaves fid) bss + Leaf w -> [(parent,w)] + Bracket _ fid _ _ bss -> concatMap (getLeaves fid) bss mkLayers l [] = empty mkLayers l (cs:css) = struct l <> text "[label = \"" <> fields cs <> text "\"] ;" $$ -- cgit v1.2.3