Tools changed to hierarchical FlatCurry libs

CASS/Analysis.curry

@@ -24,8 +24,8 @@ module Analysis(Analysis(..),
                 AOutFormat(..))
   where
 
-import FlatCurry(ConsDecl,FuncDecl,TypeDecl,QName)
-import FlatCurryGoodies(progImports)
+import FlatCurry.Types(ConsDecl,FuncDecl,TypeDecl,QName)
+import FlatCurry.Goodies(progImports)
 import GenericProgInfo(ProgInfo,combineProgInfo,lookupProgInfo)
 import LoadAnalysis(loadCompleteAnalysis,getInterfaceInfos)
 import CurryFiles(getImports)

CASS/AnalysisCollection.curry

@@ -12,8 +12,8 @@ module AnalysisCollection(
   functionAnalysisInfos,registeredAnalysisNames,
   lookupRegAnaWorker,runAnalysisWithWorkers,analyzeMain) where
 
-import FlatCurry
-import FlatCurryGoodies(progImports)
+import FlatCurry.Types
+import FlatCurry.Goodies(progImports)
 import IO
 import IOExts
 import XML

CASS/AnalysisDependencies.curry

@@ -7,8 +7,8 @@
 
 module AnalysisDependencies(getModulesToAnalyze,reduceDependencies) where
 
-import FlatCurry
-import FlatCurryGoodies(progImports)
+import FlatCurry.Types
+import FlatCurry.Goodies(progImports)
 import ReadShowTerm(readQTerm)
 import Directory(doesFileExist,getModificationTime)
 import Distribution(findFileInLoadPath)

CASS/CurryFiles.curry

@@ -10,8 +10,9 @@ module CurryFiles(getImports,findModuleSourceInLoadPath,
                   getSourceFileTime,getFlatCurryFileTime,
                   readNewestFlatCurry) where
 
-import FlatCurry
-import FlatCurryGoodies(progImports)
+import FlatCurry.Types
+import FlatCurry.Files
+import FlatCurry.Goodies(progImports)
 import Directory(doesFileExist,getModificationTime)
 import Distribution(lookupFileInLoadPath,lookupModuleSourceInLoadPath)
 import Time(ClockTime)

CASS/FlatCurryDependency.curry

@@ -7,7 +7,7 @@
 
 module FlatCurryDependency(dependsDirectlyOnTypes,callsDirectly) where
 
-import FlatCurry
+import FlatCurry.Types
 import List
 import SetRBT
 

CASS/GenericProgInfo.curry

@@ -11,7 +11,7 @@ import Configuration(debugMessage)
 import Directory(removeFile)
 import FiniteMap
 import FilePath((<.>))
-import FlatCurry
+import FlatCurry.Types
 import XML
 
 --- Type to represent analysis information.

CASS/LoadAnalysis.curry

@@ -17,7 +17,7 @@ import Configuration(debugMessage,getWithPrelude)
 import IO
 import FiniteMap
 import ReadShowTerm(readQTerm,showQTerm)
-import FlatCurry(QName)
+import FlatCurry.Types(QName)
 import CurryFiles(findModuleSourceInLoadPath)
 
 

CASS/ServerFunctions.curry

@@ -9,8 +9,9 @@
 
 module ServerFunctions where
 
-import FlatCurry(QName,readFlatCurryInt)
-import FlatCurryGoodies(progImports)
+import FlatCurry.Types   (QName)
+import FlatCurry.Files   (readFlatCurryInt)
+import FlatCurry.Goodies (progImports)
 import Socket(Socket(..),listenOnFresh,sClose,waitForSocketAccept)
 import IO(Handle(..),hClose,hFlush,hGetLine,hPutStrLn,hWaitForInput,hWaitForInputs)
 import ReadShowTerm(readQTerm,showQTerm)

CASS/WorkerFunctions.curry

@@ -8,8 +8,9 @@
 
 module WorkerFunctions where
 
-import FlatCurry
-import FlatCurryGoodies
+import FlatCurry.Types
+import FlatCurry.Files
+import FlatCurry.Goodies
 import ReadShowTerm(readQTerm,showQTerm)
 import List(partition)
 import IOExts

analysis/Demandedness.curry

@@ -11,8 +11,8 @@ module Demandedness
  where
 
 import Analysis
-import FlatCurry
-import FlatCurryGoodies
+import FlatCurry.Types
+import FlatCurry.Goodies
 import List((\\),intercalate)
 
 ------------------------------------------------------------------------------

analysis/Deterministic.curry

@@ -12,8 +12,8 @@ module Deterministic(overlapAnalysis,showOverlap,showDet,
                      Deterministic(..),nondetAnalysis) where
 
 import Analysis
-import FlatCurry
-import FlatCurryGoodies
+import FlatCurry.Types
+import FlatCurry.Goodies
 
 ------------------------------------------------------------------------------
 -- The overlapping analysis can be applied to individual functions.

analysis/Groundness.curry

@@ -9,7 +9,7 @@
 module Groundness(Ground(..),showGround,groundAnalysis,
                   NDEffect(..),showNDEffect,ndEffectAnalysis) where
 
-import FlatCurry
+import FlatCurry.Types
 import List
 import Analysis
 import GenericProgInfo

analysis/HigherOrder.curry

@@ -5,8 +5,8 @@
 module HigherOrder(Order(..),showOrder,hiOrdType,hiOrdCons,hiOrdFunc) where
 
 import Analysis
-import FlatCurry
-import FlatCurryGoodies
+import FlatCurry.Types
+import FlatCurry.Goodies
 import Maybe
 import GenericProgInfo
 

analysis/Indeterministic.curry

@@ -12,7 +12,7 @@
 module Indeterministic(indetAnalysis,showIndet) where
 
 import Analysis
-import FlatCurry
+import FlatCurry.Types
 
 ------------------------------------------------------------------------------
 --- The indeterminism analysis is a global function dependency analysis.

analysis/OLD/AnaCompleteness.curry

@@ -11,7 +11,7 @@
 
 module AnaCompleteness(CompletenessType(..),analyseCompleteness) where
 
-import FlatCurry
+import FlatCurry.Types
 
 
 ------------------------------------------------------------------------------

analysis/OLD/AnaDependency.curry

@@ -6,7 +6,7 @@
 
 module AnaDependency(funsInExpr, indirectlyDependent) where
 
-import FlatCurry
+import FlatCurry.Types
 import List
 import SetRBT
 import Sort(leqString)

analysis/OLD/AnaOpComplete.curry

@@ -8,7 +8,7 @@
 
 module AnaOpComplete(analyseOpCompleteness)   where
 
-import FlatCurry
+import FlatCurry.Types
 import List
 import AnaDependency
 

analysis/OLD/AnaOverlapping.curry

@@ -8,7 +8,7 @@
 
 module AnaOverlapping(analyseOverlappings,orInExpr) where
 
-import FlatCurry
+import FlatCurry.Types
 
 ------------------------------------------------------------------------------
 -- The overlapping analysis can be applied to individual modules.

analysis/RequiredValue.curry

@@ -17,8 +17,8 @@ module RequiredValue(AType(..),showAType,AFType(..),showAFType,lubAType,
  where
 
 import Analysis
-import FlatCurry
-import FlatCurryGoodies
+import FlatCurry.Types
+import FlatCurry.Goodies
 import GenericProgInfo
 import List
 import Sort(mergeSort)

analysis/RequiredValues.curry

@@ -17,8 +17,8 @@ module RequiredValues(AType(..),showAType,AFType(..),showAFType,lubAType,
  where
 
 import Analysis
-import FlatCurry
-import FlatCurryGoodies
+import FlatCurry.Types
+import FlatCurry.Goodies
 import GenericProgInfo
 import List hiding (union,intersect)
 import Sort(mergeSort)