(PA) receiverhandle code --> receiveraccess

libraries/ObjectIO/ObjectIO/receiveraccess.dcl

@@ -16,3 +16,23 @@ newReceiverHandle2		:: !Id     !SelectState ![Id] !(Receiver2Function m r *(.ls,
 
 onewaytotriple			:: !(ReceiverFunction  m   *(.ls,.pst)) m !*(.ls,.pst) -> *(.ls,[r],.pst)
 twowaytotriple			:: !(Receiver2Function m r *(.ls,.pst)) m !*(.ls,.pst) -> *(.ls,[r],.pst)
+
+
+//	Functions that have moved from receiverhandle:
+
+receiverIdentified			:: !Id				!(ReceiverHandle .ls .pst)	-> Bool
+// MW11..
+inetReceiverIdentified		::	!(!EndpointRef`, !InetReceiverCategory`)
+								!(ReceiverHandle .ls .pst)	-> Bool
+inetReceiverIdentifiedWithId::	!(!Id, !InetReceiverCategory`)
+								!(ReceiverHandle .ls .pst)	-> Bool
+// .. MW11
+receiverSetSelectState		:: !SelectState		!(ReceiverStateHandle .pst)	-> ReceiverStateHandle .pst
+receiverHandleSyncMessage	:: !SyncMessage		!(ReceiverHandle .ls .pst) *(.ls,.pst)
+								-> ([SemiDynamic],ReceiverHandle .ls .pst, *(.ls,.pst))
+receiverAddASyncMessage		:: !Id !SemiDynamic	!(ReceiverHandle .ls .pst)	-> ReceiverHandle .ls .pst
+// MW11..
+receiverApplyInetEvent		::	!InetReceiverASMQType !(ReceiverHandle .ls .pst) *(.ls,.pst)
+							->	*(.ls,.pst)
+getInetReceiverRId			::	!(ReceiverHandle .ls .pst)	-> (RId InetReceiverASMQType)
+// ..MW11

libraries/ObjectIO/ObjectIO/receiveraccess.icl

@@ -3,9 +3,9 @@ implementation module receiveraccess
 
 //	Clean Object I/O library, version 1.2
 
-
+import	StdBool, StdInt, StdList
 import	id, receiverdefaccess, receiverhandle
-
+import	cast, semidynamic
 
 // MW11 added connectedIds
 newReceiverStateHandle :: !Id .ls !SelectState ![Id] !(ReceiverFunction m *(.ls,.pst)) -> ReceiverStateHandle .pst
@@ -54,3 +54,66 @@ twowaytotriple :: !(Receiver2Function m r *(.ls,.pst)) m !*(.ls,.pst) -> *(.ls,[
 twowaytotriple f m (ls,pst)
 	# (r, (ls,pst))	= f m (ls,pst)
 	= (ls,[r],pst)
+
+
+//	Functions that have moved from receiverhandle:
+
+receiverIdentified :: !Id !(ReceiverHandle .ls .pst) -> Bool
+receiverIdentified id {rId}
+	= id==rId
+
+// MW11..
+inetReceiverIdentified		::	!(!EndpointRef`, !InetReceiverCategory`)
+								!(ReceiverHandle .ls .ps)	-> Bool
+inetReceiverIdentified _ {rInetInfo=Nothing}
+	= False
+inetReceiverIdentified (epR1,type1) {rInetInfo=Just (epR2,type2,_,_)}
+	= epR1==epR2 && type1==type2
+
+inetReceiverIdentifiedWithId	::	!(!Id, !InetReceiverCategory`)
+									!(ReceiverHandle .ls .ps)	-> Bool
+inetReceiverIdentifiedWithId _ {rInetInfo=Nothing}
+	= False
+inetReceiverIdentifiedWithId (id,category) {rId, rInetInfo=Just (_,rCategory,_,_)}
+	= id==rId && category==rCategory
+// ..MW11
+
+receiverSetSelectState :: !SelectState !(ReceiverStateHandle .pst) -> ReceiverStateHandle .pst
+receiverSetSelectState select rsH=:{rHandle=rH}
+	= {rsH & rHandle={rH & rSelect=select}}
+
+receiverHandleSyncMessage :: !SyncMessage !(ReceiverHandle .ls .pst) *(.ls,.pst) -> ([SemiDynamic],ReceiverHandle .ls .pst,*(.ls,.pst))
+receiverHandleSyncMessage {smRecLoc={rlReceiverId},smMsg} rH=:{rFun} (ls,pst)
+	| not (receiverIdentified rlReceiverId rH)
+		= ([],rH,(ls,pst))
+	# maybe_content	= getDynamic rlReceiverId smMsg
+	| isNothing maybe_content
+		= ([],rH,(ls,pst))
+	# (ls,resp,pst)	= rFun (Cast (fromJust maybe_content)) (ls,pst)
+	| isEmpty resp
+		= ([],rH,(ls,pst))
+	| otherwise	
+		= ([setDynamic rlReceiverId (hd resp) smMsg],rH,(ls,pst))
+
+receiverAddASyncMessage :: !Id !SemiDynamic !(ReceiverHandle .ls .pst) -> ReceiverHandle .ls .pst
+receiverAddASyncMessage id sd rH=:{rASMQ}
+	| receiverIdentified id rH
+		# maybe_content	= getDynamic id sd
+		| isNothing maybe_content
+			= rH
+		// otherwise
+			= {rH & rASMQ=rASMQ++[Cast (fromJust maybe_content)]}
+	| otherwise
+		= rH
+
+// MW11..
+receiverApplyInetEvent :: !InetReceiverASMQType !(ReceiverHandle .ls .pst) *(.ls,.pst) -> *(.ls,.pst)
+receiverApplyInetEvent eventInfo rH=:{rFun,rInetInfo=Just _} (ls,pst)
+	# (ls,_,pst)	= rFun (Cast eventInfo) (ls,pst)
+	= (ls,pst)
+
+getInetReceiverRId :: !(ReceiverHandle .ls .ps) -> RId InetReceiverASMQType
+// converts an Id into an RId
+getInetReceiverRId {rId}
+	= toRId (fromId rId)
+// ..MW11

libraries/ObjectIO/ObjectIO/receiverdevice.icl

@@ -6,7 +6,7 @@ implementation module receiverdevice
 
 import	StdBool, StdFunc, StdList, StdMisc, StdTuple
 import	StdReceiver
-import	devicefunctions, iostate, receiverevent, receiverid
+import	devicefunctions, iostate, receiveraccess, receiverevent, receiverid
 from	commondef	import FatalError, URemove, UCond
 from	StdPSt		import appPIO, accPIO
 

libraries/ObjectIO/ObjectIO/receiverhandle.dcl

@@ -39,20 +39,3 @@ from	ostoolbox	import OSToolbox // MW11++
 ::	EndpointRef`			:==	Int
 ::	InetReceiverCategory`	:==	Int
 // ..MW11
-
-receiverIdentified			:: !Id				!(ReceiverHandle .ls .pst)	-> Bool
-// MW11..
-inetReceiverIdentified		::	!(!EndpointRef`, !InetReceiverCategory`)
-								!(ReceiverHandle .ls .pst)	-> Bool
-inetReceiverIdentifiedWithId::	!(!Id, !InetReceiverCategory`)
-								!(ReceiverHandle .ls .pst)	-> Bool
-// .. MW11
-receiverSetSelectState		:: !SelectState		!(ReceiverStateHandle .pst)	-> ReceiverStateHandle .pst
-receiverHandleSyncMessage	:: !SyncMessage		!(ReceiverHandle .ls .pst) *(.ls,.pst)
-								-> ([SemiDynamic],ReceiverHandle .ls .pst, *(.ls,.pst))
-receiverAddASyncMessage		:: !Id !SemiDynamic	!(ReceiverHandle .ls .pst)	-> ReceiverHandle .ls .pst
-// MW11..
-receiverApplyInetEvent		::	!InetReceiverASMQType !(ReceiverHandle .ls .pst) *(.ls,.pst)
-							->	*(.ls,.pst)
-getInetReceiverRId			::	!(ReceiverHandle .ls .pst)	-> (RId InetReceiverASMQType)
-// ..MW11

libraries/ObjectIO/ObjectIO/receiverhandle.icl

@@ -4,8 +4,8 @@ implementation module receiverhandle
 //	Clean Object I/O library, version 1.2
 
 
-import	StdBool, StdInt, StdList
-import	cast, receivermessage, semidynamic
+//import	StdBool, StdInt, StdList
+import	receivermessage//, cast, semidynamic
 from	ostoolbox	import OSToolbox // MW11++
 
 
@@ -38,63 +38,3 @@ from	ostoolbox	import OSToolbox // MW11++
 ::	EndpointRef`			:==	Int
 ::	InetReceiverCategory`	:==	Int
 // ..MW11
-
-receiverIdentified :: !Id !(ReceiverHandle .ls .pst) -> Bool
-receiverIdentified id {rId}
-	= id==rId
-
-// MW11..
-inetReceiverIdentified		::	!(!EndpointRef`, !InetReceiverCategory`)
-								!(ReceiverHandle .ls .ps)	-> Bool
-inetReceiverIdentified _ {rInetInfo=Nothing}
-	= False
-inetReceiverIdentified (epR1,type1) {rInetInfo=Just (epR2,type2,_,_)}
-	= epR1==epR2 && type1==type2
-
-inetReceiverIdentifiedWithId	::	!(!Id, !InetReceiverCategory`)
-									!(ReceiverHandle .ls .ps)	-> Bool
-inetReceiverIdentifiedWithId _ {rInetInfo=Nothing}
-	= False
-inetReceiverIdentifiedWithId (id,category) {rId, rInetInfo=Just (_,rCategory,_,_)}
-	= id==rId && category==rCategory
-// ..MW11
-
-receiverSetSelectState :: !SelectState !(ReceiverStateHandle .pst) -> ReceiverStateHandle .pst
-receiverSetSelectState select rsH=:{rHandle=rH}
-	= {rsH & rHandle={rH & rSelect=select}}
-
-receiverHandleSyncMessage :: !SyncMessage !(ReceiverHandle .ls .pst) *(.ls,.pst) -> ([SemiDynamic],ReceiverHandle .ls .pst,*(.ls,.pst))
-receiverHandleSyncMessage {smRecLoc={rlReceiverId},smMsg} rH=:{rFun} (ls,pst)
-	| not (receiverIdentified rlReceiverId rH)
-		= ([],rH,(ls,pst))
-	# maybe_content	= getDynamic rlReceiverId smMsg
-	| isNothing maybe_content
-		= ([],rH,(ls,pst))
-	# (ls,resp,pst)	= rFun (Cast (fromJust maybe_content)) (ls,pst)
-	| isEmpty resp
-		= ([],rH,(ls,pst))
-	| otherwise	
-		= ([setDynamic rlReceiverId (hd resp) smMsg],rH,(ls,pst))
-
-receiverAddASyncMessage :: !Id !SemiDynamic !(ReceiverHandle .ls .pst) -> ReceiverHandle .ls .pst
-receiverAddASyncMessage id sd rH=:{rASMQ}
-	| receiverIdentified id rH
-		# maybe_content	= getDynamic id sd
-		| isNothing maybe_content
-			= rH
-		// otherwise
-			= {rH & rASMQ=rASMQ++[Cast (fromJust maybe_content)]}
-	| otherwise
-		= rH
-
-// MW11..
-receiverApplyInetEvent :: !InetReceiverASMQType !(ReceiverHandle .ls .pst) *(.ls,.pst) -> *(.ls,.pst)
-receiverApplyInetEvent eventInfo rH=:{rFun,rInetInfo=Just _} (ls,pst)
-	# (ls,_,pst)	= rFun (Cast eventInfo) (ls,pst)
-	= (ls,pst)
-
-getInetReceiverRId			::	!(ReceiverHandle .ls .ps)	-> (RId InetReceiverASMQType)
-// converts an Id into an RId
-getInetReceiverRId {rId}
-	= toRId (fromId rId)
-// ..MW11

libraries/ObjectIO/ObjectIO/timerdevice.icl

@@ -6,7 +6,7 @@ implementation module timerdevice
 
 import	StdInt, StdBool, StdFunc, StdEnum, StdList, StdTuple
 from	StdPSt	import	accPIO, appPIO
-import	commondef, devicefunctions, iostate, receiverhandle, timeraccess, timerdefaccess, timerevent
+import	commondef, devicefunctions, iostate, receiveraccess, timeraccess, timerdefaccess, timerevent
 
 
 timerdeviceFatalError :: String String -> .x

libraries/ObjectIO/ObjectIO/windowdevice.icl

@@ -6,7 +6,7 @@ implementation module windowdevice
 
 import	StdBool, StdFunc, StdList, StdMisc, StdTuple
 import	osevent, ospicture, osrgn, oswindow
-import	commondef, controldraw, controllayout, controlrelayout, controlresize, iostate, processstack, receiverid, scheduler
+import	commondef, controldraw, controllayout, controlrelayout, controlresize, iostate, processstack, receiveraccess, receiverid, scheduler
 import	StdControlAttribute, StdWindowAttribute, windowaccess, windowclipstate, windowdispose, windowdraw, windowevent, windowupdate
 from	keyfocus		import setNoFocusItem, setNewFocusItem
 from	StdPSt			import accPIO