rgleichman/glance
1
1
Fork 0
mirror of https://github.com/rgleichman/glance.git synced 2024-09-11 15:05:41 +03:00
Code Issues Projects Releases Wiki Activity

Fix edge transfer for embedded pattern apply.

Browse Source
This commit is contained in:
Robbie Gleichman 2016-11-27 18:07:14 -08:00
parent 02446b5b15
commit 860e00a724
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/GraphAlgorithms.hs
View File

@ -166,11 +166,9 @@ childCanBeEmbedded parentNode graph child =
findChildEdgesToTransfer :: ING.Graph gr => ING.Node -> [ING.Node] -> gr a b-> [ING.LEdge b]
findChildEdgesToTransfer parentNode nodes graph = concatMap makeLabelledGraphEdges nodes where
makeLabelledGraphEdges childNode = changeEdgeToParent parentNode childNode <$>
-- TODO FIX ME. Does not work for pattern apply.
--filter (not . edgeGoesToParent parentNode)
--(ING.inn graph childNode ++ ING.out graph childNode)
ING.inn graph childNode
++
filter (not. edgeGoesToParent parentNode) (ING.out graph childNode)
edgeGoesToParent :: ING.Node -> ING.LEdge b -> Bool
edgeGoesToParent parentNode (fromNode, toNode, _)

4
test/AllTests.hs
View File

@ -497,13 +497,13 @@ collapseTestStrings = [
makeCollapseTest :: String -> IO (Diagram B)
makeCollapseTest str = do
before <- renderFglGraph fglGraph
after <- renderFglGraph collapsedGraph
afterCollapse <- renderFglGraph collapsedGraph
pure $ vsep 1 [
expressionText,
beforeText,
before,
afterText,
after]
afterCollapse]
where
fglGraph = syntaxGraphToFglGraph $ stringToSyntaxGraph str
collapsedGraph = collapseNodes fglGraph

1
todo.txt
View File

@ -1,5 +1,4 @@
-- TODO Now --
Fix child edge transfer for embedded pattern apply.
-- TODO Later --
-- Add documentation.