GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

removed mention of 2.9 welcome, and some traces in visualization

Browse Source
This commit is contained in:
aarne
2010-04-22 06:36:37 +00:00
parent a17f3d4262
commit dc971bd051
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/GFI.hs
View File

@@ -252,7 +252,6 @@ welcome = unlines [
" ", " ",
"This is GF version "++showVersion version++". ", "This is GF version "++showVersion version++". ",
"License: see help -license. ", "License: see help -license. ",
"Differences from GF 2.9: see help -changes.",
"Bug reports: http://code.google.com/p/grammatical-framework/issues/list" "Bug reports: http://code.google.com/p/grammatical-framework/issues/list"
] ]

14
src/runtime/haskell/PGF/VisualizeTree.hs
View File

@@ -95,10 +95,11 @@ graphvizDependencyTree format debug mlab ms pgf lang exp = case format of
where where
lin2dep format = trace (ifd (show sortedNodes ++ show nodeWords)) $ case format of lin2dep format = -- trace (ifd (show sortedNodes ++ show nodeWords)) $
"malt" -> map (concat . intersperse "\t") wnodes case format of
"malt_input" -> map (concat . intersperse "\t" . take 6) wnodes "malt" -> map (concat . intersperse "\t") wnodes
_ -> prelude ++ nodes ++ links "malt_input" -> map (concat . intersperse "\t" . take 6) wnodes
_ -> prelude ++ nodes ++ links
ifd s = if debug then s else [] ifd s = if debug then s else []
@@ -190,7 +191,7 @@ getDepLabels ss = Map.fromList [(mkCId f,ls) | f:ls <- map words ss]
graphvizParseTree :: PGF -> CId -> Expr -> String graphvizParseTree :: PGF -> CId -> Expr -> String
graphvizParseTree pgf lang = prGraph False . lin2tree pgf . concat . take 1 . markLinearizes pgf lang where graphvizParseTree pgf lang = prGraph False . lin2tree pgf . concat . take 1 . markLinearizes pgf lang where
lin2tree pgf s = trace s $ prelude ++ nodes ++ links where lin2tree pgf s = prelude ++ nodes ++ links where
prelude = ["rankdir=BU ;", "node [shape = record, color = white] ;"] prelude = ["rankdir=BU ;", "node [shape = record, color = white] ;"]
@@ -241,7 +242,8 @@ graphvizAlignment pgf = prGraph True . lin2graph . linsMark where
linsMark t = [concat (take 1 (markLinearizes pgf la t)) | la <- Map.keys (concretes pgf)] linsMark t = [concat (take 1 (markLinearizes pgf la t)) | la <- Map.keys (concretes pgf)]
lin2graph :: [String] -> [String] lin2graph :: [String] -> [String]
lin2graph ss = trace (show ss) $ prelude ++ nodes ++ links lin2graph ss = -- trace (show ss) $
prelude ++ nodes ++ links
where where