Remaining 2.0 fixes for CleanIde

Ed/EdKeyboard.icl

@@ -105,7 +105,7 @@ where
 enterKeyAction autoTab
 	:== case autoTab of
 			True	-> autoinAction
-			False	-> performAction (Insert (SCons "" (SCons "" SNil)))	// ["",""]
+			_		-> performAction (Insert (SCons "" (SCons "" SNil)))	// ["",""]
 where
 	autoinAction =
 		getText					>>>= \text ->

Ide/projmen.dcl

@@ -5,7 +5,7 @@ definition module projmen
 import StdReceiver
 import PmProject, IdeState
 
-ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: .RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General)
+ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General)
 
 pm_menu_add :: .Pathname !*(PSt *General) -> *PSt *General;
 

Ide/projmen.icl

@@ -132,7 +132,7 @@ where
 			, WindowInitActive okId
 			]
 
-ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: .RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General)
+ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General)
 ProjListMenu mProjectId mPrListId mPrRecId =
 	{newDef =
 	(	RadioMenu [] 0 [MenuId mPrListId]

Ide/search.icl

@@ -518,7 +518,7 @@ IsOpen modname ps
 	# (windows,ps)	= accPIO getWindowsStack ps
 	= doall windows ps
 where
-	doall :: ![.Id] !*(PSt *General) -> *(!.Maybe Id,!*PSt *General)
+	doall :: ![Id] !*(PSt *General) -> *(!.Maybe Id,!*PSt *General)
 	doall [] ps = (Nothing,ps)
 	doall [win:res] ps
 		#	(mr,ps)		= message win msgGetPathName ps

Ide/typewin.dcl

@@ -7,7 +7,7 @@ from PmPrefs import TypPrefs
 
 //--- Types window
 
-iniTypeWinInfo :: !Id !Id ![Id] !TypPrefs !*a -> *(.TypeWinInfo,*a) | accScreenPicture, Ids a
+iniTypeWinInfo :: !Id !Id ![Id] !TypPrefs !*a -> *(.TypeWinInfo,*a) | Ids, accScreenPicture a
 // initialise type window info
 
 updateTypeWindow :: !Bool !String [WindowAttribute *(EditState,*(PSt *b))] ![String] !*(PSt *b) -> *PSt *b | Typer b

Interfaces/ProverOptions/ProverOptions.dcl

@@ -17,7 +17,7 @@ import
 // Modulenames should be stored WITHOUT extension; Pathnames should be stored fully and not end with a (back)slash   
 :: ProjectStructure =
    { project_name         :: !String
-   , project_paths        :: ![!String]                     
+   , project_paths        :: ![String]                     
    , main_module_name     :: !String                       
    , main_module_path     :: !String                       
    , icl_modules          :: ![(!String, !String)]        // (name, path)

Interfaces/ProverOptions/ProverOptions.icl

@@ -17,7 +17,7 @@ import
 :: ProjectStructure =
 // -------------------------------------------------------------------------------------------------------------------------------------------------
    { project_name         :: !String
-   , project_paths        :: ![!String]
+   , project_paths        :: ![String]
    , main_module_name     :: !String                       
    , main_module_path     :: !String                       
    , icl_modules          :: ![(!String, !String)]
@@ -91,7 +91,7 @@ WriteDclModules [(name, path): rest] file
    = WriteDclModules rest file            
    
 // -------------------------------------------------------------------------------------------------------------------------------------------------
-WriteProjectPaths :: ![!String] !*File -> !*File
+WriteProjectPaths :: ![String] !*File -> !*File
 // -------------------------------------------------------------------------------------------------------------------------------------------------
 WriteProjectPaths [] file
    = file

Util/morecontrols.icl

@@ -58,9 +58,10 @@ where
 				:+:	TextControl "Size:" [ left ]
 				:+: FontSizeControl fontSizes sizeFun (findNameInList fontsize fontSizes) [ControlId sizesId]
 				) (atts++[ControlHMargin 0 0,ControlVMargin 0 0])
-		# selectfun = \fontname fontsize ps -> let
-				    	namesIdx		= findNameInList fontname fontNames
-				    	sizesIdx		= findNameInList fontsize fontSizes
+		# selectfun = \fontname fontsize ps ->
+						let
+					    	namesIdx		= findNameInList fontname fontNames
+					    	sizesIdx		= findNameInList fontsize fontSizes
 				    	in appPIO (selectPopUpControlItem sizesId sizesIdx o selectPopUpControlItem namesId namesIdx) ps
 		= controlToHandles control ps
 	where