new explicit import syntax

git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@901 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d

10 files changed, 42 insertions, 4 deletions

diff --git a/frontend/compilerSwitches.dcl b/frontend/compilerSwitches.dcl
index 4377a37..72a3822 100644
--- a/frontend/compilerSwitches.dcl
+++ b/frontend/compilerSwitches.dcl
@@ -2,7 +2,7 @@ definition module compilerSwitches
 
 PA_BUG on off :== off
 
-switch_import_syntax one_point_three two_point_zero :== one_point_three
+switch_import_syntax one_point_three two_point_zero :== two_point_zero
 	/* when finally removing this switch also remove the argument of STE_Instance and ID_OldSyntax */
 
 SwitchPreprocessor preprocessor no_preprocessor :== preprocessor
diff --git a/frontend/compilerSwitches.icl b/frontend/compilerSwitches.icl
index 02d3f3e..09ac960 100644
--- a/frontend/compilerSwitches.icl
+++ b/frontend/compilerSwitches.icl
@@ -2,7 +2,7 @@ implementation module compilerSwitches
 
 PA_BUG on off :== off
 
-switch_import_syntax one_point_three two_point_zero :== one_point_three
+switch_import_syntax one_point_three two_point_zero :== two_point_zero
 	/* when finally removing this switch also remove the argument of STE_Instance and ID_OldSyntax */
 
 SwitchPreprocessor preprocessor no_preprocessor :== preprocessor
diff --git a/frontend/containers.dcl b/frontend/containers.dcl
index abb6752..e788c86 100644
--- a/frontend/containers.dcl
+++ b/frontend/containers.dcl
@@ -1,7 +1,13 @@
 definition module containers
 
+/*2.0
+from syntax import ::Optional
+from StdOverloaded import class toString
+0.2*/
+//1.3
 from syntax import Optional
 from StdOverloaded import toString
+//3.1
 
 :: NumberSet = Numbers !Int !NumberSet | EndNumbers
 
diff --git a/frontend/convertDynamics.icl b/frontend/convertDynamics.icl
index 11bd7e8..23be72a 100644
--- a/frontend/convertDynamics.icl
+++ b/frontend/convertDynamics.icl
@@ -15,7 +15,7 @@ import type_io;
 //import RWSDebug;
 
 /*2.0
-from type_io_common import toString;
+from type_io_common import class toString (..),instance toString GlobalTCType;
 0.2*/
 
 ::	*ConversionInfo =
diff --git a/frontend/frontend.dcl b/frontend/frontend.dcl
index 4b23a06..86aa0e3 100644
--- a/frontend/frontend.dcl
+++ b/frontend/frontend.dcl
@@ -3,8 +3,14 @@
 */
 definition module frontend
 
+/*2.0
+from scanner import ::SearchPaths
+from general import ::Optional, Yes, No
+0.2*/
+//1.3
 from scanner import SearchPaths
 from general import Optional, Yes, No
+//3.1
 import checksupport, transform, overloading
 
 :: FrontEndOptions 
diff --git a/frontend/general.dcl b/frontend/general.dcl
index 9739a5b..268d9fa 100644
--- a/frontend/general.dcl
+++ b/frontend/general.dcl
@@ -1,6 +1,11 @@
 definition module general
 
+/*2.0
+from StdEnv import instance <<< Int,class <<< (..),instance + Int,class + (..),instance ~ Int,class ~ (..)
+0.2*/
+//1.3
 from StdEnv import <<<, +, ~
+//3.1
 
 instance ~ Bool
 
diff --git a/frontend/generics.dcl b/frontend/generics.dcl
index c5dd159..857b9fd 100644
--- a/frontend/generics.dcl
+++ b/frontend/generics.dcl
@@ -1,7 +1,12 @@
 definition module generics 
 
 import checksupport
+/*2.0
+from transform import ::Group
+0.2*/
+//1.3
 from transform import Group
+//3.1
 
 convertGenerics :: !{!Group} !Int !{#CommonDefs} !*{# FunDef} !*TypeDefInfos !*Heaps !*HashTable !*PredefinedSymbols !u:{# DclModule} /*!(Optional {#Index})*/ !*ErrorAdmin 
 	-> (!{!Group}, !{#CommonDefs}, !*{# FunDef}, !IndexRange, !*TypeDefInfos, !*Heaps, !*HashTable, !*PredefinedSymbols, !u:{# DclModule}, /*!(Optional {#Index}),*/ !*ErrorAdmin)
diff --git a/frontend/generics.icl b/frontend/generics.icl
index da4d70f..1386f08 100644
--- a/frontend/generics.icl
+++ b/frontend/generics.icl
@@ -6,8 +6,13 @@ import hashtable
 import checksupport
 import checktypes
 import check
-from transform import Group
 import analtypes
+/*2.0
+from transform import ::Group
+0.2*/
+//1.3
+from transform import Group
+//3.1
 
 // whether to generate CONS 
 // (needed for function that use CONS, like toString) 
diff --git a/frontend/typesupport.dcl b/frontend/typesupport.dcl
index 895d6e7..9509ac6 100644
--- a/frontend/typesupport.dcl
+++ b/frontend/typesupport.dcl
@@ -2,7 +2,12 @@ definition module typesupport
 
 import checksupport, StdCompare
 
+/*2.0
+from unitype import ::Coercions, ::CoercionTree, ::AttributePartition, CT_Empty
+0.2*/
+//1.3
 from unitype import Coercions, CoercionTree, AttributePartition, CT_Empty
+//3.1
 
 errorHeading :: !String !*ErrorAdmin -> *ErrorAdmin
 
diff --git a/frontend/utilities.dcl b/frontend/utilities.dcl
index 965f872..8df39e2 100644
--- a/frontend/utilities.dcl
+++ b/frontend/utilities.dcl
@@ -1,7 +1,13 @@
 definition module utilities
 // compile with "reuse unique nodes"
 
+/*2.0
+from StdEnv import class Eq, not, class Ord, class IncDec
+0.2*/
+//1.3
 from StdEnv import Eq, not, Ord, IncDec
+//3.1
+
 import StdMisc, general
 
 import _aconcat