new explicit import syntax

backend/backendconvert.dcl

@@ -3,7 +3,12 @@
 */
 definition module backendconvert
 
+/*2.0
+from backend import ::BackEnd
+0.2*/
+//1.3
 from backend import BackEnd
+//3.1
 import frontend
 
 backEndConvertModules :: PredefinedSymbols FrontEndSyntaxTree !Int *VarHeap *AttrVarHeap *BackEnd -> (!*VarHeap, *AttrVarHeap, !*BackEnd)

backend/backendsupport.dcl

@@ -3,14 +3,15 @@
 */
 definition module backendsupport
 
+/*2.0
+from StdArray import class Array(size,usize)
+from StdInt import class +,class ==
+0.2*/
 //1.3
 from StdArray import size, size_u
+from StdInt import +, ==
 //3.1
-/*2.0
-from StdArray import size, usize
-0.2*/
 from StdFunc import `bind`
-from StdInt import +, ==
 
 import utilities
 

backend/backendsupport.icl

@@ -4,8 +4,13 @@
 implementation module backendsupport
 
 import StdArray
-from StdFunc import `bind`
+/*2.0
+from StdInt import class + (..),class == (..)
+0.2*/
+//1.3
 from StdInt import +, ==
+//3.1
+from StdFunc import `bind`
 
 identity
 	:==	\x -> x

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

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

frontend/containers.dcl

 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
 

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 =

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 

frontend/general.dcl

 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
 

frontend/generics.dcl

 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)

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) 

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
 

frontend/utilities.dcl

 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

main/Windows/CoclSystemDependent.dcl

@@ -3,8 +3,11 @@ definition module CoclSystemDependent
 
 //1.3
 from StdString import String
-//3.1
 from StdFile import Files
+//3.1
+/*2.0
+from StdFile import ::Files
+0.2*/
 
 // RWS split
 // from deltaIOSystem import DeviceSystem

main/compile.dcl

@@ -3,7 +3,12 @@
 */
 definition module compile
 
+/*2.0
+from StdFile import ::Files
+0.2*/
+//1.3
 from StdFile import Files
+//3.1
 import checksupport
 
 compile :: ![{#Char}] !*DclCache !*Files -> (!Bool,!*DclCache,!*Files)
@@ -17,4 +22,3 @@ compile :: ![{#Char}] !*DclCache !*Files -> (!Bool,!*DclCache,!*Files)
  };
 
 empty_cache :: *SymbolTable -> *DclCache
-

main/filesystem.dcl

@@ -7,7 +7,12 @@
 */
 definition module filesystem
 
+/*2.0
+from StdFile import class FileSystem,::Files
+0.2*/
+//1.3
 from StdFile import FileSystem, Files
+//3.1
 
 // return last modified time (local time) as "yyyymmddhhmmss" or "" on error
 fmodificationtime :: {#Char} !*env -> (!{#Char}, !*env) | FileSystem env