hg/stx-libbasic2: comparison Base64Coder.st

equal deleted inserted replaced

-:a1b3e12f6ac0
+:0e400da67727
 "{ Encoding: utf8 }"
 "
 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
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 !Base64Coder class methodsFor:'documentation'!
 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
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 documentation
 "
 Instances of this class perform Base64 en- and decoding as defined in RFC 2045
 3 bytes are mapped to 4 characters, representing 6 bits each.
 The encoded string consists only of characters from the set:
-'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+	'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
 Notice: for URLs, a slightly different encoding is used,
 where instead of plus and slash, minus and underline are generated (see Base64UrlCoder).
 The main entry point API is:
-Base64Coder encode:aStringOrBytes
+	Base64Coder encode:aStringOrBytes
 and
-Base64Coder decode:aString
+	Base64Coder decode:aString
 Typically, binary data is encoded as base64,
 so the natural return value is a byte array.
 If the decoder should return a string, use
-Base64Coder decodeAsString:aString.
+	Base64Coder decodeAsString:aString.
 otherwise, a bytearray is returned from the decode: method.
 [author:]
-Stefan Vogel
+	Stefan Vogel
 [see also:]
-RFC https://tools.ietf.org/html/rfc4648
+	RFC https://tools.ietf.org/html/rfc4648
 [instance variables:]
 [class variables:]
-Base64Mapping         String   Mapping from bytes (with 6 valid bits)
+	Base64Mapping         String   Mapping from bytes (with 6 valid bits)
-to Base64 characters
+				       to Base64 characters
-Base64ReverseMapping  Array    Mapping from Base64 characters to 6-bit-Bytes
+	Base64ReverseMapping  Array    Mapping from Base64 characters to 6-bit-Bytes
 "
 !
 examples
 "
-[exBegin]
+								[exBegin]
 (Base64Coder encode:'queen%27s%20gambit') asString = 'cXVlZW4lMjdzJTIwZ2FtYml0'
-[exEnd]
+								[exEnd]
-[exBegin]
+								[exBegin]
 (Base64Coder decode:'cXVlZW4lMjdzJTIwZ2FtYml0') asString = 'queen%27s%20gambit'
-[exEnd]
+								[exEnd]
-[exBegin]
+								[exBegin]
 |data1 text data2|
 data1 := #[0 1 16r7F 16r80 16r81 16rFE 16rFF].
 text := Base64Coder encode:data1.
 data2 := Base64Coder decode:text.
 data2
-[exEnd]
+								[exEnd]
-[exBegin]
+								[exBegin]
 |coder|
 coder := Base64Coder on:'' writeStream.
 coder nextPutAll:#[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19].
 coder flush.
 coder contents inspect.
 coder reset.
 coder nextPut:254.
 coder contents inspect.
-[exEnd]
+								[exEnd]
-[exBegin]
+								[exBegin]
 |coder decoder|
 coder := Base64Coder on:'' writeStream.
 coder nextPutAll:#[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20].
 coder flush.
 decoder := Base64Coder on:(coder contents readStream).
 [decoder atEnd] whileFalse:[
 Transcript show:decoder next
 ].
 Transcript cr.
-[exEnd]
+								[exEnd]
-[exBegin]
+								[exBegin]
 |coder|
 coder := Base64Coder on:'' writeStream.
 coder nextPutAll:(0 to:200) asByteArray.
 coder flush.
 Transcript showCR:(coder contents).
-[exEnd]
+								[exEnd]
-[exBegin]
+								[exBegin]
 |bytes|
 bytes := ByteArray new:100000.
 Time millisecondsToRun:[
 100 timesRepeat:[
-Base64Coder encode:bytes.
+	   Base64Coder encode:bytes.
 ].
 ].
-[exEnd]
+								[exEnd]
-[exBegin]
+								[exBegin]
 |bytes encoded decoded|
 bytes := #[0 0 0] copy.
 0 to:255 do:[:b1 |
 Transcript showCR:b1.
 bytes at:1 put:b1.
 0 to:255 do:[:b2 |
-bytes at:2 put:b2.
+	   bytes at:2 put:b2.
-0 to:255 do:[:b3 |
+	   0 to:255 do:[:b3 |
-bytes at:3 put:b3.
+	       bytes at:3 put:b3.
-encoded := Base64Coder encode:bytes.
+	       encoded := Base64Coder encode:bytes.
-decoded := Base64Coder decode:encoded.
+	       decoded := Base64Coder decode:encoded.
-self assert:(decoded = bytes).
+	       self assert:(decoded = bytes).
-]
+	   ]
 ]
 ].
-[exEnd]
+								[exEnd]
 "
 ! !
 !Base64Coder class methodsFor:'initialization'!
 initializeMappings
 "initialize class variables"
 Base64Mapping isNil ifTrue:[
-"65 characters representing the 6-bit values from 0-63 and one pad character"
+	"65 characters representing the 6-bit values from 0-63 and one pad character"
-Base64Mapping := 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.
+	Base64Mapping := 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.
-Base64ReverseMapping := self reverseMappingFor:Base64Mapping.
+	Base64ReverseMapping := self reverseMappingFor:Base64Mapping.
 ].
 "
 Base64Mapping := nil.
 self initializeMappings
 a specially tuned version is provided here
 for the common case of decoding a string.
 This returns a byteArray."
 aStringOrStream isString ifTrue:[
-^ self fastDecodeString:aStringOrStream asString:false
+	^ self fastDecodeString:aStringOrStream asString:false
 ].
 ^ super decode:aStringOrStream.
 "Created: / 30-09-2018 / 14:14:51 / Claus Gittinger"
 "Modified: / 21-03-2019 / 22:37:27 / Claus Gittinger"
 !
 a specially tuned version is provided here
 for the common case of decoding a string.
 This returns a string."
 encodedString isString ifTrue:[
-^ self fastDecodeString:encodedString asString:true
+	^ self fastDecodeString:encodedString asString:true
 ].
 ^ super decodeAsString:encodedString.
 "Created: / 21-03-2019 / 20:43:47 / Claus Gittinger"
 "Modified: / 21-03-2019 / 22:10:24 / Claus Gittinger"
 !
 encode:aStringOrStream
 "because base64 encoding is used heavily in some protocols,
 a specially tuned version is provided here
 for the common case of encoding a string.
 A string is generated with an inserted
 newline after every 76 characters (see RFC 2045)"
 (aStringOrStream isString or:[aStringOrStream isByteArray]) ifTrue:[
-^ self fastEncode:aStringOrStream asString:true lineLimit:(self lineLimit)
+	^ self fastEncode:aStringOrStream asString:true lineLimit:(self lineLimit)
 ].
 ^ super encode:aStringOrStream.
 "Created: / 21-03-2019 / 20:44:35 / Claus Gittinger"
 "Modified: / 21-03-2019 / 22:33:37 / Claus Gittinger"
 !
 "
 (Base64Coder encode:'queen%27s%20gambit') => 'cXVlZW4lMjdzJTIwZ2FtYml0'
 (Base64Coder decode:'cXVlZW4lMjdzJTIwZ2FtYml0') => #[113 117 101 101 110 37 50 55 115 37 50 48 103 97 109 98 105 116]
 (Base64Coder decode:'cXVlZW4lMjdzJTIwZ2FtYml0') asString => 'queen%27s%20gambit'
 (Base64Coder decodeAsString:'cXVlZW4lMjdzJTIwZ2FtYml0') => 'queen%27s%20gambit'
 (Base64Coder fastDecodeString:'cXVlZW4lMjdzJTIwZ2FtYml0') asString => 'queen%27s%20gambit'
 "
 "Created: / 30-09-2018 / 14:36:58 / Claus Gittinger"
 "Modified (comment): / 21-03-2019 / 22:12:07 / Claus Gittinger"
 !
 fastDecodeString:aString asString:asStringBoolean
 "because base64 decoding is used heavily in some protocols,
 a specially tuned version is provided here
 for the common case of decoding a string.
 If the argument is true, a string is returned;
 otherwise, a bytearray"
 |decoding revMapping|
 revMapping := self reverseMapping.
 revMapping isNil ifTrue:[
-self initializeMappings.
+	self initializeMappings.
-revMapping := self reverseMapping.
+	revMapping := self reverseMapping.
 ].
 %{
 // overallocate by 3
 #   define N_QUICKBUFFER 512
 if (__isStringLike(aString)
 && __isByteArray(revMapping)) {
-unsigned char *_revMapping = __stringVal(revMapping);
+	unsigned char *_revMapping = __stringVal(revMapping);
-int numInChars = __stringSize(aString);
+	int numInChars = __stringSize(aString);
-char *in = __stringVal(aString);
+	char *in = __stringVal(aString);
-unsigned char quickBuffer[N_QUICKBUFFER+3];
+	unsigned char quickBuffer[N_QUICKBUFFER+3];
-unsigned char *buffer = quickBuffer;
+	unsigned char *buffer = quickBuffer;
-int bufferSize = N_QUICKBUFFER;
+	int bufferSize = N_QUICKBUFFER;
-int outLen = 0;
+	int outLen = 0;
-int charBuffer = 0;
+	int charBuffer = 0;
-int nBitsOut = 0;
+	int nBitsOut = 0;
-int i;
+	int i;
-for (i=0; i<numInChars; i++) {
+	for (i=0; i<numInChars; i++) {
-char ch = in[i];
+	    char ch = in[i];
-int bits = -1;
+	    int bits = -1;
-if (ch <= 127) {
+	    if (ch <= 127) {
-bits = _revMapping[(ch-1) & 0x7F];
+		bits = _revMapping[(ch-1) & 0x7F];
-}
+	    }
-if ((unsigned)bits <= 0x3F) {
+	    if ((unsigned)bits <= 0x3F) {
-charBuffer = (charBuffer << 6) | bits;
+		charBuffer = (charBuffer << 6) | bits;
-nBitsOut += 6;
+		nBitsOut += 6;
-if (nBitsOut == 24) {
+		if (nBitsOut == 24) {
-if ((outLen + 3) > bufferSize) {
+		    if ((outLen + 3) > bufferSize) {
-if (buffer == quickBuffer) {
+			if (buffer == quickBuffer) {
-// overallocate by 3
+			    // overallocate by 3
-buffer = (unsigned char *)malloc(bufferSize*2+3);
+			    buffer = (unsigned char *)malloc(bufferSize*2+3);
-memcpy(buffer, quickBuffer, bufferSize);
+			    memcpy(buffer, quickBuffer, bufferSize);
-} else {
+			} else {
-buffer = (unsigned char *)realloc(buffer, bufferSize*2+3);
+			    buffer = (unsigned char *)realloc(buffer, bufferSize*2+3);
-}
+			}
-bufferSize = bufferSize * 2;
+			bufferSize = bufferSize * 2;
-}
+		    }
-buffer[outLen] = (charBuffer >> 16) & 0xFF;
+		    buffer[outLen] = (charBuffer >> 16) & 0xFF;
-buffer[outLen+1] = (charBuffer >> 8) & 0xFF;
+		    buffer[outLen+1] = (charBuffer >> 8) & 0xFF;
-buffer[outLen+2] = (charBuffer) & 0xFF;
+		    buffer[outLen+2] = (charBuffer) & 0xFF;
-outLen += 3;
+		    outLen += 3;
-charBuffer = nBitsOut = 0;
+		    charBuffer = nBitsOut = 0;
-}
+		}
-} else {
+	    } else {
-if ((unsigned)bits == 0x40) {
+		if ((unsigned)bits == 0x40) {
-// end mark
+		    // end mark
-// because of overallocation, there is no need to check for buffer-full condition here
+		    // because of overallocation, there is no need to check for buffer-full condition here
-if (nBitsOut == 12) {
+		    if (nBitsOut == 12) {
-// data has been padded to 12, skip 4 bits
+			// data has been padded to 12, skip 4 bits
-// one more byte coming
+			// one more byte coming
-charBuffer >>= 4;
+			charBuffer >>= 4;
-nBitsOut -= 4;
+			nBitsOut -= 4;
-buffer[outLen] = (charBuffer) & 0xFF;
+			buffer[outLen] = (charBuffer) & 0xFF;
-outLen += 1;
+			outLen += 1;
-} else if (nBitsOut == 18) {
+		    } else if (nBitsOut == 18) {
-// data has been padded to 18, skip 2 bits
+			// data has been padded to 18, skip 2 bits
-charBuffer >>= 2;
+			charBuffer >>= 2;
-nBitsOut -= 2;
+			nBitsOut -= 2;
-buffer[outLen] = (charBuffer >> 8) & 0xFF;
+			buffer[outLen] = (charBuffer >> 8) & 0xFF;
-buffer[outLen+1] = (charBuffer) & 0xFF;
+			buffer[outLen+1] = (charBuffer) & 0xFF;
-outLen += 2;
+			outLen += 2;
-}
+		    }
-} else {
+		} else {
-// ignore
+		    // ignore
-}
+		}
-}
+	    }
-}
+	}
-if (asStringBoolean == true) {
+	if (asStringBoolean == true) {
-decoding = __MKSTRING_L(buffer, outLen);
+	    decoding = __MKSTRING_L(buffer, outLen);
-} else {
+	} else {
-decoding = __MKBYTEARRAY(buffer, outLen);
+	    decoding = __MKBYTEARRAY(buffer, outLen);
-}
+	}
-if (buffer != quickBuffer) {
+	if (buffer != quickBuffer) {
-free(buffer);
+	    free(buffer);
-}
+	}
-RETURN(decoding);
+	RETURN(decoding);
 }
 %}.
 decoding := super decode:aString.
 asStringBoolean ifTrue:[
-^ decoding asString
+	^ decoding asString
 ].
 ^ decoding
 "
 (Base64Coder encode:'queen%27s%20gambit') => 'cXVlZW4lMjdzJTIwZ2FtYml0'
 (Base64Coder decode:'cXVlZW4lMjdzJTIwZ2FtYml0') asString => 'queen%27s%20gambit'
 (Base64Coder fastDecodeString:'cXVlZW4lMjdzJTIwZ2FtYml0') asString => 'queen%27s%20gambit'
 |data encoded|
 data := ByteArray new:100000.
 encoded := Base64Coder encode:data.
 Time millisecondsToRun:[
-10 timesRepeat:[
+	10 timesRepeat:[
-Base64Coder decode:encoded.
+	    Base64Coder decode:encoded.
-]
+	]
 ]
 |data encoded|
 data := ByteArray new:100000.
 encoded := Base64Coder encode:data.
 Time millisecondsToRun:[
-10 timesRepeat:[
+	10 timesRepeat:[
-Base64Coder fastDecodeString:encoded.
+	    Base64Coder fastDecodeString:encoded.
-]
+	]
 ]
 "
 "Created: / 30-09-2018 / 14:35:05 / Claus Gittinger"
 "Modified: / 21-03-2019 / 22:34:49 / Claus Gittinger"
 !
 fastEncode:aStringOrByteArray
 "because base64 encoding is used heavily in some protocols,
 a specially tuned version is provided here
 for the common case of encoding a string or bytearray.
 A string is generated with an inserted
 newline after every 76 characters (see RFC 2045)"
 "Modified (comment): / 21-03-2019 / 22:14:17 / Claus Gittinger"
 !
 fastEncode:aStringOrByteArray asString:asStringBoolean lineLimit:lineLimitOrNil
 "because base64 encoding is used heavily in some protocols,
 a specially tuned version is provided here
 for the common case of encoding a string.
 If asStringBoolean is true, a string is generated; otherwise, a bytearray is returned.
 If lineLimitOrNil is non-nil, a newline is inserted after every such number of characters"
 |encoding mapping|
 mapping := self mapping.
 mapping isNil ifTrue:[
-self initializeMappings.
+	self initializeMappings.
-mapping := self mapping.
+	mapping := self mapping.
 ].
 %{
 // overallocate by 5
 #   define N_QUICKBUFFER 512
 int argIsString = __isStringLike(aStringOrByteArray);
 if ((argIsString || __isByteArray(aStringOrByteArray))
 && __isStringLike(mapping)) {
-unsigned char *__mapping = __stringVal(mapping);;
+	unsigned char *__mapping = __stringVal(mapping);
-int numInChars;
+	int numInChars;
-unsigned char *in;
+	unsigned char *in;
-unsigned char quickBuffer[N_QUICKBUFFER+5];
+	unsigned char quickBuffer[N_QUICKBUFFER+5];
-unsigned char *buffer = quickBuffer;
+	unsigned char *buffer = quickBuffer;
-int bufferSize = N_QUICKBUFFER;
+	int bufferSize = N_QUICKBUFFER;
-int outLen = 0;
+	int outLen = 0;
-int nBitsOut = 0;
+	int nBitsOut = 0;
-int i;
+	int i;
-int numInCharsMinus3;
+	int numInCharsMinus3;
-unsigned int lineLimit = ~0;
+	unsigned int lineLimit = ~0;
-int lineLength = 0;
+	int lineLength = 0;
-int restLength = 0;
+	int restLength = 0;
-if (__isSmallInteger(lineLimitOrNil)) {
+	if (__isSmallInteger(lineLimitOrNil)) {
-lineLimit = __intVal(lineLimitOrNil);
+	    lineLimit = __intVal(lineLimitOrNil);
-}
+	}
-if (argIsString) {
+	if (argIsString) {
-numInChars = __stringSize(aStringOrByteArray);
+	    numInChars = __stringSize(aStringOrByteArray);
-in = __stringVal(aStringOrByteArray);
+	    in = __stringVal(aStringOrByteArray);
-} else {
+	} else {
-numInChars = __byteArraySize(aStringOrByteArray);
+	    numInChars = __byteArraySize(aStringOrByteArray);
-in = __byteArrayVal(aStringOrByteArray);
+	    in = __byteArrayVal(aStringOrByteArray);
-}
+	}
-// fprintf(stderr, "%d\n", numInChars);
+	// fprintf(stderr, "%d\n", numInChars);
-lineLength = 0;
+	lineLength = 0;
-numInCharsMinus3 = numInChars-3;
+	numInCharsMinus3 = numInChars-3;
-for (i=0; i<=numInCharsMinus3; i+=3) {
+	for (i=0; i<=numInCharsMinus3; i+=3) {
-int charBuffer;
+	    int charBuffer;
-if (lineLength >= lineLimit) {
+	    if (lineLength >= lineLimit) {
-buffer[outLen++] = '\n';
+		buffer[outLen++] = '\n';
-lineLength = 0;
+		lineLength = 0;
-}
+	    }
-charBuffer = (in[i]) << 16;
+	    charBuffer = (in[i]) << 16;
-charBuffer |= ((in[i+1]) << 8);
+	    charBuffer |= ((in[i+1]) << 8);
-charBuffer |= (in[i+2]);
+	    charBuffer |= (in[i+2]);
-if ((outLen + 5) > bufferSize) {
+	    if ((outLen + 5) > bufferSize) {
-if (buffer == quickBuffer) {
+		if (buffer == quickBuffer) {
-// overallocate by 5
+		    // overallocate by 5
-buffer = (unsigned char *)malloc(bufferSize*2+5);
+		    buffer = (unsigned char *)malloc(bufferSize*2+5);
-memcpy(buffer, quickBuffer, bufferSize);
+		    memcpy(buffer, quickBuffer, bufferSize);
-} else {
+		} else {
-buffer = (unsigned char *)realloc(buffer, bufferSize*2+5);
+		    buffer = (unsigned char *)realloc(buffer, bufferSize*2+5);
-}
+		}
-bufferSize = bufferSize * 2;
+		bufferSize = bufferSize * 2;
-}
+	    }
 #ifdef __LSBFIRST__
-{
+	    {
-unsigned int out = __mapping[(charBuffer >> 18) & 0x3F];
+		unsigned int out = __mapping[(charBuffer >> 18) & 0x3F];
-out |= (__mapping[(charBuffer >> 12) & 0x3F]) << 8;
+		out |= (__mapping[(charBuffer >> 12) & 0x3F]) << 8;
-out |= (__mapping[(charBuffer >> 6) & 0x3F]) << 16;
+		out |= (__mapping[(charBuffer >> 6) & 0x3F]) << 16;
-out |= (__mapping[(charBuffer) & 0x3F]) << 24;
+		out |= (__mapping[(charBuffer) & 0x3F]) << 24;
-((unsigned int*)(&buffer[outLen]))[0] = out;
+		((unsigned int*)(&buffer[outLen]))[0] = out;
-}
+	    }
 #else
-buffer[outLen] = __mapping[(charBuffer >> 18) & 0x3F];
+	    buffer[outLen] = __mapping[(charBuffer >> 18) & 0x3F];
-buffer[outLen+1] = __mapping[(charBuffer >> 12) & 0x3F];
+	    buffer[outLen+1] = __mapping[(charBuffer >> 12) & 0x3F];
-buffer[outLen+2] = __mapping[(charBuffer >> 6) & 0x3F];
+	    buffer[outLen+2] = __mapping[(charBuffer >> 6) & 0x3F];
-buffer[outLen+3] = __mapping[(charBuffer) & 0x3F];
+	    buffer[outLen+3] = __mapping[(charBuffer) & 0x3F];
 #endif
-outLen += 4;
+	    outLen += 4;
-lineLength += 4;
+	    lineLength += 4;
-}
+	}
-restLength = numInChars-i;
+	restLength = numInChars-i;
-// fprintf(stderr, "rest: %d\n", restLength);
+	// fprintf(stderr, "rest: %d\n", restLength);
-if (restLength) {
+	if (restLength) {
-if (lineLength >= lineLimit) {
+	    if (lineLength >= lineLimit) {
-buffer[outLen++] = '\n';
+		buffer[outLen++] = '\n';
-lineLength = 0;
+		lineLength = 0;
-}
+	    }
-if (restLength == 1) {
+	    if (restLength == 1) {
-unsigned int charBuffer;
+		unsigned int charBuffer;
-// pad with '=='
+		// pad with '=='
-charBuffer = (in[i]) << 4;
+		charBuffer = (in[i]) << 4;
-buffer[outLen] = __mapping[(charBuffer >> 6) & 0x3F];
+		buffer[outLen] = __mapping[(charBuffer >> 6) & 0x3F];
-buffer[outLen+1] = __mapping[(charBuffer) & 0x3F];
+		buffer[outLen+1] = __mapping[(charBuffer) & 0x3F];
-buffer[outLen+2] = __mapping[64];
+		buffer[outLen+2] = __mapping[64];
-buffer[outLen+3] = __mapping[64];
+		buffer[outLen+3] = __mapping[64];
-outLen += 4;
+		outLen += 4;
-} else {
+	    } else {
-unsigned int charBuffer;
+		unsigned int charBuffer;
-// restLength == 2
+		// restLength == 2
-// pad with '='
+		// pad with '='
-charBuffer = (in[i]) << 8;
+		charBuffer = (in[i]) << 8;
-charBuffer |= (in[i+1]);
+		charBuffer |= (in[i+1]);
-charBuffer <<= 2;
+		charBuffer <<= 2;
-buffer[outLen] = __mapping[(charBuffer >> 12) & 0x3F];
+		buffer[outLen] = __mapping[(charBuffer >> 12) & 0x3F];
-buffer[outLen+1] = __mapping[(charBuffer >> 6) & 0x3F];
+		buffer[outLen+1] = __mapping[(charBuffer >> 6) & 0x3F];
-buffer[outLen+2] = __mapping[(charBuffer) & 0x3F];
+		buffer[outLen+2] = __mapping[(charBuffer) & 0x3F];
-buffer[outLen+3] = __mapping[64];
+		buffer[outLen+3] = __mapping[64];
-outLen += 4;
+		outLen += 4;
-}
+	    }
-}
+	}
-if (asStringBoolean == true) {
+	if (asStringBoolean == true) {
-encoding = __MKSTRING_L(buffer, outLen);
+	    encoding = __MKSTRING_L(buffer, outLen);
-} else {
+	} else {
-encoding = __MKBYTEARRAY(buffer, outLen);
+	    encoding = __MKBYTEARRAY(buffer, outLen);
-}
+	}
-if (buffer != quickBuffer) {
+	if (buffer != quickBuffer) {
-free(buffer);
+	    free(buffer);
-}
+	}
-RETURN(encoding);
+	RETURN(encoding);
 }
 %}.
 encoding := super encode:aStringOrByteArray with:lineLimitOrNil.
 asStringBoolean ifTrue:[
-^ encoding asString
+	^ encoding asString
 ].
 ^ encoding
 "
 (Base64Coder encode:'queen%27s%20gambit') => 'cXVlZW4lMjdzJTIwZ2FtYml0'
 (Base64Coder fastEncode:'queen%27s%20gambit' asString:true) => 'cXVlZW4lMjdzJTIwZ2FtYml0'
 (Base64Coder decode:'cXVlZW4lMjdzJTIwZ2FtYml0') asString => 'queen%27s%20gambit'
 (Base64Coder fastDecodeString:'YWE=' asString:true) => 'aa'
 |data|
 data := ByteArray new:1000.
 Time millisecondsToRun:[
-10000 timesRepeat:[self halt.
+	10000 timesRepeat:[self halt.
-Base64Coder encode:data.
+	    Base64Coder encode:data.
-]
+	]
 ]
 |data|
 data := ByteArray new:1000.
 Base64Coder fastEncode:data asString:true lineLimit:20.
 |data|
 Base64Coder fastEncode:data asString:true lineLimit:nil.
 |data|
 data := ByteArray new:1000.
 Time millisecondsToRun:[
-10000 timesRepeat:[
+	10000 timesRepeat:[
-Base64Coder fastEncode:data.
+	    Base64Coder fastEncode:data.
-]
+	]
 ]
 self assert:((Base64Coder fastEncode:'abc' asString:true)
-= 'abc' base64Encoded).
+		  = 'abc' base64Encoded).
 self assert:((Base64Coder fastEncode:'a' asString:true)
-= 'a' base64Encoded).
+		  = 'a' base64Encoded).
 self assert:((Base64Coder fastEncode:'ab' asString:true)
-= 'ab' base64Encoded).
+		  = 'ab' base64Encoded).
 self assert:((Base64Coder fastEncode:'abcd' asString:true)
-= 'abcd' base64Encoded).
+		  = 'abcd' base64Encoded).
 self assert:((Base64Coder fastEncode:'abcde' asString:true)
-= 'abcde' base64Encoded).
+		  = 'abcde' base64Encoded).
 self assert:((Base64Coder fastEncode:'abcdef' asString:true)
-= 'abcdef' base64Encoded).
+		  = 'abcdef' base64Encoded).
 self assert:((Base64Coder fastEncode:#'parseMethod:onError:rememberNodes:nodeGenerationCallback:' asString:true)
-= #'parseMethod:onError:rememberNodes:nodeGenerationCallback:' base64Encoded).
+		  = #'parseMethod:onError:rememberNodes:nodeGenerationCallback:' base64Encoded).
 self assert:((Base64Coder fastEncode:'_INVOKESTATIC_R:' asString:true)
-= '_INVOKESTATIC_R:' base64Encoded).
+		  = '_INVOKESTATIC_R:' base64Encoded).
 self assert:((Base64Coder fastEncode:#'_INVOKESTATIC_R:' asString:true)
-= #'_INVOKESTATIC_R:' base64Encoded)
+		  = #'_INVOKESTATIC_R:' base64Encoded)
 self assert:((Base64Coder fastEncode:'_INVOKESTATIC_R:' asString:true)
-= (Base64Coder fastEncode:#'_INVOKESTATIC_R:' asString:true)).
+		  = (Base64Coder fastEncode:#'_INVOKESTATIC_R:' asString:true)).
 self assert:((#'_INVOKESTATIC_R:' base64Encoded)
-= ('_INVOKESTATIC_R:' base64Encoded)).
+		  = ('_INVOKESTATIC_R:' base64Encoded)).
 self assert:((Base64Coder fastEncode:'_INVOKESTATIC_R:_:' asString:true)
-= '_INVOKESTATIC_R:_:' base64Encoded).
+		  = '_INVOKESTATIC_R:_:' base64Encoded).
 self assert:((Base64Coder fastEncode:#'_INVOKESTATIC_R:_:' asString:true)
-= #'_INVOKESTATIC_R:_:' base64Encoded)
+		  = #'_INVOKESTATIC_R:_:' base64Encoded)
 self assert:((Base64Coder fastEncode:'_INVOKESTATIC_R:_:' asString:true)
-= (Base64Coder fastEncode:#'_INVOKESTATIC_R:_:' asString:true)).
+		  = (Base64Coder fastEncode:#'_INVOKESTATIC_R:_:' asString:true)).
 self assert:((#'_INVOKESTATIC_R:_:' base64Encoded)
-= ('_INVOKESTATIC_R:_:' base64Encoded)).
+		  = ('_INVOKESTATIC_R:_:' base64Encoded)).
 Symbol allInstancesDo:[:each |
-self assert:((Base64Coder fastEncode:each asString:true)
+	 self assert:((Base64Coder fastEncode:each asString:true)
-=  (Base64Coder encode:each with:nil))
+		     =  (Base64Coder encode:each with:nil))
 ]
 "
 "Created: / 21-03-2019 / 21:58:59 / Claus Gittinger"
 "Modified (comment): / 21-03-2019 / 23:11:50 / Claus Gittinger"
 ! !
 nextPutByte:aByte
 "encode aByte on the output stream"
 |b1 "{ Class: SmallInteger }"
 b2 "{ Class: SmallInteger }"
 b3 "{ Class: SmallInteger }"
 b4 "{ Class: SmallInteger }"
 bufferedBytes "{ Class: SmallInteger }" |
 buffer := (buffer bitShift:8) bitOr:aByte.
 bits := bits + 8.
 bits == 24 ifTrue:[
-"RFC 2045 says: max 76 characters in one line"
+	"RFC 2045 says: max 76 characters in one line"
-(lineLimit notNil and:[charCount >= lineLimit]) ifTrue:[
+	(lineLimit notNil and:[charCount >= lineLimit]) ifTrue:[
-stream cr.
+	    stream cr.
-charCount := 0.
+	    charCount := 0.
-].
+	].
-bufferedBytes := buffer.
+	bufferedBytes := buffer.
-b4 := bufferedBytes bitAnd:16r3F.
+	b4 := bufferedBytes bitAnd:16r3F.
-b3 := (bufferedBytes bitShift:-6)  bitAnd:16r3F.
+	b3 := (bufferedBytes bitShift:-6)  bitAnd:16r3F.
-b2 := (bufferedBytes bitShift:-12) bitAnd:16r3F.
+	b2 := (bufferedBytes bitShift:-12) bitAnd:16r3F.
-b1 := (bufferedBytes bitShift:-18) bitAnd:16r3F.
+	b1 := (bufferedBytes bitShift:-18) bitAnd:16r3F.
-buffer := bits := 0.
+	buffer := bits := 0.
-stream nextPut:(mapping at:b1+1);
+	stream nextPut:(mapping at:b1+1);
-nextPut:(mapping at:b2+1);
+	       nextPut:(mapping at:b2+1);
-nextPut:(mapping at:b3+1);
+	       nextPut:(mapping at:b3+1);
-nextPut:(mapping at:b4+1).
+	       nextPut:(mapping at:b4+1).
-charCount := charCount + 4.
+	charCount := charCount + 4.
 ].
 "Modified: / 26-08-2017 / 12:35:17 / cg"
 "Modified: / 30-09-2018 / 15:15:14 / Claus Gittinger"
 ! !
 !Base64Coder methodsFor:'misc'!
 flush
 "flush the remaining bits of buffer.
 The number of bits in buffer is not a multiple of 6, so we pad
 the buffer and signal that padding has been done via $= characters."
 |tempBuffer "{Class: SmallInteger}"
 b1 b2 b3 b4|
 bits == 0 ifTrue:[
-"buffer is empty, nothing to do"
+	"buffer is empty, nothing to do"
-^ self.
+	^ self.
 ].
 tempBuffer := buffer.
 bits == 8 ifTrue:[
-tempBuffer := tempBuffer bitShift:4.
+	tempBuffer := tempBuffer bitShift:4.
-b4 := b3 := 64. "pad with '=='"
+	b4 := b3 := 64. "pad with '=='"
-b1 := (tempBuffer bitShift:-6) bitAnd:16r3F.
+	b1 := (tempBuffer bitShift:-6) bitAnd:16r3F.
-b2 := tempBuffer bitAnd:16r3F.
+	b2 := tempBuffer bitAnd:16r3F.
 ] ifFalse:[
-bits = 16 ifTrue:[
+	bits = 16 ifTrue:[
-tempBuffer := tempBuffer bitShift:2.
+	    tempBuffer := tempBuffer bitShift:2.
-b4 := 64.        "pad with '='"
+	    b4 := 64.        "pad with '='"
-b3 := tempBuffer bitAnd:16r3F.
+	    b3 := tempBuffer bitAnd:16r3F.
-b2 := (tempBuffer bitShift:-6)  bitAnd:16r3F.
+	    b2 := (tempBuffer bitShift:-6)  bitAnd:16r3F.
-b1 := (tempBuffer bitShift:-12) bitAnd:16r3F.
+	    b1 := (tempBuffer bitShift:-12) bitAnd:16r3F.
-]
+	]
 ].
 bits := buffer := 0.
 "RFC 2045 says: max 76 characters in one line"
 (lineLimit notNil and:[charCount >= lineLimit]) ifTrue:[
-stream cr.
+	stream cr.
-charCount := 0.
+	charCount := 0.
 ].
 stream nextPut:(mapping at:b1+1);
-nextPut:(mapping at:b2+1);
+	   nextPut:(mapping at:b2+1);
-nextPut:(mapping at:b3+1);
+	   nextPut:(mapping at:b3+1);
-nextPut:(mapping at:b4+1).
+	   nextPut:(mapping at:b4+1).
 charCount := charCount + 4.
 "Modified: / 20-03-2019 / 21:22:39 / Claus Gittinger"
 ! !
 fillBuffer
 "fill buffer with next 4 characters each representing 6 bits.
 Used when decoding."
 |b
 tempBuffer "{Class: SmallInteger}"
 _bits      "{Class: SmallInteger}" |
 tempBuffer := 0.
 _bits := 0.
 [
-"read next valid Base64 character, skip invalid characters"
+	"read next valid Base64 character, skip invalid characters"
-b := 255.
+	b := 255.
-[b == 255] whileTrue:[
+	[b == 255] whileTrue:[
-b := stream next.
+	    b := stream next.
-b isNil ifTrue:[ "end of stream"
+	    b isNil ifTrue:[ "end of stream"
-b := 64.     "simulate end-mark"
+		b := 64.     "simulate end-mark"
-] ifFalse:[
+	    ] ifFalse:[
-b := reverseMapping at:b codePoint ifAbsent:255.
+		b := reverseMapping at:b codePoint ifAbsent:255.
-]
+	    ]
-].
+	].
-b == 64 ifTrue:[
+	b == 64 ifTrue:[
-"got $=, end of Base64 string has been reached"
+	    "got $=, end of Base64 string has been reached"
-atEnd := true.
+	    atEnd := true.
-_bits == 12 ifTrue:[
+	    _bits == 12 ifTrue:[
-"data has been padded to 12, skip 4 bits"
+		"data has been padded to 12, skip 4 bits"
-tempBuffer := tempBuffer bitShift:-4.
+		tempBuffer := tempBuffer bitShift:-4.
-_bits := _bits - 4.
+		_bits := _bits - 4.
-] ifFalse:[_bits == 18 ifTrue:[
+	    ] ifFalse:[_bits == 18 ifTrue:[
-"data has been padded to 18, skip 2 bits"
+		"data has been padded to 18, skip 2 bits"
-tempBuffer := tempBuffer bitShift:-2.
+		tempBuffer := tempBuffer bitShift:-2.
-_bits := _bits - 2.
+		_bits := _bits - 2.
-]].
+	    ]].
-] ifFalse:[
+	] ifFalse:[
-"got valid Base64 character, append to buffer"
+	    "got valid Base64 character, append to buffer"
-tempBuffer := (tempBuffer bitShift:6) bitOr:b.
+	    tempBuffer := (tempBuffer bitShift:6) bitOr:b.
-_bits := _bits + 6.
+	    _bits := _bits + 6.
-].
+	].
-(_bits == 24 or:[atEnd]) ifTrue:[
+	(_bits == 24 or:[atEnd]) ifTrue:[
-bits := _bits.
+	    bits := _bits.
-buffer := tempBuffer.
+	    buffer := tempBuffer.
-^ self.
+	    ^ self.
-].
+	].
 ] loop.
 "Modified: / 30-09-2018 / 15:16:19 / Claus Gittinger"
 ! !
 !
 version_CVS
 ^ '$Header$'
 ! !

changeset 4900	0e400da67727
parent 4895	301653b248c3