remove code for compatibility with Clean 1.3

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

5 files changed, 9 insertions, 43 deletions

diff --git a/frontend/checktypes.dcl b/frontend/checktypes.dcl
index 8145612..65bd89d 100644
--- a/frontend/checktypes.dcl
+++ b/frontend/checktypes.dcl
@@ -11,12 +11,7 @@ checkFunctionType :: !Index !SymbolType !Specials !u:{# CheckedTypeDef} !v:{# Cl
 checkMemberType :: !Index !SymbolType !u:{# CheckedTypeDef} !v:{# ClassDef} !u:{# DclModule} !*TypeHeaps !*CheckState
 	-> (!SymbolType, !u:{# CheckedTypeDef}, !v:{# ClassDef}, !u:{# DclModule}, !*TypeHeaps, !*CheckState)
 
-//1.3
 checkInstanceType :: !Index !(Global DefinedSymbol) !InstanceType !Specials !u:{# CheckedTypeDef} !v:{# ClassDef} !u:{# DclModule} !*TypeHeaps !*CheckState
-//3.1
-/*2.0
-checkInstanceType :: !Index !(Global DefinedSymbol) !InstanceType !Specials !u:{# CheckedTypeDef} !v:{# ClassDef} !u:{# DclModule} !*TypeHeaps !*CheckState
-0.2*/
 	-> (!InstanceType, !Specials, !u:{# CheckedTypeDef}, !v:{# ClassDef}, !u:{# DclModule}, !*TypeHeaps, !*CheckState)
 
 checkSuperClasses :: ![TypeVar] ![TypeContext] !Index !u:{# CheckedTypeDef} !v:{# ClassDef} !u:{# DclModule} !*TypeHeaps !*CheckState
diff --git a/frontend/containers.dcl b/frontend/containers.dcl
index 325e131..de787d6 100644
--- a/frontend/containers.dcl
+++ b/frontend/containers.dcl
@@ -1,13 +1,7 @@
 definition module containers
 
-/*2.0
 from syntax import ::Optional,::StrictnessList,::Annotation
 from StdOverloaded import class toString
-0.2*/
-//1.3
-from syntax import Optional,StrictnessList,Annotation
-from StdOverloaded import toString
-//3.1
 
 :: NumberSet = Numbers !Int !NumberSet | EndNumbers
 
diff --git a/frontend/general.dcl b/frontend/general.dcl
index fa4f821..9ef927f 100644
--- a/frontend/general.dcl
+++ b/frontend/general.dcl
@@ -1,12 +1,7 @@
 definition module general
 
-/*2.0
-from StdEnv import instance <<< Int,class <<< (..),instance + Int,class + (..),instance ~ Int,class ~ (..)
-0.2*/
-//1.3
-from StdEnv import <<<, +, ~
-from StdString import String
-//3.1
+from StdFile import instance <<< Int,class <<< (..)
+from StdInt import instance + Int,class + (..),instance ~ Int,class ~ (..)
 
 instance ~ Bool
 
diff --git a/frontend/generics1.dcl b/frontend/generics1.dcl
index f0b9dc6..661ef10 100644
--- a/frontend/generics1.dcl
+++ b/frontend/generics1.dcl
@@ -1,12 +1,7 @@
 definition module generics1
 
 import checksupport
-/*2.0
 from transform import ::Group
-0.2*/
-//1.3
-from transform import Group
-//3.1
 
 convertGenerics :: 
 		!Int 
diff --git a/frontend/typesupport.dcl b/frontend/typesupport.dcl
index f6ebd5b..22664a5 100644
--- a/frontend/typesupport.dcl
+++ b/frontend/typesupport.dcl
@@ -2,12 +2,7 @@ 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
 
@@ -26,11 +21,11 @@ cAttributed			:== 1
 cAnnotated			:== 2
 cMarkAttribute		:== 4
 
-:: TypeVarBeautifulizer // MW++
+:: TypeVarBeautifulizer
 
 instance writeType SymbolType, Type, AType, [a] | writeType a
 
-initialTypeVarBeautifulizer :: TypeVarBeautifulizer // MW4++
+initialTypeVarBeautifulizer :: TypeVarBeautifulizer
 
 ::	AttributeEnv	:== {! TypeAttribute }
 ::	VarEnv 			:== {! Type }
@@ -147,31 +142,23 @@ instance removeAnnotations Type, SymbolType
 foldATypeSt on_atype on_type type st :== fold_atype_st type st
   where
 	fold_type_st type=:(TA type_symb_ident args) st
-		#! st
-				= foldSt fold_atype_st args st
+		#! st = foldSt fold_atype_st args st
 		= on_type type st
 	fold_type_st type=:(TAS type_symb_ident args _) st
-		#! st
-				= foldSt fold_atype_st args st
+		#! st = foldSt fold_atype_st args st
 		= on_type type st
 	fold_type_st type=:(l --> r) st
-		#! st
-				= fold_atype_st r (fold_atype_st l st)
+		#! st = fold_atype_st r (fold_atype_st l st)
 		= on_type type st
-//AA..
 	fold_type_st type=:(TArrow1 t) st
 		#! st = fold_atype_st t st
 		= on_type type st	
-//..AA
 	fold_type_st type=:(_ :@: args) st
-		#! st
-				= foldSt fold_atype_st args st
+		#! st = foldSt fold_atype_st args st
 		= on_type type st
 	fold_type_st type st
 		= on_type type st
-	
 	fold_atype_st atype=:{at_type} st
-		#! st
-				= fold_type_st at_type st
+		#! st = fold_type_st at_type st
 		= on_atype atype st