From 90b2527b7399105aa960dce470ab7bb70dc522ef Mon Sep 17 00:00:00 2001
From: Michael Hanus <mh@informatik.uni-kiel.de>
Date: Thu, 3 Jan 2019 13:24:27 +0100
Subject: [PATCH] Imports updated

---
 package.json                     | 4 +++-
 src/Rewriting/Files.curry        | 3 ++-
 src/Rewriting/Narrowing.curry    | 3 ++-
 src/Rewriting/Substitution.curry | 3 ++-
 src/Rewriting/Term.curry         | 3 ++-
 src/Rewriting/Unification.curry  | 3 ++-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 14c8a10..a7d68c2 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
        PAKCS/KiCS2 distributions.",
     "category": [ "Rewriting", "Narrowing" ],
     "dependencies": {
-        "abstract-curry": ">= 2.0.0"
+        "base"          : ">= 1.0.0, < 2.0.0",
+        "abstract-curry": ">= 2.0.0",
+        "finite-map"    : ">= 0.0.1"
     },
     "compilerCompatibility": {
         "pakcs": ">= 2.0.0",
diff --git a/src/Rewriting/Files.curry b/src/Rewriting/Files.curry
index 7c28ac8..1b683bd 100644
--- a/src/Rewriting/Files.curry
+++ b/src/Rewriting/Files.curry
@@ -16,7 +16,8 @@ module Rewriting.Files
 
 import AbstractCurry.Files (tryReadCurryFile)
 import AbstractCurry.Types
-import FiniteMap (FM, listToFM)
+import Data.FiniteMap (FM, listToFM)
+
 import Rewriting.Rules (Rule, TRS, rCons)
 import Rewriting.Substitution
 import Rewriting.Term (Term (..), tConst)
diff --git a/src/Rewriting/Narrowing.curry b/src/Rewriting/Narrowing.curry
index 524bcfd..4f50e66 100644
--- a/src/Rewriting/Narrowing.curry
+++ b/src/Rewriting/Narrowing.curry
@@ -15,9 +15,10 @@ module Rewriting.Narrowing
   , dotifyNarrowingTree, writeNarrowingTree
   ) where
 
-import FiniteMap (eltsFM)
 import Maybe (fromMaybe, mapMaybe)
 import List (maximum)
+
+import Data.FiniteMap (eltsFM)
 import Rewriting.DefinitionalTree
 import Rewriting.Position
 import Rewriting.Rules
diff --git a/src/Rewriting/Substitution.curry b/src/Rewriting/Substitution.curry
index acb50e6..a35e2e7 100644
--- a/src/Rewriting/Substitution.curry
+++ b/src/Rewriting/Substitution.curry
@@ -12,10 +12,11 @@ module Rewriting.Substitution
   , applySubstEq, applySubstEqs, restrictSubst, composeSubst
   ) where
 
-import FiniteMap
 import Function (both)
 import List (intercalate)
 import Maybe (fromMaybe)
+
+import Data.FiniteMap
 import Rewriting.Term
 
 -- ---------------------------------------------------------------------------
diff --git a/src/Rewriting/Term.curry b/src/Rewriting/Term.curry
index 72da075..154ff43 100644
--- a/src/Rewriting/Term.curry
+++ b/src/Rewriting/Term.curry
@@ -19,10 +19,11 @@ module Rewriting.Term
   ) where
 
 import Char      ( isAlphaNum )
-import FiniteMap ( listToFM, lookupFM )
 import List      ( nub, intercalate, maximum, minimum )
 import Maybe     ( fromMaybe )
 
+import Data.FiniteMap ( listToFM, lookupFM )
+
 -- ---------------------------------------------------------------------------
 -- Representation of first-order terms and term equations
 -- ---------------------------------------------------------------------------
diff --git a/src/Rewriting/Unification.curry b/src/Rewriting/Unification.curry
index 69a0211..a54e88d 100644
--- a/src/Rewriting/Unification.curry
+++ b/src/Rewriting/Unification.curry
@@ -15,8 +15,9 @@ module Rewriting.Unification
   ) where
 
 import Either (isRight)
-import FiniteMap (FM, emptyFM, addToFM, lookupFM)
 import List (mapAccumL)
+
+import Data.FiniteMap (FM, emptyFM, addToFM, lookupFM)
 import Rewriting.Substitution (Subst, emptySubst, extendSubst)
 import Rewriting.Term (VarIdx, Term (..), TermEq, TermEqs)
 import Rewriting.UnificationSpec (UnificationError (..), showUnificationError)
-- 
GitLab