aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohnvg2011-11-08 12:59:28 +0000
committerjohnvg2011-11-08 12:59:28 +0000
commite599ee809d75a1b529204475b29657039a44dc8b (patch)
tree59db0d038ff23e55707afdca7238df642b37c72e
parentremove differences in layout between the compiler and the iTask compiler (diff)
remove unnecessary imports of module check,
remove import of StdCompare in checksupport.dcl, changed some other imports git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@2010 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
-rw-r--r--frontend/analtypes.icl2
-rw-r--r--frontend/analunitypes.icl4
-rw-r--r--frontend/check.icl2
-rw-r--r--frontend/checkFunctionBodies.icl1
-rw-r--r--frontend/checkgenerics.icl2
-rw-r--r--frontend/checktypes.icl4
-rw-r--r--frontend/classify.icl2
-rw-r--r--frontend/convertDynamics.dcl2
-rw-r--r--frontend/convertcases.dcl2
-rw-r--r--frontend/convertcases.icl4
-rw-r--r--frontend/mergecases.icl2
-rw-r--r--frontend/overloading.dcl2
-rw-r--r--frontend/overloading.icl4
-rw-r--r--frontend/refmark.icl2
-rw-r--r--frontend/transform.icl2
-rw-r--r--frontend/type.icl2
-rw-r--r--frontend/type_io.icl2
-rw-r--r--frontend/typesupport.dcl2
-rw-r--r--frontend/typesupport.icl3
-rw-r--r--frontend/unitype.icl2
20 files changed, 25 insertions, 23 deletions
diff --git a/frontend/analtypes.icl b/frontend/analtypes.icl
index a0a40ad..639db53 100644
--- a/frontend/analtypes.icl
+++ b/frontend/analtypes.icl
@@ -1,7 +1,7 @@
implementation module analtypes
import StdEnv
-import syntax, checksupport, checktypes, check, typesupport, utilities, analunitypes
+import syntax, checksupport, checktypes, typesupport, utilities, analunitypes
:: TypeGroups :== [[GlobalIndex]]
diff --git a/frontend/analunitypes.icl b/frontend/analunitypes.icl
index 8f3c219..4d6b6a6 100644
--- a/frontend/analunitypes.icl
+++ b/frontend/analunitypes.icl
@@ -1,7 +1,7 @@
implementation module analunitypes
-import StdEnv
-import syntax, checksupport, analtypes, check, typesupport, checktypes, utilities
+import StdEnv, StdCompare
+import syntax, checksupport, analtypes, typesupport, checktypes, utilities
instance + SignClassification
where
diff --git a/frontend/check.icl b/frontend/check.icl
index f6a6948..e323c7f 100644
--- a/frontend/check.icl
+++ b/frontend/check.icl
@@ -1,6 +1,6 @@
implementation module check
-import StdEnv
+import StdEnv, StdCompare
import syntax, typesupport, parse, checksupport, utilities, checktypes, transform, predef
import explicitimports, comparedefimp, checkFunctionBodies, containers
diff --git a/frontend/checkFunctionBodies.icl b/frontend/checkFunctionBodies.icl
index 936b77b..e5cf591 100644
--- a/frontend/checkFunctionBodies.icl
+++ b/frontend/checkFunctionBodies.icl
@@ -1,5 +1,6 @@
implementation module checkFunctionBodies
+import StdEnv, StdCompare
import syntax, typesupport, parse, checksupport, utilities, checktypes, transform, predef
import explicitimports, comparedefimp
from check import checkFunctions,checkDclMacros
diff --git a/frontend/checkgenerics.icl b/frontend/checkgenerics.icl
index d000685..076da29 100644
--- a/frontend/checkgenerics.icl
+++ b/frontend/checkgenerics.icl
@@ -1,6 +1,6 @@
implementation module checkgenerics
-import syntax,checksupport,checktypes,genericsupport
+import syntax,checksupport,checktypes,genericsupport,StdCompare
checkGenericDefs :: !Index !(Optional (CopiedDefinitions, Int))
!*{#GenericDef} !*{#CheckedTypeDef} !*{#ClassDef} !*{#DclModule} !*Heaps !*CheckState
diff --git a/frontend/checktypes.icl b/frontend/checktypes.icl
index cd27ee0..4df5618 100644
--- a/frontend/checktypes.icl
+++ b/frontend/checktypes.icl
@@ -1,7 +1,7 @@
implementation module checktypes
-import StdEnv
-import syntax, checksupport, check, typesupport, utilities
+import StdEnv, StdCompare
+import syntax, checksupport, typesupport, utilities
import genericsupport
from explicitimports import search_qualified_ident,::NameSpaceN,TypeNameSpaceN,ClassNameSpaceN
diff --git a/frontend/classify.icl b/frontend/classify.icl
index e14086a..9075913 100644
--- a/frontend/classify.icl
+++ b/frontend/classify.icl
@@ -7,7 +7,7 @@ SwitchMultimatchClassification multi no_multi :== multi
SwitchNewOld new old :== new
import syntax
-from trans import ::Component(..),::ComponentMembers(..)
+from partition import ::Component(..),::ComponentMembers(..)
from containers import arg_is_strict
import utilities
import StdStrictLists
diff --git a/frontend/convertDynamics.dcl b/frontend/convertDynamics.dcl
index b44426d..7c8f44e 100644
--- a/frontend/convertDynamics.dcl
+++ b/frontend/convertDynamics.dcl
@@ -4,7 +4,7 @@
definition module convertDynamics
import syntax , checksupport
-from trans import ::Component
+from partition import ::Component
:: TypeCodeVariableInfo
:: DynamicValueAliasInfo
diff --git a/frontend/convertcases.dcl b/frontend/convertcases.dcl
index 6099a65..2648812 100644
--- a/frontend/convertcases.dcl
+++ b/frontend/convertcases.dcl
@@ -4,7 +4,7 @@
definition module convertcases
import syntax
-from trans import ::Component
+from partition import ::Component
:: LetVarInfo
:: LetExpressionInfo
diff --git a/frontend/convertcases.icl b/frontend/convertcases.icl
index 6a3d56e..c41d511 100644
--- a/frontend/convertcases.icl
+++ b/frontend/convertcases.icl
@@ -3,7 +3,9 @@
*/
implementation module convertcases
-import syntax, transform, StdCompare, check, utilities, trans, general; //, RWSDebug
+import syntax, transform, StdCompare, utilities, typesupport, general
+from partition import ::Component(..),::ComponentMembers(..)
+from trans import convertSymbolType
// exactZip fails when its arguments are of unequal length
exactZip` :: ![.a] ![.b] -> [(.a,.b)]
diff --git a/frontend/mergecases.icl b/frontend/mergecases.icl
index 554d185..995820c 100644
--- a/frontend/mergecases.icl
+++ b/frontend/mergecases.icl
@@ -3,7 +3,7 @@
*/
implementation module mergecases
-import syntax, check, StdCompare, utilities
+import syntax, transform, StdCompare, utilities
class GetSetPatternRhs a
where
diff --git a/frontend/overloading.dcl b/frontend/overloading.dcl
index 3104acb..32088a6 100644
--- a/frontend/overloading.dcl
+++ b/frontend/overloading.dcl
@@ -1,7 +1,7 @@
definition module overloading
import StdEnv
-import syntax, check, typesupport
+import syntax, typesupport
:: InstanceTree = IT_Node !(Global Index) !InstanceTree !InstanceTree | IT_Empty
diff --git a/frontend/overloading.icl b/frontend/overloading.icl
index c818013..d5e61b7 100644
--- a/frontend/overloading.icl
+++ b/frontend/overloading.icl
@@ -1,8 +1,8 @@
implementation module overloading
-import StdEnv
+import StdEnv, StdCompare
-import syntax, check, type, typesupport, utilities, unitype, predef, checktypes, convertDynamics
+import syntax, type, typesupport, utilities, unitype, predef, checktypes, convertDynamics
import genericsupport, type_io_common
:: LocalTypePatternVariable =
diff --git a/frontend/refmark.icl b/frontend/refmark.icl
index 15d3c93..ba4f0b4 100644
--- a/frontend/refmark.icl
+++ b/frontend/refmark.icl
@@ -1,7 +1,7 @@
implementation module refmark
import StdEnv
-import syntax, Heap, typesupport, check, overloading, unitype, utilities //, RWSDebug
+import syntax, Heap, typesupport, overloading, unitype, utilities
(===>) infix 1
(===>) a b :== a // ---> b
diff --git a/frontend/transform.icl b/frontend/transform.icl
index 758a6a0..bdb27b4 100644
--- a/frontend/transform.icl
+++ b/frontend/transform.icl
@@ -1,6 +1,6 @@
implementation module transform
-import syntax, check, StdCompare, utilities, mergecases; //, RWSDebug
+import syntax, utilities, mergecases
:: LiftState =
{ ls_var_heap :: !.VarHeap
diff --git a/frontend/type.icl b/frontend/type.icl
index ffa0f1a..4312ba9 100644
--- a/frontend/type.icl
+++ b/frontend/type.icl
@@ -1,6 +1,6 @@
implementation module type
-import StdEnv
+import StdEnv, StdCompare
import syntax, typesupport, check, analtypes, overloading, unitype, refmark, predef, utilities, compare_constructor
import genericsupport
diff --git a/frontend/type_io.icl b/frontend/type_io.icl
index 9a46a6e..bccdeb6 100644
--- a/frontend/type_io.icl
+++ b/frontend/type_io.icl
@@ -5,7 +5,7 @@ implementation module type_io
import StdEnv, compare_constructor
import scanner, general, Heap, typeproperties, utilities, checksupport
-import trans
+from trans import convertSymbolTypeWithoutCollectingImportedConstructors
import type_io_common
from genericsupport import kind_to_short_string
diff --git a/frontend/typesupport.dcl b/frontend/typesupport.dcl
index 841c844..1a2d70a 100644
--- a/frontend/typesupport.dcl
+++ b/frontend/typesupport.dcl
@@ -1,6 +1,6 @@
definition module typesupport
-import checksupport, StdCompare
+import checksupport
from unitype import ::Coercions, ::CoercionTree, ::AttributePartition, CT_Empty
diff --git a/frontend/typesupport.icl b/frontend/typesupport.icl
index 4dc742e..54f0d8d 100644
--- a/frontend/typesupport.icl
+++ b/frontend/typesupport.icl
@@ -1,8 +1,7 @@
implementation module typesupport
import StdEnv, StdCompare
-import syntax, parse, check, unitype, utilities, checktypes, compilerSwitches
-import genericsupport
+import syntax, unitype, utilities, checktypes
:: Store :== Int
diff --git a/frontend/unitype.icl b/frontend/unitype.icl
index 6ffc894..cf81e82 100644
--- a/frontend/unitype.icl
+++ b/frontend/unitype.icl
@@ -1,6 +1,6 @@
implementation module unitype
-import StdEnv
+import StdEnv, StdCompare
import syntax, analunitypes, type, utilities, checktypes