BZ2Stream for bcc
authorClaus Gittinger <cg@exept.de>
Thu, 09 Jun 2016 16:24:55 +0200
changeset 3916 d797329e07d8
parent 3915 34e670460fe0
child 3917 8b649ae6ea12
BZ2Stream for bcc
BZip2Stream.st
Make.proto
Make.spec
abbrev.stc
bc.mak
libInit.cc
stx_libbasic2.st
vms.mak
--- a/BZip2Stream.st	Thu Jun 09 14:55:22 2016 +0200
+++ b/BZip2Stream.st	Thu Jun 09 16:24:55 2016 +0200
@@ -1,6 +1,6 @@
 "
  COPYRIGHT (c) 2002 by eXept Software AG
-              All Rights Reserved
+	      All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -31,79 +31,87 @@
 
 #ifdef WIN32
 // sigh - bzlib.h includes windows.h, which does not like ST/X definitions
-#undef Process
-#undef Processor
-#undef Context
-#undef Array
-#undef Date
-#undef Method
-#undef Delay
-#undef Character
-#undef String
-#undef Time
-#undef Signal
-#undef Set
-#undef Message
-#undef Rectangle
-#undef Block
-#undef Object
-#undef Point
+# undef Process
+# undef Processor
+# undef Context
+# undef Array
+# undef Date
+# undef Method
+# undef Delay
+# undef Character
+# undef String
+# undef Time
+# undef Signal
+# undef Set
+# undef Message
+# undef Rectangle
+# undef Block
+# undef Object
+# undef Point
+# undef INT
+# undef UINT
+# define NO_STDIO
+# if defined(__i386__) || defined(__x86__)
+#  define _X86_
+# endif
 #endif
 
 #include "bzlib.h"
 
 #ifdef WIN32
-#ifdef STX_Process
-# define Process STX_Process
-#endif
-#ifdef STX_Processor
-# define Processor STX_Processor
-#endif
-#ifdef STX_Context
-# define Context STX_Context
-#endif
-#ifdef STX_Array
-# define Array STX_Array
-#endif
-#ifdef STX_Date
-# define Date STX_Date
-#endif
-#ifdef STX_Method
-# define Method STX_Method
-#endif
-#ifdef STX_Delay
-# define Delay STX_Delay
-#endif
-#ifdef STX_Character
-# define Character STX_Character
-#endif
-#ifdef STX_String
-# define String STX_String
-#endif
-#ifdef STX_Time
-# define Time STX_Time
-#endif
-#ifdef STX_Signal
-# define Signal STX_Signal
-#endif
-#ifdef STX_Set
-# define Set STX_Set
-#endif
-#ifdef STX_Message
-# define Message STX_Message
-#endif
-#ifdef STX_Rectangle
-# define Rectangle STX_Rectangle
-#endif
-#ifdef STX_Block
-# define Block STX_Block
-#endif
-#ifdef STX_Object
-# define Object STX_Object
-#endif
-#ifdef STX_Point
-# define Point STXPoint
-#endif
+# define INT  STX_INT
+# define UINT STX_UINT
+# ifdef STX_Process
+#  define Process STX_Process
+# endif
+# ifdef STX_Processor
+#  define Processor STX_Processor
+# endif
+# ifdef STX_Context
+#  define Context STX_Context
+# endif
+# ifdef STX_Array
+#  define Array STX_Array
+# endif
+# ifdef STX_Date
+#  define Date STX_Date
+# endif
+# ifdef STX_Method
+#  define Method STX_Method
+# endif
+# ifdef STX_Delay
+#  define Delay STX_Delay
+# endif
+# ifdef STX_Character
+#  define Character STX_Character
+# endif
+# ifdef STX_String
+#  define String STX_String
+# endif
+# ifdef STX_Time
+#  define Time STX_Time
+# endif
+# ifdef STX_Signal
+#  define Signal STX_Signal
+# endif
+# ifdef STX_Set
+#  define Set STX_Set
+# endif
+# ifdef STX_Message
+#  define Message STX_Message
+# endif
+# ifdef STX_Rectangle
+#  define Rectangle STX_Rectangle
+# endif
+# ifdef STX_Block
+#  define Block STX_Block
+# endif
+# ifdef STX_Object
+#  define Object STX_Object
+# endif
+# ifdef STX_Point
+#  define Point STXPoint
+# endif
 #endif
 
 typedef enum {
@@ -129,7 +137,7 @@
 copyright
 "
  COPYRIGHT (c) 2002 by eXept Software AG
-              All Rights Reserved
+	      All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -176,52 +184,52 @@
 
     if( _zstreamObj != nil )
     {
-        int          _errorNo, _action;
-        unsigned int _bfsize;
-        zstream_s *  _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
+	int          _errorNo, _action;
+	unsigned int _bfsize;
+	zstream_s *  _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
 
-        if( _zstream->op_mode != e_opmode_deflate )
-            RETURN( nil );
+	if( _zstream->op_mode != e_opmode_deflate )
+	    RETURN( nil );
 
-        _bfsize = _zstream->out_total;
+	_bfsize = _zstream->out_total;
 
-        if( _zstream->stream.state == NULL )
-        {
-            _zstream->op_mode = e_opmode_unspecified;
-            RETURN( nil );
-        }
-        _action = (__INST(hitEOF) == true) ? BZ_FINISH : BZ_RUN;        
+	if( _zstream->stream.state == NULL )
+	{
+	    _zstream->op_mode = e_opmode_unspecified;
+	    RETURN( nil );
+	}
+	_action = (__INST(hitEOF) == true) ? BZ_FINISH : BZ_RUN;
 
-        _zstream->stream.avail_out = _bfsize;
-        _zstream->stream.next_out  = _zstream->out_ref;
-        
-        _errorNo = BZ2_bzCompress( & _zstream->stream, _action );
+	_zstream->stream.avail_out = _bfsize;
+	_zstream->stream.next_out  = _zstream->out_ref;
+
+	_errorNo = BZ2_bzCompress( & _zstream->stream, _action );
 
-        if( _errorNo == BZ_STREAM_END )
-        {
-            _zstream->stream.avail_in = 0;
-            _zstream->stream.next_in  = NULL;
-            _errorNo = BZ2_bzCompressEnd( & _zstream->stream );
-        }
+	if( _errorNo == BZ_STREAM_END )
+	{
+	    _zstream->stream.avail_in = 0;
+	    _zstream->stream.next_in  = NULL;
+	    _errorNo = BZ2_bzCompressEnd( & _zstream->stream );
+	}
 
-        if(   (_errorNo == BZ_OK)
-           || (_errorNo == BZ_RUN_OK)
-           || (_errorNo == BZ_FINISH_OK)
-          )
-        {
-            if(   (_zstream->stream.avail_out != _bfsize)
-               || (_zstream->stream.avail_in  != 0)
-              )
-              RETURN( true );
+	if(   (_errorNo == BZ_OK)
+	   || (_errorNo == BZ_RUN_OK)
+	   || (_errorNo == BZ_FINISH_OK)
+	  )
+	{
+	    if(   (_zstream->stream.avail_out != _bfsize)
+	       || (_zstream->stream.avail_in  != 0)
+	      )
+	      RETURN( true );
 
-            RETURN( false );
-        }
-        errorNo = __MKSMALLINT( _errorNo );
+	    RETURN( false );
+	}
+	errorNo = __MKSMALLINT( _errorNo );
     }
 %}.
     errorNo ifNil:[
-        zstream ifNil:[self errorNotOpen].
-        self invalidArgument.
+	zstream ifNil:[self errorNotOpen].
+	self invalidArgument.
     ].
     self zerror:errorNo.
 !
@@ -239,23 +247,23 @@
 
     if( (_zstreamObj != nil) && __bothSmallInteger(blockSize100k, workFactor) )
     {
-        int         _errorNo;
-        zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
+	int         _errorNo;
+	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
 
-        _zstream->op_mode = e_opmode_deflate;
+	_zstream->op_mode = e_opmode_deflate;
 
-        _errorNo = BZ2_bzCompressInit( & _zstream->stream
-                                     , __intVal( blockSize100k ), 0, __intVal( workFactor ) );
+	_errorNo = BZ2_bzCompressInit( & _zstream->stream
+				     , __intVal( blockSize100k ), 0, __intVal( workFactor ) );
 
-        if( _errorNo == BZ_OK )
-            RETURN( self );
+	if( _errorNo == BZ_OK )
+	    RETURN( self );
 
-        errorNo = __MKSMALLINT( _errorNo );
+	errorNo = __MKSMALLINT( _errorNo );
     }
 %}.
     errorNo ifNil:[
-        zstream ifNil:[ self errorNotOpen ].
-        self invalidArgument.
+	zstream ifNil:[ self errorNotOpen ].
+	self invalidArgument.
     ].
     self zerror:errorNo.
 !
@@ -406,20 +414,20 @@
 
     if( (_zstreamObj != nil) && __isSmallInteger(count) )
     {
-        int         _count;
-        zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
+	int         _count;
+	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
 
-        if( (_count = __intVal( count )) > 0 )
-        {
-            char * _in_ref = _zstream->in_ref;
+	if( (_count = __intVal( count )) > 0 )
+	{
+	    char * _in_ref = _zstream->in_ref;
 
-            _zstream->stream.avail_in = _count;
-            _zstream->stream.next_in  = _in_ref;
-        } else {
-            _zstream->stream.avail_in = 0;
-            _zstream->stream.next_in  = NULL;
-        }
-        RETURN( self );
+	    _zstream->stream.avail_in = _count;
+	    _zstream->stream.next_in  = _in_ref;
+	} else {
+	    _zstream->stream.avail_in = 0;
+	    _zstream->stream.next_in  = NULL;
+	}
+	RETURN( self );
     }
 %}.
     zstream ifNil:[ self errorNotOpen ].
--- a/Make.proto	Thu Jun 09 14:55:22 2016 +0200
+++ b/Make.proto	Thu Jun 09 16:24:55 2016 +0200
@@ -63,7 +63,7 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs:: bz2lib zlib 
+pre_objs:: bz2lib zlib
 
 
 zlib:
@@ -236,7 +236,6 @@
 $(OUTDIR)UnixPTYStream.$(O) UnixPTYStream.$(C) UnixPTYStream.$(H): UnixPTYStream.st $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PipeStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(STCHDR)
 $(OUTDIR)ValueLink.$(O) ValueLink.$(C) ValueLink.$(H): ValueLink.st $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)VirtualArray.$(O) VirtualArray.$(C) VirtualArray.$(H): VirtualArray.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(STCHDR)
-$(OUTDIR)WinAPIFunction.$(O) WinAPIFunction.$(C) WinAPIFunction.$(H): WinAPIFunction.st $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ZipArchiveConstants.$(O) ZipArchiveConstants.$(C) ZipArchiveConstants.$(H): ZipArchiveConstants.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(STCHDR)
 $(OUTDIR)stx_libbasic2.$(O) stx_libbasic2.$(C) stx_libbasic2.$(H): stx_libbasic2.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)AATree.$(O) AATree.$(C) AATree.$(H): AATree.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/BinaryTree.$(H) $(STCHDR)
--- a/Make.spec	Thu Jun 09 14:55:22 2016 +0200
+++ b/Make.spec	Thu Jun 09 16:24:55 2016 +0200
@@ -167,7 +167,6 @@
 	UnixPTYStream \
 	ValueLink \
 	VirtualArray \
-	WinAPIFunction \
 	ZipArchiveConstants \
 	stx_libbasic2 \
 	AATree \
@@ -340,7 +339,6 @@
     $(OUTDIR_SLASH)UnixPTYStream.$(O) \
     $(OUTDIR_SLASH)ValueLink.$(O) \
     $(OUTDIR_SLASH)VirtualArray.$(O) \
-    $(OUTDIR_SLASH)WinAPIFunction.$(O) \
     $(OUTDIR_SLASH)ZipArchiveConstants.$(O) \
     $(OUTDIR_SLASH)stx_libbasic2.$(O) \
     $(OUTDIR_SLASH)AATree.$(O) \
--- a/abbrev.stc	Thu Jun 09 14:55:22 2016 +0200
+++ b/abbrev.stc	Thu Jun 09 16:24:55 2016 +0200
@@ -117,7 +117,6 @@
 UnixPTYStream UnixPTYStream stx:libbasic2 'OS-Unix' 0
 ValueLink ValueLink stx:libbasic2 'Collections-Support' 0
 VirtualArray VirtualArray stx:libbasic2 'Collections-Arrayed' 0
-WinAPIFunction WinAPIFunction stx:libbasic2 'OS-Windows' 0
 ZipArchiveConstants ZipArchiveConstants stx:libbasic2 'System-Support-FileFormats' 0
 stx_libbasic2 stx_libbasic2 stx:libbasic2 '* Projects & Packages *' 3
 AATree AATree stx:libbasic2 'Collections-Ordered-Trees' 0
--- a/bc.mak	Thu Jun 09 14:55:22 2016 +0200
+++ b/bc.mak	Thu Jun 09 16:24:55 2016 +0200
@@ -197,7 +197,6 @@
 $(OUTDIR)UnixPTYStream.$(O) UnixPTYStream.$(C) UnixPTYStream.$(H): UnixPTYStream.st $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PipeStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(STCHDR)
 $(OUTDIR)ValueLink.$(O) ValueLink.$(C) ValueLink.$(H): ValueLink.st $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)VirtualArray.$(O) VirtualArray.$(C) VirtualArray.$(H): VirtualArray.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(STCHDR)
-$(OUTDIR)WinAPIFunction.$(O) WinAPIFunction.$(C) WinAPIFunction.$(H): WinAPIFunction.st $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ZipArchiveConstants.$(O) ZipArchiveConstants.$(C) ZipArchiveConstants.$(H): ZipArchiveConstants.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(STCHDR)
 $(OUTDIR)stx_libbasic2.$(O) stx_libbasic2.$(C) stx_libbasic2.$(H): stx_libbasic2.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)AATree.$(O) AATree.$(C) AATree.$(H): AATree.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\BinaryTree.$(H) $(STCHDR)
--- a/libInit.cc	Thu Jun 09 14:55:22 2016 +0200
+++ b/libInit.cc	Thu Jun 09 16:24:55 2016 +0200
@@ -132,7 +132,6 @@
 extern void _UnixPTYStream_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _ValueLink_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _VirtualArray_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _WinAPIFunction_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _ZipArchiveConstants_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _stx_137libbasic2_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _AATree_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
@@ -313,7 +312,6 @@
     _UnixPTYStream_Init(pass,__pRT__,snd);
     _ValueLink_Init(pass,__pRT__,snd);
     _VirtualArray_Init(pass,__pRT__,snd);
-    _WinAPIFunction_Init(pass,__pRT__,snd);
     _ZipArchiveConstants_Init(pass,__pRT__,snd);
     _stx_137libbasic2_Init(pass,__pRT__,snd);
     _AATree_Init(pass,__pRT__,snd);
--- a/stx_libbasic2.st	Thu Jun 09 14:55:22 2016 +0200
+++ b/stx_libbasic2.st	Thu Jun 09 16:24:55 2016 +0200
@@ -41,12 +41,12 @@
     Package documentation:
 
     This library contains additional basic (nonGUI) classes.
-    
+
     These are less fundamental as in libbasic and not required by many stand alone applications.
     Beside additional container classes, this includes URL support, Zip support,
     PTY, serial line, sockets and IP addresses, and other less frequently needed things.
 
-    Most real world applications will include this, but it is possible to create 
+    Most real world applications will include this, but it is possible to create
     small standAlone apps which do not need it.
 "
 ! !
@@ -55,13 +55,13 @@
 
 excludedFromPreRequisites
     ^ #(
-        #'exept:libcrypt'    "Rc4Cipher - referenced by RandomGenerator class>>new "
-        #'stx:goodies/communication'    "FTPClient - referenced by FtpURI>>writeStreamDo:create:atomic: "
-        #'stx:libtool'    "FileBrowser - referenced by Archiver::ArchiverOutputParser>>parseLine:forItemClass: "
-        #'stx:libview2'    "MIMETypes - referenced by Archiver::ArchiverOutputParser>>parseLine:forItemClass: "
-        #'stx:libwidg'    "DialogBox - referenced by Archiver::CompressedFile>>compressFile:to: "
-        #'stx:libhtml'    "HTMLParser - referenced by HTMLUtilities class>>plainTextOfHTML: "
-        #'stx:goodies/webServer/htmlTree'    "HTML::TreeBuilder - referenced by HTMLPrinterStream>>initialize"
+	#'exept:libcrypt'    "Rc4Cipher - referenced by RandomGenerator class>>new "
+	#'stx:goodies/communication'    "FTPClient - referenced by FtpURI>>writeStreamDo:create:atomic: "
+	#'stx:libtool'    "FileBrowser - referenced by Archiver::ArchiverOutputParser>>parseLine:forItemClass: "
+	#'stx:libview2'    "MIMETypes - referenced by Archiver::ArchiverOutputParser>>parseLine:forItemClass: "
+	#'stx:libwidg'    "DialogBox - referenced by Archiver::CompressedFile>>compressFile:to: "
+	#'stx:libhtml'    "HTMLParser - referenced by HTMLUtilities class>>plainTextOfHTML: "
+	#'stx:goodies/webServer/htmlTree'    "HTML::TreeBuilder - referenced by HTMLPrinterStream>>initialize"
     )
 !
 
@@ -74,7 +74,7 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:libbasic'    "AbstractNumberVector - superclass of HalfFloatArray"
+	#'stx:libbasic'    "AbstractNumberVector - superclass of HalfFloatArray"
     )
 !
 
@@ -183,175 +183,174 @@
      Attributes are: #autoload or #<os> where os is one of win32, unix,..."
 
     ^ #(
-        "<className> or (<className> attributes...) in load order"
-        AVLTree
-        AbstractBackgroundJob
-        ActiveObject
-        ActorStream
-        Archiver
-        AutoResizingOrderedCollection
-        BIG5EncodedString
-        BTree
-        BaseNCoder
-        Bezier
-        BinaryTree
-        BinaryTreeNode
-        BitArray
-        BoltLock
-        CRC32Stream
-        CacheDictionary
-        CachedValue
-        CharacterSet
-        Circle
-        CollectingReadStream
-        CollectingSharedQueueStream
-        CompressionStream
-        Cons
-        ConsStream
-        Curve
-        DirectoryContents
-        DoubleLink
-        EllipticalArc
-        ExternalLong
-        FileSorter
-        FileText
-        FilteringStream
-        FourByteString
-        Future
-        GBEncodedString
-        GeometricSeries
-        HTMLUtilities
-        HalfFloatArray
-        HandlerCollection
-        Heap
-        IdentityBag
-        IncrementNotification
-        InterestConverterWithParameters
-        InternalPipeStream
-        Iterator
-        JISEncodedString
-        KSCEncodedString
-        KeywordInContextIndexBuilder
-        Lazy
-        LazyArray
-        LazyValue
-        LineSegment
-        List
-        LoggingStream
-        MacPlistBinaryDecoder
-        MappedCollection
-        MessageChannel
-        Monitor
-        MultiReadStream
-        NameLookupError
-        NumberSet
-        OperationQueue
-        PhoneticStringUtilities
-        PluggableDictionary
-        PluggableSet
-        Polygon
-        PowerSet
-        PrinterStream
-        PrintfScanf
-        PriorityQueue
-        Promise
-        Queue
-        Random
-        RandomBlumBlumShub
-        RandomKISS
-        RandomKISS2
-        RandomMT19937
-        RandomParkMiller
-        RandomRDRand
-        RandomTT800
-        ReindexedCollection
-        RunArray
-        SegmentedOrderedCollection
-        SelectingReadStream
-        SequenceWithSentinel
-        SequenceableCollectionSorter
-        SerialPort
-        SharedCollection
-        Singleton
-        SmallBag
-        Socket
-        SocketAddress
-        SocketAddressInfo
-        SortedSet
-        SoundStream
-        Spline
-        SplittingWriteStream
-        Stack
-        StringPattern
-        StringUtilities
-        TSTree
-        TSTreeNode
-        TerminalSession
-        Text
-        TextClassifier
-        TextStream
-        TreeSet
-        Trie
-        URI
-        UUID
-        UnboxedIntegerArray
-        UndoSupport
-        UnitConverter
-        UnixPTYStream
-        ValueLink
-        VirtualArray
-        WinAPIFunction
-        ZipArchiveConstants
-        #'stx_libbasic2'
-        AATree
-        AATreeNode
-        AppletalkSocketAddress
-        Arrow
-        ArrowedSpline
-        AutoResizingOrderedCollectionWithDefault
-        BZip2Stream
-        BackgroundJob
-        BackgroundPeriodicalJob
-        BackgroundQueueProcessingJob
-        Base32Coder
-        Base64Coder
-        BayesClassifier
-        Bezier2Segment
-        BooleanArray
-        CacheDictionaryWithFactory
-        DecNetSocketAddress
-        EpsonFX1PrinterStream
-        FilteringLineStream
-        HPLjetIIPrinterStream
-        HTMLPrinterStream
-        HierarchicalURI
-        HostAddressLookupError
-        HostNameLookupError
-        IPSocketAddress
-        IntegerArray
-        LazyCons
-        LineNumberReadStream
-        LongIntegerArray
-        PostscriptPrinterStream
-        RandomGenerator
-        SharedQueue
-        SignedIntegerArray
-        SignedLongIntegerArray
-        SignedWordArray
-        TSMultiTree
-        TSMultiTreeNode
-        TimedPromise
-        UDSocketAddress
-        Unicode32String
-        ValueDoubleLink
-        WordArray
-        ZipArchive
-        ZipStream
-        FileURI
-        FtpURI
-        HttpURI
-        IPv6SocketAddress
-        SftpURI
+	"<className> or (<className> attributes...) in load order"
+	AVLTree
+	AbstractBackgroundJob
+	ActiveObject
+	ActorStream
+	Archiver
+	AutoResizingOrderedCollection
+	BIG5EncodedString
+	BTree
+	BaseNCoder
+	Bezier
+	BinaryTree
+	BinaryTreeNode
+	BitArray
+	BoltLock
+	CRC32Stream
+	CacheDictionary
+	CachedValue
+	CharacterSet
+	Circle
+	CollectingReadStream
+	CollectingSharedQueueStream
+	CompressionStream
+	Cons
+	ConsStream
+	Curve
+	DirectoryContents
+	DoubleLink
+	EllipticalArc
+	ExternalLong
+	FileSorter
+	FileText
+	FilteringStream
+	FourByteString
+	Future
+	GBEncodedString
+	GeometricSeries
+	HTMLUtilities
+	HalfFloatArray
+	HandlerCollection
+	Heap
+	IdentityBag
+	IncrementNotification
+	InterestConverterWithParameters
+	InternalPipeStream
+	Iterator
+	JISEncodedString
+	KSCEncodedString
+	KeywordInContextIndexBuilder
+	Lazy
+	LazyArray
+	LazyValue
+	LineSegment
+	List
+	LoggingStream
+	MacPlistBinaryDecoder
+	MappedCollection
+	MessageChannel
+	Monitor
+	MultiReadStream
+	NameLookupError
+	NumberSet
+	OperationQueue
+	PhoneticStringUtilities
+	PluggableDictionary
+	PluggableSet
+	Polygon
+	PowerSet
+	PrinterStream
+	PrintfScanf
+	PriorityQueue
+	Promise
+	Queue
+	Random
+	RandomBlumBlumShub
+	RandomKISS
+	RandomKISS2
+	RandomMT19937
+	RandomParkMiller
+	RandomRDRand
+	RandomTT800
+	ReindexedCollection
+	RunArray
+	SegmentedOrderedCollection
+	SelectingReadStream
+	SequenceWithSentinel
+	SequenceableCollectionSorter
+	SerialPort
+	SharedCollection
+	Singleton
+	SmallBag
+	Socket
+	SocketAddress
+	SocketAddressInfo
+	SortedSet
+	SoundStream
+	Spline
+	SplittingWriteStream
+	Stack
+	StringPattern
+	StringUtilities
+	TSTree
+	TSTreeNode
+	TerminalSession
+	Text
+	TextClassifier
+	TextStream
+	TreeSet
+	Trie
+	URI
+	UUID
+	UnboxedIntegerArray
+	UndoSupport
+	UnitConverter
+	UnixPTYStream
+	ValueLink
+	VirtualArray
+	ZipArchiveConstants
+	#'stx_libbasic2'
+	AATree
+	AATreeNode
+	AppletalkSocketAddress
+	Arrow
+	ArrowedSpline
+	AutoResizingOrderedCollectionWithDefault
+	BZip2Stream
+	BackgroundJob
+	BackgroundPeriodicalJob
+	BackgroundQueueProcessingJob
+	Base32Coder
+	Base64Coder
+	BayesClassifier
+	Bezier2Segment
+	BooleanArray
+	CacheDictionaryWithFactory
+	DecNetSocketAddress
+	EpsonFX1PrinterStream
+	FilteringLineStream
+	HPLjetIIPrinterStream
+	HTMLPrinterStream
+	HierarchicalURI
+	HostAddressLookupError
+	HostNameLookupError
+	IPSocketAddress
+	IntegerArray
+	LazyCons
+	LineNumberReadStream
+	LongIntegerArray
+	PostscriptPrinterStream
+	RandomGenerator
+	SharedQueue
+	SignedIntegerArray
+	SignedLongIntegerArray
+	SignedWordArray
+	TSMultiTree
+	TSMultiTreeNode
+	TimedPromise
+	UDSocketAddress
+	Unicode32String
+	ValueDoubleLink
+	WordArray
+	ZipArchive
+	ZipStream
+	FileURI
+	FtpURI
+	HttpURI
+	IPv6SocketAddress
+	SftpURI
     )
 !
 
@@ -362,49 +361,49 @@
      if it has extensions."
 
     ^ #(
-        CharacterArray asKoelnerPhoneticCode
-        CharacterArray asSoundexCode
-        CharacterArray printf:
-        CharacterArray printf:on:
-        CharacterArray printfWith:
-        CharacterArray printfWith:with:
-        CharacterArray printfWith:with:with:
-        CharacterArray printfWith:with:with:with:
-        CharacterArray #'printf_formatArgCount'
-        CharacterArray #'printf_printArgFrom:to:withData:'
-        CharacterArray #'printf_printOn:withData:'
-        CharacterArray scanf:
-        CharacterArray #'scanf_scanArgFrom:to:format:'
-        CharacterArray sscanf:
-        Float absDecimalPrintOn:digits:
-        Float absPrintOn:digits:
-        Float absScientificPrintOn:digits:
-        Object addInterest:
-        Object asDoubleLink
-        Object expressInterestIn:for:sendBack:
-        Object interests
-        Object interestsFor:
-        Object onChangeEvaluate:
-        Object onChangeSend:to:
-        Object removeActionsForEvent:
-        Object removeActionsWithReceiver:
-        Object removeAllActionsWithReceiver:
-        Object removeInterest:
-        Object retractInterestIn:for:
-        Object retractInterests
-        Object retractInterestsFor:
-        Object retractInterestsForWhich:
-        Object retractInterestsIn:
-        Object trigger:
-        Object trigger:with:
-        Object triggerEvent:
-        Object triggerEvent:with:
-        Object triggerEvent:withArguments:
-        Object when:send:to:
-        Object when:send:to:with:
-        Object when:sendTo:
-        Stream collecting:
-        Stream selecting:
+	CharacterArray asKoelnerPhoneticCode
+	CharacterArray asSoundexCode
+	CharacterArray printf:
+	CharacterArray printf:on:
+	CharacterArray printfWith:
+	CharacterArray printfWith:with:
+	CharacterArray printfWith:with:with:
+	CharacterArray printfWith:with:with:with:
+	CharacterArray #'printf_formatArgCount'
+	CharacterArray #'printf_printArgFrom:to:withData:'
+	CharacterArray #'printf_printOn:withData:'
+	CharacterArray scanf:
+	CharacterArray #'scanf_scanArgFrom:to:format:'
+	CharacterArray sscanf:
+	Float absDecimalPrintOn:digits:
+	Float absPrintOn:digits:
+	Float absScientificPrintOn:digits:
+	Object addInterest:
+	Object asDoubleLink
+	Object expressInterestIn:for:sendBack:
+	Object interests
+	Object interestsFor:
+	Object onChangeEvaluate:
+	Object onChangeSend:to:
+	Object removeActionsForEvent:
+	Object removeActionsWithReceiver:
+	Object removeAllActionsWithReceiver:
+	Object removeInterest:
+	Object retractInterestIn:for:
+	Object retractInterests
+	Object retractInterestsFor:
+	Object retractInterestsForWhich:
+	Object retractInterestsIn:
+	Object trigger:
+	Object trigger:with:
+	Object triggerEvent:
+	Object triggerEvent:with:
+	Object triggerEvent:withArguments:
+	Object when:send:to:
+	Object when:send:to:with:
+	Object when:sendTo:
+	Stream collecting:
+	Stream selecting:
     )
 ! !
 
@@ -447,4 +446,3 @@
 version_CVS
     ^ '$Header$'
 ! !
-
--- a/vms.mak	Thu Jun 09 14:55:22 2016 +0200
+++ b/vms.mak	Thu Jun 09 16:24:55 2016 +0200
@@ -1,8 +1,8 @@
 #
-# DO NOT EDIT 
+# DO NOT EDIT
 # automatically generated from Make.proto
 #
-# $Header: /cvs/stx/stx/libbasic2/vms.mak,v 1.4 1999-09-18 14:04:54 cg Exp $
+# $Header$
 #
 TOP=..
 LIBNAME=libbasic2
@@ -58,68 +58,67 @@
 
 
 # BEGINMAKEDEPEND
-$(OUTDIR)ActorStream.$(O) ActorStream.$(H): ActorStream.st $(STCHDR)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Arrow.$(O) Arrow.$(H): Arrow.st $(STCHDR) 
-$(OUTDIR)ArrowedSpline.$(O) ArrowedSpline.$(H): ArrowedSpline.st $(STCHDR) 
-$(OUTDIR)BIG5EncodedString.$(O) BIG5EncodedString.$(H): BIG5EncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Bezier.$(O) Bezier.$(H): Bezier.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Bezier2Segment.$(O) Bezier2Segment.$(H): Bezier2Segment.st $(STCHDR) 
-$(OUTDIR)BitArray.$(O) BitArray.$(H): BitArray.st $(STCHDR) 
-$(OUTDIR)BooleanArray.$(O) BooleanArray.$(H): BooleanArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)CacheDictionary.$(O) CacheDictionary.$(H): CacheDictionary.st $(STCHDR)  ../include/Dictionary.$(H)  ../include/Set.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)CachingRegistry.$(O) CachingRegistry.$(H): CachingRegistry.st $(STCHDR)  ../include/Registry.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Circle.$(O) Circle.$(H): Circle.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H) 
-$(OUTDIR)CollectingSharedQueueStream.$(O) CollectingSharedQueueStream.$(H): CollectingSharedQueueStream.st $(STCHDR)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Curve.$(O) Curve.$(H): Curve.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H) 
-$(OUTDIR)DirectoryContents.$(O) DirectoryContents.$(H): DirectoryContents.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)EllipticalArc.$(O) EllipticalArc.$(H): EllipticalArc.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H) 
-$(OUTDIR)EpsonFX1PrinterStream.$(O) EpsonFX1PrinterStream.$(H): EpsonFX1PrinterStream.st $(STCHDR)  ../include/PrinterStream.$(H)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)ExternalLong.$(O) ExternalLong.$(H): ExternalLong.st $(STCHDR)  ../include/ExternalBytes.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)FileText.$(O) FileText.$(H): FileText.st $(STCHDR)  ../include/StringCollection.$(H)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)GBEncodedString.$(O) GBEncodedString.$(H): GBEncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)HPLjetIIPrinterStream.$(O) HPLjetIIPrinterStream.$(H): HPLjetIIPrinterStream.st $(STCHDR)  ../include/PrinterStream.$(H)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)HandlerCollection.$(O) HandlerCollection.$(H): HandlerCollection.st $(STCHDR)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)IPSocketAddress.$(O) IPSocketAddress.$(H): IPSocketAddress.st $(STCHDR) 
-$(OUTDIR)IntegerArray.$(O) IntegerArray.$(H): IntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)JISEncodedString.$(O) JISEncodedString.$(H): JISEncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)KSCEncodedString.$(O) KSCEncodedString.$(H): KSCEncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)KeyedCollection.$(O) KeyedCollection.$(H): KeyedCollection.st $(STCHDR)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)LineSegment.$(O) LineSegment.$(H): LineSegment.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H) 
-$(OUTDIR)List.$(O) List.$(H): List.st $(STCHDR)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)LongIntegerArray.$(O) LongIntegerArray.$(H): LongIntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)MappedCollection.$(O) MappedCollection.$(H): MappedCollection.st $(STCHDR)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)MessageChannel.$(O) MessageChannel.$(H): MessageChannel.st $(STCHDR)  ../include/MessageSend.$(H)  ../include/Message.$(H)  ../include/Object.$(H) 
-$(OUTDIR)MessageSend.$(O) MessageSend.$(H): MessageSend.st $(STCHDR)  ../include/Message.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Monitor.$(O) Monitor.$(H): Monitor.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)Polygon.$(O) Polygon.$(H): Polygon.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H) 
-$(OUTDIR)PostscriptPrinterStream.$(O) PostscriptPrinterStream.$(H): PostscriptPrinterStream.st $(STCHDR)  ../include/PrinterStream.$(H)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)PrinterStream.$(O) PrinterStream.$(H): PrinterStream.st $(STCHDR)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Promise.$(O) Promise.$(H): Promise.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)Queue.$(O) Queue.$(H): Queue.st $(STCHDR)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Random.$(O) Random.$(H): Random.st $(STCHDR)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)RecursionLock.$(O) RecursionLock.$(H): RecursionLock.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)RunArray.$(O) RunArray.$(H): RunArray.st $(STCHDR)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)SequenceableCollectionSorter.$(O) SequenceableCollectionSorter.$(H): SequenceableCollectionSorter.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)SharedQueue.$(O) SharedQueue.$(H): SharedQueue.st $(STCHDR)  ../include/Queue.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)SignedIntegerArray.$(O) SignedIntegerArray.$(H): SignedIntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)SignedLongIntegerArray.$(O) SignedLongIntegerArray.$(H): SignedLongIntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)SignedWordArray.$(O) SignedWordArray.$(H): SignedWordArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)SocketAddress.$(O) SocketAddress.$(H): SocketAddress.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)Socket.$(O) Socket.$(H): Socket.st $(STCHDR)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)SoundStream.$(O) SoundStream.$(H): SoundStream.st $(STCHDR)  ../include/FileStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Spline.$(O) Spline.$(H): Spline.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H) 
-$(OUTDIR)StringCollection.$(O) StringCollection.$(H): StringCollection.st $(STCHDR)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)Text.$(O) Text.$(H): Text.st $(STCHDR)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)TextStream.$(O) TextStream.$(H): TextStream.st $(STCHDR)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)TwoByteString.$(O) TwoByteString.$(H): TwoByteString.st $(STCHDR)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UDSocketAddress.$(O) UDSocketAddress.$(H): UDSocketAddress.st $(STCHDR) 
-$(OUTDIR)UnicodeString.$(O) UnicodeString.$(H): UnicodeString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)UnitConverter.$(O) UnitConverter.$(H): UnitConverter.st $(STCHDR)  ../include/Object.$(H) 
-$(OUTDIR)UnixPTYStream.$(O) UnixPTYStream.$(H): UnixPTYStream.st $(STCHDR)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H) 
-$(OUTDIR)ValueLink.$(O) ValueLink.$(H): ValueLink.st $(STCHDR)  ../include/Link.$(H)  ../include/Object.$(H) 
-$(OUTDIR)VariableArray.$(O) VariableArray.$(H): VariableArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)VariableString.$(O) VariableString.$(H): VariableString.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)WinAPIFunction.$(O) WinAPIFunction.$(H): WinAPIFunction.st $(STCHDR)  ../include/ExternalFunction.$(H)  ../include/ExecutableFunction.$(H)  ../include/Object.$(H) 
-$(OUTDIR)WordArray.$(O) WordArray.$(H): WordArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H) 
-$(OUTDIR)ZipArchive.$(O) ZipArchive.$(H): ZipArchive.st $(STCHDR)  ../include/Object.$(H) 
+$(OUTDIR)ActorStream.$(O) ActorStream.$(H): ActorStream.st $(STCHDR)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)Arrow.$(O) Arrow.$(H): Arrow.st $(STCHDR)
+$(OUTDIR)ArrowedSpline.$(O) ArrowedSpline.$(H): ArrowedSpline.st $(STCHDR)
+$(OUTDIR)BIG5EncodedString.$(O) BIG5EncodedString.$(H): BIG5EncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)Bezier.$(O) Bezier.$(H): Bezier.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H)
+$(OUTDIR)Bezier2Segment.$(O) Bezier2Segment.$(H): Bezier2Segment.st $(STCHDR)
+$(OUTDIR)BitArray.$(O) BitArray.$(H): BitArray.st $(STCHDR)
+$(OUTDIR)BooleanArray.$(O) BooleanArray.$(H): BooleanArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)CacheDictionary.$(O) CacheDictionary.$(H): CacheDictionary.st $(STCHDR)  ../include/Dictionary.$(H)  ../include/Set.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)CachingRegistry.$(O) CachingRegistry.$(H): CachingRegistry.st $(STCHDR)  ../include/Registry.$(H)  ../include/Object.$(H)
+$(OUTDIR)Circle.$(O) Circle.$(H): Circle.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H)
+$(OUTDIR)CollectingSharedQueueStream.$(O) CollectingSharedQueueStream.$(H): CollectingSharedQueueStream.st $(STCHDR)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)Curve.$(O) Curve.$(H): Curve.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H)
+$(OUTDIR)DirectoryContents.$(O) DirectoryContents.$(H): DirectoryContents.st $(STCHDR)  ../include/Object.$(H)
+$(OUTDIR)EllipticalArc.$(O) EllipticalArc.$(H): EllipticalArc.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H)
+$(OUTDIR)EpsonFX1PrinterStream.$(O) EpsonFX1PrinterStream.$(H): EpsonFX1PrinterStream.st $(STCHDR)  ../include/PrinterStream.$(H)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)ExternalLong.$(O) ExternalLong.$(H): ExternalLong.st $(STCHDR)  ../include/ExternalBytes.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)FileText.$(O) FileText.$(H): FileText.st $(STCHDR)  ../include/StringCollection.$(H)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)GBEncodedString.$(O) GBEncodedString.$(H): GBEncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)HPLjetIIPrinterStream.$(O) HPLjetIIPrinterStream.$(H): HPLjetIIPrinterStream.st $(STCHDR)  ../include/PrinterStream.$(H)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)HandlerCollection.$(O) HandlerCollection.$(H): HandlerCollection.st $(STCHDR)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)IPSocketAddress.$(O) IPSocketAddress.$(H): IPSocketAddress.st $(STCHDR)
+$(OUTDIR)IntegerArray.$(O) IntegerArray.$(H): IntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)JISEncodedString.$(O) JISEncodedString.$(H): JISEncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)KSCEncodedString.$(O) KSCEncodedString.$(H): KSCEncodedString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)KeyedCollection.$(O) KeyedCollection.$(H): KeyedCollection.st $(STCHDR)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)LineSegment.$(O) LineSegment.$(H): LineSegment.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H)
+$(OUTDIR)List.$(O) List.$(H): List.st $(STCHDR)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)LongIntegerArray.$(O) LongIntegerArray.$(H): LongIntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)MappedCollection.$(O) MappedCollection.$(H): MappedCollection.st $(STCHDR)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)MessageChannel.$(O) MessageChannel.$(H): MessageChannel.st $(STCHDR)  ../include/MessageSend.$(H)  ../include/Message.$(H)  ../include/Object.$(H)
+$(OUTDIR)MessageSend.$(O) MessageSend.$(H): MessageSend.st $(STCHDR)  ../include/Message.$(H)  ../include/Object.$(H)
+$(OUTDIR)Monitor.$(O) Monitor.$(H): Monitor.st $(STCHDR)  ../include/Object.$(H)
+$(OUTDIR)Polygon.$(O) Polygon.$(H): Polygon.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H)
+$(OUTDIR)PostscriptPrinterStream.$(O) PostscriptPrinterStream.$(H): PostscriptPrinterStream.st $(STCHDR)  ../include/PrinterStream.$(H)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)PrinterStream.$(O) PrinterStream.$(H): PrinterStream.st $(STCHDR)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)Promise.$(O) Promise.$(H): Promise.st $(STCHDR)  ../include/Object.$(H)
+$(OUTDIR)Queue.$(O) Queue.$(H): Queue.st $(STCHDR)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)Random.$(O) Random.$(H): Random.st $(STCHDR)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)RecursionLock.$(O) RecursionLock.$(H): RecursionLock.st $(STCHDR)  ../include/Object.$(H)
+$(OUTDIR)RunArray.$(O) RunArray.$(H): RunArray.st $(STCHDR)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)SequenceableCollectionSorter.$(O) SequenceableCollectionSorter.$(H): SequenceableCollectionSorter.st $(STCHDR)  ../include/Object.$(H)
+$(OUTDIR)SharedQueue.$(O) SharedQueue.$(H): SharedQueue.st $(STCHDR)  ../include/Queue.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)SignedIntegerArray.$(O) SignedIntegerArray.$(H): SignedIntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)SignedLongIntegerArray.$(O) SignedLongIntegerArray.$(H): SignedLongIntegerArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)SignedWordArray.$(O) SignedWordArray.$(H): SignedWordArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)SocketAddress.$(O) SocketAddress.$(H): SocketAddress.st $(STCHDR)  ../include/Object.$(H)
+$(OUTDIR)Socket.$(O) Socket.$(H): Socket.st $(STCHDR)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)SoundStream.$(O) SoundStream.$(H): SoundStream.st $(STCHDR)  ../include/FileStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)Spline.$(O) Spline.$(H): Spline.st $(STCHDR)  ../include/Geometric.$(H)  ../include/Object.$(H)
+$(OUTDIR)StringCollection.$(O) StringCollection.$(H): StringCollection.st $(STCHDR)  ../include/OrderedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)Text.$(O) Text.$(H): Text.st $(STCHDR)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)TextStream.$(O) TextStream.$(H): TextStream.st $(STCHDR)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)TwoByteString.$(O) TwoByteString.$(H): TwoByteString.st $(STCHDR)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)UDSocketAddress.$(O) UDSocketAddress.$(H): UDSocketAddress.st $(STCHDR)
+$(OUTDIR)UnicodeString.$(O) UnicodeString.$(H): UnicodeString.st $(STCHDR)  ../include/TwoByteString.$(H)  ../include/CharacterArray.$(H)  ../include/ByteArray.$(H)  ../include/UninterpretedBytes.$(H)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)UnitConverter.$(O) UnitConverter.$(H): UnitConverter.st $(STCHDR)  ../include/Object.$(H)
+$(OUTDIR)UnixPTYStream.$(O) UnixPTYStream.$(H): UnixPTYStream.st $(STCHDR)  ../include/PipeStream.$(H)  ../include/NonPositionableExternalStream.$(H)  ../include/ExternalStream.$(H)  ../include/ReadWriteStream.$(H)  ../include/WriteStream.$(H)  ../include/PositionableStream.$(H)  ../include/PeekableStream.$(H)  ../include/Stream.$(H)  ../include/Object.$(H)
+$(OUTDIR)ValueLink.$(O) ValueLink.$(H): ValueLink.st $(STCHDR)  ../include/Link.$(H)  ../include/Object.$(H)
+$(OUTDIR)VariableArray.$(O) VariableArray.$(H): VariableArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)VariableString.$(O) VariableString.$(H): VariableString.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)WordArray.$(O) WordArray.$(H): WordArray.st $(STCHDR)  ../include/ArrayedCollection.$(H)  ../include/SequenceableCollection.$(H)  ../include/Collection.$(H)  ../include/Object.$(H)
+$(OUTDIR)ZipArchive.$(O) ZipArchive.$(H): ZipArchive.st $(STCHDR)  ../include/Object.$(H)
 # ENDMAKEDEPEND