small macintosh/clean 2.0 fixes

main/CleanCocl.icl

@@ -8,15 +8,19 @@ import cache_variable;
 f = SwitchFusion fusion_is_on 0;
 
 import CoclSystemDependent,Clean2AppleEventHandler;
-
+//1.3
 from events import KeyDownEvent,HighLevelEvent,GetNextEvent,WaitNextEvent,Toolbox,RgnHandle;
-
+//3.1
+/*2.0
+from events import KeyDownEvent,HighLevelEvent,GetNextEvent,WaitNextEvent,::Toolbox,::RgnHandle;
+0.2*/
 from predef import init_identifiers;
 
 DeviceMask :== -31361;		// HighLevelEventMask+UpdateMask+ActivMask+KeyboardMask+MouseMask+OsMask+1
 
 Start world
-	| install_apple_event_handlers==0 && store_state (empty_cache (init_identifiers newHeap))<>0
+	# (symbol_table,world)	= init_identifiers newHeap world;
+	| install_apple_event_handlers==0 && store_state (empty_cache symbol_table)<>0
 		= event_loop world;
 		= world;
 {}{

main/Mac/Clean2AppleEventHandler.dcl

 definition module Clean2AppleEventHandler;
 
+//1.3
 from StdString import String;
 from StdFile import Files;
 from events import Event;
+//3.1
+/*2.0
+from StdFile import :: Files;
+from events import :: Event;
+0.2*/
 
 install_apple_event_handlers :: Int;
 HandleAppleEvent :: !Event (!{#Char} *Files -> (!Int,!*Files)) !*Files -> (!Bool,!Bool,!*Files);

main/Mac/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*/
 
 PathSeparator
 	:==	','

main/Mac/docommand.dcl

 definition module docommand;
 
+//1.3
 from StdString import String;
+//3.1
 
 :: *DoCommandEnvironment :== Int;
 DoCommandNullTerminated :: !String !DoCommandEnvironment -> (!Int,!DoCommandEnvironment);

main/Mac/docommand.icl

 implementation module docommand;
 
+//1.3
 from StdString import String;
+//3.1
 
 :: *DoCommandEnvironment :== Int;