From 18f2c41c23abf8c43e4f6ae35699cd55b9fcef32 Mon Sep 17 00:00:00 2001
From: diederik
Date: Mon, 11 Feb 2002 13:24:14 +0000
Subject: small macintosh/clean 2.0 fixes

git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1014 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
---
 main/CleanCocl.icl                   | 10 +++++++---
 main/Mac/Clean2AppleEventHandler.dcl |  6 ++++++
 main/Mac/CoclSystemDependent.dcl     |  5 ++++-
 main/Mac/docommand.dcl               |  2 ++
 main/Mac/docommand.icl               |  2 ++
 5 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'main')

diff --git a/main/CleanCocl.icl b/main/CleanCocl.icl
index 0cc6dd2..db3aa71 100644
--- a/main/CleanCocl.icl
+++ b/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;
 {}{
diff --git a/main/Mac/Clean2AppleEventHandler.dcl b/main/Mac/Clean2AppleEventHandler.dcl
index 0690b79..27efb47 100644
--- a/main/Mac/Clean2AppleEventHandler.dcl
+++ b/main/Mac/Clean2AppleEventHandler.dcl
@@ -1,8 +1,14 @@
 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);
diff --git a/main/Mac/CoclSystemDependent.dcl b/main/Mac/CoclSystemDependent.dcl
index f7d51e0..ce62a78 100644
--- a/main/Mac/CoclSystemDependent.dcl
+++ b/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
 	:==	','
diff --git a/main/Mac/docommand.dcl b/main/Mac/docommand.dcl
index 9eca72d..630aeb3 100644
--- a/main/Mac/docommand.dcl
+++ b/main/Mac/docommand.dcl
@@ -1,6 +1,8 @@
 definition module docommand;
 
+//1.3
 from StdString import String;
+//3.1
 
 :: *DoCommandEnvironment :== Int;
 DoCommandNullTerminated :: !String !DoCommandEnvironment -> (!Int,!DoCommandEnvironment);
diff --git a/main/Mac/docommand.icl b/main/Mac/docommand.icl
index d5a1901..c26b75c 100644
--- a/main/Mac/docommand.icl
+++ b/main/Mac/docommand.icl
@@ -1,6 +1,8 @@
 implementation module docommand;
 
+//1.3
 from StdString import String;
+//3.1
 
 :: *DoCommandEnvironment :== Int;
 
-- 
cgit v1.2.3