Commit 940a006f authored by Mart Lubbers's avatar Mart Lubbers

Merge branch 'setFold' into 'hierarchical'

adapt to changed Data.Set module

See merge request !4
parents 560b1ec4 366b6809
...@@ -4,7 +4,7 @@ import StdList, StdFunc, StdTuple, StdBool ...@@ -4,7 +4,7 @@ import StdList, StdFunc, StdTuple, StdBool
import Sapl.SaplStruct import Sapl.SaplStruct
from Data.Set import qualified newSet, fromList, toList, member, difference, insert, filter, delete, null from Data.Set import qualified newSet, fromList, toList, member, difference, insert, filter, delete, null
from Data.Set import :: Set from Data.Set import :: Set, instance Foldable Set
from Data.Map import qualified fromList, get from Data.Map import qualified fromList, get
instance == SaplVar instance == SaplVar
...@@ -52,5 +52,3 @@ where ...@@ -52,5 +52,3 @@ where
| 'Data.Set'.null ('Data.Set'.filter (\e = snd e == m) edges) | 'Data.Set'.null ('Data.Set'.filter (\e = snd e == m) edges)
= (edges, [m:out]) = (edges, [m:out])
= (edges, out) = (edges, out)
\ No newline at end of file
...@@ -4,7 +4,7 @@ import StdList, StdFunc, StdTuple, StdBool ...@@ -4,7 +4,7 @@ import StdList, StdFunc, StdTuple, StdBool
import Sapl.SaplStruct import Sapl.SaplStruct
from Data.Set import qualified newSet, fromList, toList, member, difference, insert, filter, delete, null from Data.Set import qualified newSet, fromList, toList, member, difference, insert, filter, delete, null
from Data.Set import :: Set from Data.Set import :: Set, instance Foldable Set
from Data.Map import qualified fromList, get from Data.Map import qualified fromList, get
instance == SaplVar instance == SaplVar
...@@ -52,5 +52,3 @@ where ...@@ -52,5 +52,3 @@ where
| 'Data.Set'.null ('Data.Set'.filter (\e = snd e == m) edges) | 'Data.Set'.null ('Data.Set'.filter (\e = snd e == m) edges)
= (edges, [m:out]) = (edges, [m:out])
= (edges, out) = (edges, out)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment