[Jython-checkins] jython: Naming, data type and formatting changes to binascii.java
jeff.allen
jython-checkins at python.org
Tue Dec 24 06:10:12 EST 2019
https://hg.python.org/jython/rev/37639a141a66
changeset: 8316:37639a141a66
user: Jeff Allen <ja.py at farowl.co.uk>
date: Tue Dec 24 07:40:57 2019 +0000
summary:
Naming, data type and formatting changes to binascii.java
There are no functional changes, but some re-ordering and renaming, and
some dead statics are removed. The choice of data types is reconsidered
to reduce masking and casting.
files:
src/org/python/modules/binascii.java | 1069 ++++++-------
1 files changed, 479 insertions(+), 590 deletions(-)
diff --git a/src/org/python/modules/binascii.java b/src/org/python/modules/binascii.java
--- a/src/org/python/modules/binascii.java
+++ b/src/org/python/modules/binascii.java
@@ -1,17 +1,14 @@
/*
* Copyright 2019 Jython Developers
+ *
* Original conversion from CPython source copyright 1998 Finn Bock.
*
- * This program contains material copyrighted by:
- * Copyright (c) 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
- * Amsterdam, The Netherlands.
+ * This program contains material copyrighted by: Copyright (c) 1991, 1992, 1993, 1994 by Stichting
+ * Mathematisch Centrum, Amsterdam, The Netherlands.
*/
package org.python.modules;
-
-import java.util.regex.Pattern;
-
import org.python.core.ArgParser;
import org.python.core.BufferProtocol;
import org.python.core.Py;
@@ -24,105 +21,73 @@
import org.python.core.PyTuple;
import org.python.core.PyUnicode;
import org.python.core.buffer.SimpleStringBuffer;
-import org.python.core.util.StringUtil;
/**
- * The <tt>binascii.java</tt> module contains a number of methods to convert
- * between binary and various ASCII-encoded binary
- * representations. Normally, you will not use these modules directly but
- * use wrapper modules like <tt>uu</tt> or
- * <tt>hexbin</tt> instead, this module solely
- * exists because bit-manipulation of large amounts of data is slow in
- * Python.
+ * The <tt>binascii.java</tt> module contains a number of methods to convert between binary and
+ * various ASCII-encoded binary representations. Normally, you will not use these modules directly
+ * but use wrapper modules like <tt>uu</tt> or <tt>hexbin</tt> instead, this module solely exists
+ * because bit-manipulation of large amounts of data is slow in Python.
*
* <P>
* The <tt>binascii.java</tt> module defines the following functions:
*
* <dl>
* <dt><b><tt>a2b_uu</tt></b> (string)</dt>
- * <dd>
- * Convert a single line of uuencoded data back to binary and return the
- * binary data. Lines normally contain 45 (binary) bytes, except for the
- * last line. Line data may be followed by whitespace.
- * </dd>
+ * <dd>Convert a single line of uuencoded data back to binary and return the binary data. Lines
+ * normally contain 45 (binary) bytes, except for the last line. Line data may be followed by
+ * whitespace.</dd>
*
* <dt><b><tt>b2a_uu</tt></b> (data)</dt>
- * <dd>
- * Convert binary data to a line of ASCII characters, the return value
- * is the converted line, including a newline char. The length of
- * <i>data</i> should be at most 45.
- * </dd>
+ * <dd>Convert binary data to a line of ASCII characters, the return value is the converted line,
+ * including a newline char. The length of <i>data</i> should be at most 45.</dd>
*
* <dt><b><tt>a2b_base64</tt></b> (string)</dt>
- * <dd>
- * Convert a block of base64 data back to binary and return the
- * binary data. More than one line may be passed at a time.
- * </dd>
+ * <dd>Convert a block of base64 data back to binary and return the binary data. More than one line
+ * may be passed at a time.</dd>
*
* <dt><b><tt>b2a_base64</tt></b> (data)</dt>
- * <dd>
- * Convert binary data to a line of ASCII characters in base64 coding.
- * The return value is the converted line, including a newline char.
- * The length of <i>data</i> should be at most 57 to adhere to the base64
- * standard.
- * </dd>
+ * <dd>Convert binary data to a line of ASCII characters in base64 coding. The return value is the
+ * converted line, including a newline char. The length of <i>data</i> should be at most 57 to
+ * adhere to the base64 standard.</dd>
*
* <dt><b><tt>a2b_hqx</tt></b> (string)</dt>
- * <dd>
- * Convert binhex4 formatted ASCII data to binary, without doing
- * RLE-decompression. The string should contain a complete number of
- * binary bytes, or (in case of the last portion of the binhex4 data)
- * have the remaining bits zero.
- * </dd>
+ * <dd>Convert binhex4 formatted ASCII data to binary, without doing RLE-decompression. The string
+ * should contain a complete number of binary bytes, or (in case of the last portion of the binhex4
+ * data) have the remaining bits zero.</dd>
*
* <dt><b><tt>rledecode_hqx</tt></b> (data)</dt>
- * <dd>
- * Perform RLE-decompression on the data, as per the binhex4
- * standard. The algorithm uses <tt>0x90</tt> after a byte as a repeat
- * indicator, followed by a count. A count of <tt>0</tt> specifies a byte
- * value of <tt>0x90</tt>. The routine returns the decompressed data,
- * unless data input data ends in an orphaned repeat indicator, in which
- * case the <tt>Incomplete</tt> exception is raised.
- * </dd>
+ * <dd>Perform RLE-decompression on the data, as per the binhex4 standard. The algorithm uses
+ * <tt>0x90</tt> after a byte as a repeat indicator, followed by a count. A count of <tt>0</tt>
+ * specifies a byte value of <tt>0x90</tt>. The routine returns the decompressed data, unless data
+ * input data ends in an orphaned repeat indicator, in which case the <tt>Incomplete</tt> exception
+ * is raised.</dd>
*
* <dt><b><tt>rlecode_hqx</tt></b> (data)</dt>
- * <dd>
- * Perform binhex4 style RLE-compression on <i>data</i> and return the
- * result.
- * </dd>
+ * <dd>Perform binhex4 style RLE-compression on <i>data</i> and return the result.</dd>
*
* <dt><b><tt>b2a_hqx</tt></b> (data)</dt>
- * <dd>
- * Perform hexbin4 binary-to-ASCII translation and return the
- * resulting string. The argument should already be RLE-coded, and have a
- * length divisible by 3 (except possibly the last fragment).
- * </dd>
+ * <dd>Perform hexbin4 binary-to-ASCII translation and return the resulting string. The argument
+ * should already be RLE-coded, and have a length divisible by 3 (except possibly the last
+ * fragment).</dd>
*
* <dt><b><tt>crc_hqx</tt></b> (data, crc)</dt>
- * <dd>
- * Compute the binhex4 crc value of <i>data</i>, starting with an initial
- * <i>crc</i> and returning the result.
- * </dd>
+ * <dd>Compute the binhex4 crc value of <i>data</i>, starting with an initial <i>crc</i> and
+ * returning the result.</dd>
*
* <dt><b><tt>Error</tt></b></dt>
- * <dd>
- * Exception raised on errors. These are usually programming errors.
- * </dd>
+ * <dd>Exception raised on errors. These are usually programming errors.</dd>
*
* <dt><b><tt>Incomplete</tt></b></dt>
- * <dd>
- * Exception raised on incomplete data. These are usually not programming
- * errors, but may be handled by reading a little more data and trying
- * again.
- * </dd>
+ * <dd>Exception raised on incomplete data. These are usually not programming errors, but may be
+ * handled by reading a little more data and trying again.</dd>
* </dl>
*
- * The module is a line-by-line conversion of the original binasciimodule.c
- * written by Jack Jansen, except that all mistakes and errors are my own.
+ * The module is a line-by-line conversion of the original binasciimodule.c written by Jack Jansen,
+ * except that all mistakes and errors are my own.
*
* @author Finn Bock, bckfnn at pipmail.dknet.dk
* @version binascii.java,v 1.6 1999/02/20 11:37:07 fb Exp
-
+ *
*/
public class binascii {
@@ -130,8 +95,8 @@
public static final PyObject Error = Py.makeClass("Error", Py.Exception, exceptionNamespace());
- public static final PyObject Incomplete = Py.makeClass("Incomplete", Py.Exception,
- exceptionNamespace());
+ public static final PyObject Incomplete =
+ Py.makeClass("Incomplete", Py.Exception, exceptionNamespace());
public static PyObject exceptionNamespace() {
PyObject dict = new PyStringMap();
@@ -142,12 +107,12 @@
// hqx lookup table, ascii->binary.
private static char RUNCHAR = 0x90;
- private static short DONE = 0x7F;
- private static short SKIP = 0x7E;
- private static short FAIL = 0x7D;
+ private static byte DONE = 0x7F;
+ private static byte SKIP = 0x7E;
+ private static byte FAIL = 0x7D;
//@formatter:off
- private static short[] table_a2b_hqx = {
+ private static byte[] table_a2b_hqx = {
/* ^@ ^A ^B ^C ^D ^E ^F ^G */
/* 0*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL,
/* \b \t \n ^K ^L \r ^N ^O */
@@ -199,13 +164,11 @@
};
//@formatter:on
- private static byte[] table_b2a_hqx =
- StringUtil.toBytes("!\"#$%&'()*+,-012345689 at ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr");
-
-
+ private static char[] table_b2a_hqx =
+ "!\"#$%&'()*+,-012345689 at ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr".toCharArray();
//@formatter:off
- private static short table_a2b_base64[] = {
+ private static byte table_a2b_base64[] = {
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
@@ -222,9 +185,8 @@
/* Max binary chunk size */
private static int BASE64_MAXBIN = Integer.MAX_VALUE / 2 - 3;
- private static byte[] table_b2a_base64 =
- StringUtil.toBytes("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
-
+ private static char[] table_b2a_base64 =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray();
//@formatter:off
private static int[] crctab_hqx = {
@@ -263,283 +225,259 @@
};
//@formatter:on
-
-
- public static PyString __doc__a2b_uu = new PyString(
- "(ascii) -> bin. Decode a line of uuencoded data"
- );
-
+ public static PyString __doc__a2b_uu =
+ new PyString("(ascii) -> bin. Decode a line of uuencoded data");
/**
- * Convert a single line of uuencoded data back to binary and return the
- * binary data. Lines normally contain 45 (binary) bytes, except for the
- * last line. Line data may be followed by whitespace.
+ * Convert a single line of uuencoded data back to binary and return the binary data. Lines
+ * normally contain 45 (binary) bytes, except for the last line. Line data may be followed by
+ * whitespace.
*/
- public static PyString a2b_uu(PyObject bp) {
- int leftbits = 0;
- int leftchar = 0;
+ public static PyString a2b_uu(PyObject text) {
- StringBuilder bin_data = new StringBuilder();
-
- try (PyBuffer ascii_data = getTextBuffer(bp)) {
- if (ascii_data.getLen() == 0) {
+ try (PyBuffer textBuf = getByteBuffer(text)) {
+ int textLen = textBuf.getLen();
+ if (textLen == 0) {
return new PyString("");
}
- char this_ch;
- int i;
+ StringBuilder dataBuf = new StringBuilder();
- int ascii_len = ascii_data.getLen()-1;
+ int bits = 0; // store bits not yet emitted (max 12 bits)
+ int bitCount = 0; // how many (valid) bits waiting
+ int index = 0;
- int bin_len = (ascii_data.intAt(0) - ' ') & 077;
+ int dataExpected = (textBuf.intAt(0) - ' ') & 077;
+ textLen -= 1;
- for (i = 0; bin_len > 0 && ascii_len > 0; i++, ascii_len--) {
- this_ch = (char) ascii_data.intAt(i+1);
- if (this_ch == '\n' || this_ch == '\r' || ascii_len <= 0) {
- // Whitespace. Assume some spaces got eaten at
- // end-of-line. (We check this later)
- this_ch = 0;
+ for (; dataExpected > 0 && textLen > 0; index++, textLen--) {
+ int ch = textBuf.intAt(index + 1);
+ int sixBits;
+
+ if (ch == '\n' || ch == '\r' || textLen <= 0) {
+ // Whitespace. Assume some spaces got eaten at end-of-line.
+ // (We check this later.)
+ sixBits = 0;
} else {
- // Check the character for legality
- // The 64 in stead of the expected 63 is because
- // there are a few uuencodes out there that use
- // '@' as zero instead of space.
- if ( this_ch < ' ' || this_ch > (' ' + 64)) {
+ /*
+ * Check the character for legality The 64 instead of the expected 63 is because
+ * there are a few uuencodes out there that use '@' as zero instead of space.
+ */
+ if (ch < ' ' || ch > (' ' + 64)) {
throw new PyException(Error, "Illegal char");
}
- this_ch = (char)((this_ch - ' ') & 077);
+ sixBits = (ch - ' ') & 0x3f;
}
- // Shift it in on the low end, and see if there's
- // a byte ready for output.
- leftchar = (leftchar << 6) | (this_ch);
- leftbits += 6;
- if (leftbits >= 8) {
- leftbits -= 8;
- bin_data.append((char)((leftchar >> leftbits) & 0xff));
- leftchar &= ((1 << leftbits) - 1);
- bin_len--;
+
+ // Shift it in on the low end, and see if there's a byte ready for output.
+ bits = (bits << 6) | sixBits;
+ bitCount += 6;
+ if (bitCount >= 8) {
+ bitCount -= 8;
+ int b = (bits >> bitCount) & 0xff;
+ dataBuf.append((char) b); // byte
+ bits &= (1 << bitCount) - 1;
+ dataExpected--;
}
}
- // Finally, check that if there's anything left on the line
- // that it's whitespace only.
- while (ascii_len-- > 0) {
- this_ch = (char) ascii_data.intAt(++i);
+ // Finally, check that anything left on the line is white space.
+ while (textLen-- > 0) {
+ int ch = textBuf.intAt(++index);
// Extra '@' may be written as padding in some cases
- if (this_ch != ' ' && this_ch != '@' &&
- this_ch != '\n' && this_ch != '\r') {
+ if (ch != ' ' && ch != '@' && ch != '\n' && ch != '\r') {
throw new PyException(Error, "Trailing garbage");
}
}
// finally, if we haven't decoded enough stuff, fill it up with zeros
- for (; i < bin_len; i++) {
- bin_data.append((char) 0);
+ for (; index < dataExpected; index++) {
+ dataBuf.append((char) 0);
}
- return new PyString(bin_data.toString());
+ return new PyString(dataBuf.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("a2b_uu", bp);
+ throw argMustBeBytes("a2b_uu", text);
}
}
- public static PyString __doc__b2a_uu = new PyString(
- "(bin) -> ascii. Uuencode line of data"
- );
-
+ public static PyString __doc__b2a_uu = new PyString("(bin) -> ascii. Uuencode line of data");
/**
- * Convert binary data to a line of ASCII characters, the return value
- * is the converted line, including a newline char. The length of
- * <i>data</i> should be at most 45.
+ * Convert binary data to a line of ASCII characters, the return value is the converted line,
+ * including a newline char. The length of <i>data</i> should be at most 45.
*/
- public static PyString b2a_uu(PyObject bp) {
- int leftbits = 0;
- char this_ch;
- int leftchar = 0;
+ public static PyString b2a_uu(PyObject data) {
- try (PyBuffer bin_data = getTextBuffer(bp)) {
+ try (PyBuffer dataBuf = getByteBuffer(data)) {
- int bin_len = bin_data.getLen();
- if (bin_len > 45) {
+ int dataLen = dataBuf.getLen();
+ if (dataLen > 45) {
// The 45 is a limit that appears in all uuencode's
throw new PyException(Error, "At most 45 bytes at once");
}
- // Each 3 bytes in (rounded up) produces 4 characters out.
- int ascii_len = 4 * ((bin_len + 2) / 3);
- // Plus a 1 byte length and '\n'
- StringBuilder ascii_data = new StringBuilder(ascii_len + 2);
- // Store the length */
- ascii_data.append((char)(' ' + (bin_len & 077)));
+ // Each 3 bytes (rounded up) produce 4 characters, plus a 1 byte length and '\n'
+ StringBuilder textBuf = new StringBuilder(4 * ((dataLen + 2) / 3) + 2);
+ int bitCount = 0;
+ int bits = 0;
+
+ // Store the length
+ textBuf.append((char) (' ' + (dataLen & 077)));
- for (int i = 0; bin_len > 0 || leftbits != 0; i++, bin_len--) {
+ for (int i = 0; dataLen > 0 || bitCount != 0; i++, dataLen--) {
// Shift the data (or padding) into our buffer
- if (bin_len > 0) {
- leftchar = (leftchar << 8) | (char) bin_data.intAt(i);
+ if (dataLen > 0) {
+ bits = (bits << 8) | dataBuf.intAt(i);
} else {
- leftchar <<= 8;
+ bits <<= 8;
}
- leftbits += 8;
+ bitCount += 8;
// See if there are 6-bit groups ready
- while (leftbits >= 6) {
- this_ch = (char)((leftchar >> (leftbits-6)) & 0x3f);
- leftbits -= 6;
- ascii_data.append((char)(this_ch + ' '));
+ while (bitCount >= 6) {
+ bitCount -= 6;
+ int sixBits = (bits >> bitCount) & 0x3f;
+ textBuf.append((char) (sixBits + ' '));
}
}
- ascii_data.append('\n'); // Append a courtesy newline
- return new PyString(ascii_data.toString());
+ textBuf.append('\n'); // Append a courtesy newline
+ return new PyString(textBuf.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("b2a_uu", bp);
+ throw argMustBeBytes("b2a_uu", data);
}
}
+ /** Finds & returns the (num+1)th valid character for base64, or -1 if none. */
private static int binascii_find_valid(PyBuffer b, int offset, int num) {
int blen = b.getLen() - offset;
-
- /* Finds & returns the (num+1)th
- ** valid character for base64, or -1 if none.
- */
-
int ret = -1;
while ((blen > 0) && (ret == -1)) {
int c = b.intAt(offset);
- short b64val = table_a2b_base64[c & 0x7f];
- if (((c <= 0x7f) && (b64val != -1)) ) {
+ byte b64val = table_a2b_base64[c & 0x7f];
+ if (((c <= 0x7f) && (b64val != -1))) {
if (num == 0) {
ret = c;
}
num--;
}
-
offset++;
blen--;
}
return ret;
}
-
-
- public static PyString __doc__a2b_base64 = new PyString(
- "(ascii) -> bin. Decode a line of base64 data"
- );
+ public static PyString __doc__a2b_base64 =
+ new PyString("(ascii) -> bin. Decode a line of base64 data");
/**
- * Convert a block of base64 data back to binary and return the
- * binary data. More than one line may be passed at a time.
+ * Convert a block of base64 data back to binary and return the binary data. More than one line
+ * may be passed at a time.
*/
- public static PyString a2b_base64(PyObject bp) {
- int leftbits = 0;
- char this_ch;
- int leftchar = 0;
- int quad_pos = 0;
+ public static PyString a2b_base64(PyObject text) {
- try (PyBuffer ascii_data = getTextBuffer(bp)) {
- int ascii_len = ascii_data.getLen();
-
- int bin_len = 0;
+ try (PyBuffer textBuf = getByteBuffer(text)) {
+ int textLen = textBuf.getLen();
- // Every 4 characters (rounded up) maps to 3 bytes
- StringBuilder bin_data = new StringBuilder(3 * ((ascii_len + 3) / 4));
+ // Every 4 characters (rounded up) map to 3 bytes. (Or fewer, if there are extras.)
+ int dataLen = 3 * ((textLen + 3) / 4);
+ // These characters will represent bytes, in the usual Jython 2 way.
+ StringBuilder dataBuf = new StringBuilder(dataLen);
+ int bits = 0; // store bits not yet emitted (max 12 bits)
+ int bitCount = 0; // how many (valid) bits waiting
+ int quad_pos = 0;
- for (int i = 0; ascii_len > 0; ascii_len--, i++) {
+ for (int i = 0; textLen > 0; textLen--, i++) {
// Skip some punctuation
- this_ch = (char) ascii_data.intAt(i);
- if (this_ch > 0x7F || this_ch == '\r' || this_ch == '\n' || this_ch == ' ') {
+ int ch = textBuf.intAt(i);
+ if (ch > 0x7F || ch == '\r' || ch == '\n' || ch == ' ') {
continue;
- }
+
+ } else
- if (this_ch == BASE64_PAD) {
+ if (ch == BASE64_PAD) {
if (quad_pos < 2 || (quad_pos == 2
- && binascii_find_valid(ascii_data, i, 1) != BASE64_PAD)) {
+ && binascii_find_valid(textBuf, i, 1) != BASE64_PAD)) {
continue;
} else {
- // A pad sequence means no more input.
- // We've already interpreted the data
+ // A pad sequence means no more input. We've already interpreted the data
// from the quad at this point.
- leftbits = 0;
+ bitCount = 0;
break;
}
- }
+ } else {
- short this_v = table_a2b_base64[this_ch];
- if (this_v == -1) {
- continue;
- }
+ int sixBits = table_a2b_base64[ch];
+ if (sixBits == -1) {
+ continue;
+ }
- // Shift it in on the low end, and see if there's
- // a byte ready for output.
- quad_pos = (quad_pos + 1) & 0x03;
- leftchar = (leftchar << 6) | (this_v);
- leftbits += 6;
- if (leftbits >= 8) {
- leftbits -= 8;
- bin_data.append((char) ((leftchar >> leftbits) & 0xff));
- bin_len++;
- leftchar &= ((1 << leftbits) - 1);
+ // Shift it in on the low end, and see if there's a byte ready for output.
+ quad_pos = (quad_pos + 1) & 0x03;
+ bits = (bits << 6) | sixBits;
+ bitCount += 6;
+ if (bitCount >= 8) {
+ bitCount -= 8;
+ dataBuf.append((char) ((bits >> bitCount) & 0xff)); // byte
+ // Erase the bits we emitted
+ bits &= (1 << bitCount) - 1;
+ }
}
}
// Check that no bits are left
- if (leftbits != 0) {
+ if (bitCount != 0) {
throw new PyException(Error, "Incorrect padding");
}
- return new PyString(bin_data.toString());
+ return new PyString(dataBuf.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("a2b_base64", bp);
+ throw argMustBeBytes("a2b_base64", text);
}
}
-
- public static PyString __doc__b2a_base64 = new PyString(
- "(bin) -> ascii. Base64-code line of data"
- );
-
+ public static PyString __doc__b2a_base64 =
+ new PyString("(bin) -> ascii. Base64-code line of data");
/**
- * Convert binary data to a line of ASCII characters in base64 coding.
- * The return value is the converted line, including a newline char.
+ * Convert binary data to a line of ASCII characters in base64 coding. The return value is the
+ * converted line, including a newline char.
*/
- public static PyString b2a_base64(PyObject bp) {
- int leftbits = 0; // how many bits waiting
- char this_ch;
- int leftchar = 0; // store bits not yet emitted (max 12 bits)
+ public static PyString b2a_base64(PyObject data) {
- try (PyBuffer bin_data = getTextBuffer(bp)) {
- int bin_len = bin_data.getLen();
- if (bin_len > BASE64_MAXBIN) {
+ try (PyBuffer dataBuf = getByteBuffer(data)) {
+ int dataLen = dataBuf.getLen();
+ if (dataLen > BASE64_MAXBIN) {
throw new PyException(Error, "Too much data for base64 line");
}
// Every 3 bytes (rounded up) maps to 4 characters (and there's a newline)
- StringBuilder ascii_data = new StringBuilder(4 * ((bin_len + 2) / 3) + 1);
+ StringBuilder ascii_data = new StringBuilder(4 * ((dataLen + 2) / 3) + 1);
+ int bits = 0; // store bits not yet emitted (max 14 bits)
+ int bitCount = 0; // how many (valid) bits waiting
- for (int i = 0; bin_len > 0; bin_len--, i++) {
+ for (int i = 0; i < dataLen; i++) {
// Shift the data into our buffer
- leftchar = (leftchar << 8) | (char) bin_data.intAt(i); // charAt(i);
- leftbits += 8;
+ bits = (bits << 8) | dataBuf.intAt(i);
+ bitCount += 8;
- // See if there are 6-bit groups ready
- while (leftbits >= 6) {
- this_ch = (char) ((leftchar >> (leftbits - 6)) & 0x3f);
- leftbits -= 6;
- ascii_data.append((char) table_b2a_base64[this_ch]);
+ // While there are 6-bit groups available, emit them as characters.
+ while (bitCount >= 6) {
+ bitCount -= 6;
+ ascii_data.append(table_b2a_base64[(bits >> bitCount) & 0x3f]);
}
}
// Emit the balance of bits and append a newline
- if (leftbits == 2) {
- ascii_data.append((char) table_b2a_base64[(leftchar & 3) << 4]);
+ if (bitCount == 2) {
+ ascii_data.append(table_b2a_base64[(bits & 3) << 4]);
ascii_data.append(BASE64_PAD);
ascii_data.append(BASE64_PAD);
- } else if (leftbits == 4) {
- ascii_data.append((char) table_b2a_base64[(leftchar & 0xf) << 2]);
+ } else if (bitCount == 4) {
+ ascii_data.append(table_b2a_base64[(bits & 0xf) << 2]);
ascii_data.append(BASE64_PAD);
}
ascii_data.append('\n'); // Append a courtesy newline
@@ -547,373 +485,342 @@
return new PyString(ascii_data.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("b2a_base64", bp);
+ throw argMustBeBytes("b2a_base64", data);
}
}
- public static PyString __doc__a2b_hqx = new PyString(
- "ascii -> bin, done. Decode .hqx coding"
- );
+ public static PyString __doc__a2b_hqx = new PyString("ascii -> bin, done. Decode .hqx coding");
/**
- * Convert binhex4 formatted ASCII data to binary, without doing
- * RLE-decompression. The string should contain a complete number of
- * binary bytes, or (in case of the last portion of the binhex4 data)
- * have the remaining bits zero.
+ * Convert binhex4 formatted ASCII data to binary, without doing RLE-decompression. The string
+ * should contain a complete number of binary bytes, or (in case of the last portion of the
+ * binhex4 data) have the remaining bits zero.
*/
- public static PyTuple a2b_hqx(PyObject bp) {
- int leftbits = 0;
- char this_ch;
- int leftchar = 0;
- boolean done = false;
+ public static PyTuple a2b_hqx(PyObject text) {
- try (PyBuffer ascii_data = getTextBuffer(bp)) {
+ try (PyBuffer textBuf = getByteBuffer(text)) {
- int len = ascii_data.getLen();
- StringBuilder bin_data = new StringBuilder();
+ int textLen = textBuf.getLen();
+ StringBuilder dataBuf = new StringBuilder();
+ int bitCount = 0;
+ int bits = 0;
+ boolean done = false;
- for (int i = 0; len > 0; len--, i++) {
+ for (int i = 0; i < textLen; i++) {
// Get the byte and look it up
- this_ch = (char) table_a2b_hqx[ascii_data.intAt(i)];
- if (this_ch == SKIP) {
+ byte b = table_a2b_hqx[textBuf.intAt(i)];
+
+ if (b == SKIP) {
continue;
- }
- if (this_ch == FAIL) {
+
+ } else if (b == FAIL) {
throw new PyException(Error, "Illegal char");
- }
- if (this_ch == DONE) {
+
+ } else if (b == DONE) {
// The terminating colon
done = true;
break;
- }
- // Shift it into the buffer and see if any bytes are ready
- leftchar = (leftchar << 6) | (this_ch);
- leftbits += 6;
- if (leftbits >= 8) {
- leftbits -= 8;
- bin_data.append((char) ((leftchar >> leftbits) & 0xff));
- leftchar &= ((1 << leftbits) - 1);
+ } else {
+ // Shift it into the buffer and see if any bytes are ready
+ bits = (bits << 6) | b;
+ bitCount += 6;
+ if (bitCount >= 8) {
+ bitCount -= 8;
+ dataBuf.append((char) ((bits >> bitCount) & 0xff)); // byte
+ bits &= (1 << bitCount) - 1;
+ }
}
}
- if (leftbits != 0 && !done) {
+ if (bitCount != 0 && !done) {
throw new PyException(Incomplete, "String has incomplete number of bytes");
}
- return new PyTuple(new PyString(bin_data.toString()), Py.newInteger(done ? 1 : 0));
+ return new PyTuple(new PyString(dataBuf.toString()), Py.newInteger(done ? 1 : 0));
} catch (ClassCastException e) {
- throw argMustBeBytes("a2b_hqx", bp);
+ throw argMustBeBytes("a2b_hqx", text);
}
}
- public static PyString __doc__rlecode_hqx = new PyString(
- "Binhex RLE-code binary data"
- );
+ public static PyString __doc__rlecode_hqx = new PyString("Binhex RLE-code binary data");
+
+ /** Perform binhex4 style RLE-compression on <i>data</i> and return the result. */
+ static public PyString rlecode_hqx(PyObject data) {
- /**
- * Perform binhex4 style RLE-compression on <i>data</i> and return the
- * result.
- */
- static public PyString rlecode_hqx(PyObject bp) {
+ try (PyBuffer inBuf = getByteBuffer(data)) {
+ int len = inBuf.getLen();
+ StringBuilder outBuf = new StringBuilder();
- try (PyBuffer in_data = getTextBuffer(bp)) {
+ for (int in = 0; in < len; in++) {
+ char ch = (char) inBuf.intAt(in);
- int len = in_data.getLen();
- StringBuilder out_data = new StringBuilder();
-
- for (int in=0; in < len; in++) {
- char ch = (char) in_data.intAt(in);
if (ch == RUNCHAR) {
// RUNCHAR. Escape it.
- out_data.append(RUNCHAR);
- out_data.append((char) 0);
+ outBuf.append(RUNCHAR);
+ outBuf.append((char) 0);
+
} else {
// Check how many following are the same
int inend;
- for (inend=in+1; inend < len &&
- (char) in_data.intAt(inend) == ch &&
- inend < in+255; inend++) {
- ;
- }
+ for (inend = in + 1; inend < len && ((char) inBuf.intAt(inend)) == ch
+ && inend < in + 255; inend++) { /* nothing */ }
if (inend - in > 3) {
// More than 3 in a row. Output RLE.
- out_data.append(ch);
- out_data.append(RUNCHAR);
- out_data.append((char) (inend-in));
- in = inend-1;
+ outBuf.append(ch);
+ outBuf.append(RUNCHAR);
+ outBuf.append((char) (inend - in));
+ in = inend - 1;
} else {
// Less than 3. Output the byte itself
- out_data.append(ch);
+ outBuf.append(ch);
}
}
}
- return new PyString(out_data.toString());
+
+ return new PyString(outBuf.toString());
+
} catch (ClassCastException e) {
- throw argMustBeBytes("rlecode_hqx", bp);
+ throw argMustBeBytes("rlecode_hqx", data);
}
}
-
- public static PyString __doc__b2a_hqx = new PyString(
- "Encode .hqx data"
- );
+ public static PyString __doc__b2a_hqx = new PyString("Encode .hqx data");
/**
- * Perform hexbin4 binary-to-ASCII translation and return the
- * resulting string. The argument should already be RLE-coded, and have a
- * length divisible by 3 (except possibly the last fragment).
+ * Perform hexbin4 binary-to-ASCII translation and return the resulting string. The argument
+ * should already be RLE-coded, and have a length divisible by 3 (except possibly the last
+ * fragment).
*/
- public static PyString b2a_hqx(PyObject bp) {
- int leftbits = 0;
- char this_ch;
- int leftchar = 0;
+ public static PyString b2a_hqx(PyObject data) {
- try (PyBuffer bin_data = getTextBuffer(bp)) {
+ try (PyBuffer dataBuf = getByteBuffer(data)) {
+ int len = dataBuf.getLen();
- int len = bin_data.getLen();
- StringBuilder ascii_data = new StringBuilder();
+ StringBuilder textBuf = new StringBuilder();
+ int bits = 0;
+ int bitCount = 0;
for (int i = 0; len > 0; len--, i++) {
// Shift into our buffer, and output any 6bits ready
- leftchar = (leftchar << 8) | (char) bin_data.intAt(i);
- leftbits += 8;
- while (leftbits >= 6) {
- this_ch = (char) ((leftchar >> (leftbits - 6)) & 0x3f);
- leftbits -= 6;
- ascii_data.append((char) table_b2a_hqx[this_ch]);
+ bits = (bits << 8) | (char) dataBuf.intAt(i);
+ bitCount += 8;
+ while (bitCount >= 6) {
+ bitCount -= 6;
+ textBuf.append(table_b2a_hqx[(bits >> bitCount) & 0x3f]);
}
}
// Output a possible runt byte
- if (leftbits != 0) {
- leftchar <<= (6 - leftbits);
- ascii_data.append((char) table_b2a_hqx[leftchar & 0x3f]);
+ if (bitCount != 0) {
+ bits <<= (6 - bitCount);
+ textBuf.append(table_b2a_hqx[bits & 0x3f]);
}
- return new PyString(ascii_data.toString());
+ return new PyString(textBuf.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("b2a_hqx", bp);
+ throw argMustBeBytes("b2a_hqx", data);
}
}
- public static PyString __doc__rledecode_hqx = new PyString(
- "Decode hexbin RLE-coded string"
- );
-
+ public static PyString __doc__rledecode_hqx = new PyString("Decode hexbin RLE-coded string");
/**
- * Perform RLE-decompression on the data, as per the binhex4
- * standard. The algorithm uses <tt>0x90</tt> after a byte as a repeat
- * indicator, followed by a count. A count of <tt>0</tt> specifies a byte
- * value of <tt>0x90</tt>. The routine returns the decompressed data,
- * unless data input data ends in an orphaned repeat indicator, in which
- * case the <tt>Incomplete</tt> exception is raised.
+ * Perform RLE-decompression on the data, as per the binhex4 standard. The algorithm uses
+ * <tt>0x90</tt> after a byte as a repeat indicator, followed by a count. A count of <tt>0</tt>
+ * specifies a byte value of <tt>0x90</tt>. The routine returns the decompressed data, unless
+ * data input data ends in an orphaned repeat indicator, in which case the <tt>Incomplete</tt>
+ * exception is raised.
*/
- static public PyString rledecode_hqx(PyObject bp) {
- char in_byte, in_repeat;
+ static public PyString rledecode_hqx(PyObject data) {
- try (PyBuffer in_data = getTextBuffer(bp)) {
- int in_len = in_data.getLen();
- int i = 0;
-
- StringBuilder out_data = new StringBuilder();
+ try (PyBuffer inBuf = getByteBuffer(data)) {
+ int inLen = inBuf.getLen();
+ int index = 0;
// Empty string is a special case
- if (in_len == 0) {
+ if (inLen == 0) {
return Py.EmptyString;
}
+ // Pretty much throughout, we use a char to store a byte :(
+ StringBuilder outBuf = new StringBuilder();
+
// Handle first byte separately (since we have to get angry
// in case of an orphaned RLE code).
- if (--in_len < 0) {
+ if (--inLen < 0) {
throw new PyException(Incomplete);
}
- in_byte = (char) in_data.intAt(i++);
+ char outByte = (char) inBuf.intAt(index++);
- if (in_byte == RUNCHAR) {
- if (--in_len < 0) {
+ if (outByte == RUNCHAR) {
+ if (--inLen < 0) {
throw new PyException(Incomplete);
}
- in_repeat = (char) in_data.intAt(i++);
+ int in_repeat = inBuf.intAt(index++);
if (in_repeat != 0) {
// Note Error, not Incomplete (which is at the end
// of the string only). This is a programmer error.
throw new PyException(Error, "Orphaned RLE code at start");
}
- out_data.append(RUNCHAR);
+ outBuf.append(RUNCHAR);
} else {
- out_data.append(in_byte);
+ outBuf.append(outByte);
}
- while (in_len > 0) {
- if (--in_len < 0) {
+ while (inLen > 0) {
+ if (--inLen < 0) {
throw new PyException(Incomplete);
}
- in_byte = (char) in_data.intAt(i++);
+ outByte = (char) inBuf.intAt(index++);
- if (in_byte == RUNCHAR) {
- if (--in_len < 0) {
+ if (outByte == RUNCHAR) {
+ if (--inLen < 0) {
throw new PyException(Incomplete);
}
- in_repeat = (char) in_data.intAt(i++);
+ int in_repeat = inBuf.intAt(index++);
if (in_repeat == 0) {
// Just an escaped RUNCHAR value
- out_data.append(RUNCHAR);
+ outBuf.append(RUNCHAR);
} else {
// Pick up value and output a sequence of it
- in_byte = out_data.charAt(out_data.length()-1);
+ outByte = outBuf.charAt(outBuf.length() - 1);
while (--in_repeat > 0) {
- out_data.append(in_byte);
+ outBuf.append(outByte);
}
}
} else {
// Normal byte
- out_data.append(in_byte);
+ outBuf.append(outByte);
}
}
- return new PyString(out_data.toString());
+ return new PyString(outBuf.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("rledecode_hqx", bp);
+ throw argMustBeBytes("rledecode_hqx", data);
}
}
- public static PyString __doc__crc_hqx = new PyString(
- "(data, oldcrc) -> newcrc. Compute hqx CRC incrementally"
- );
-
+ public static PyString __doc__crc_hqx =
+ new PyString("(data, oldcrc) -> newcrc. Compute hqx CRC incrementally");
/**
- * Compute the binhex4 crc value of <i>data</i>, starting with an initial
- * <i>crc</i> and returning the result.
+ * Compute the binhex4 crc value of <i>data</i>, starting with an initial <i>crc</i> and
+ * returning the result.
*/
- public static int crc_hqx(PyObject bp, int crc) {
- try (PyBuffer bin_data = getTextBuffer(bp)) {
- int len = bin_data.getLen();
- int i = 0;
-
- while(len-- > 0) {
- crc=((crc<<8)&0xff00) ^
- crctab_hqx[((crc>>8)&0xff)^ (char) bin_data.intAt(i++)];
+ public static int crc_hqx(PyObject data, int crc) {
+ try (PyBuffer buf = getByteBuffer(data)) {
+ int len = buf.getLen();
+ for (int i = 0; i < len; i++) {
+ crc = ((crc << 8) & 0xff00) ^ crctab_hqx[((crc >> 8) & 0xff) ^ buf.intAt(i)];
}
return crc;
-
} catch (ClassCastException e) {
- throw argMustBeBytes("crc_hqx", bp);
+ throw argMustBeBytes("crc_hqx", data);
}
}
-
-
-//@formatter:off
-static long[] crc_32_tab = new long[] {
-0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-0x2d02ef8dL
-};
-//@formatter:on
+ //@formatter:off
+ static int[] crc_32_tab = new int[] {
+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+ 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+ 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+ 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+ 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+ 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+ 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+ 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+ 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+ 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+ 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+ 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+ 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+ 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+ 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+ 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+ 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+ 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+ 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+ 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+ 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+ 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+ 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+ 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+ 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+ 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+ 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+ 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+ 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+ 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+ 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+ 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+ 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+ 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+ 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+ 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+ 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+ 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+ 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+ 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+ 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+ 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+ 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+ 0x2d02ef8d
+ };
+ //@formatter:on
public static int crc32(PyObject bp) {
return crc32(bp, 0);
}
- public static int crc32(PyObject bp, long crc) {
+ public static int crc32(PyObject data, long long_crc) {
- crc &= 0xFFFFFFFFL;
- crc = crc ^ 0xFFFFFFFFL;
+ int crc = ~(int) long_crc;
- try (PyBuffer bin_data = getTextBuffer(bp)) {
- int len = bin_data.getLen();
+ try (PyBuffer dataBuf = getByteBuffer(data)) {
+ int len = dataBuf.getLen();
for (int i = 0; i < len; i++) {
- char ch = (char) bin_data.intAt(i);
- crc = (int)crc_32_tab[(int) ((crc ^ ch) & 0xffL)] ^ (crc >> 8);
- /* Note: (crc >> 8) MUST zero fill on left */
- crc &= 0xFFFFFFFFL;
+ int b = dataBuf.intAt(i);
+ crc = crc_32_tab[(crc ^ b) & 0xff] ^ (crc >>> 8);
+ /* Note: (crc >> 8) MUST zero fill on left */
}
+ return ~crc;
+
} catch (ClassCastException e) {
- throw argMustBeBytes("crc32", bp);
+ throw argMustBeBytes("crc32", data);
}
- if (crc >= 0x80000000) {
- return -(int)(crc+1 & 0xFFFFFFFF);
- } else {
- return (int)(crc & 0xFFFFFFFF);
- }
}
private static char[] hexdigit = "0123456789abcdef".toCharArray();
- public static PyString __doc__b2a_hex = new PyString(
- "b2a_hex(data) -> s; Hexadecimal representation of binary data.\n" +
- "\n" +
- "This function is also available as \"hexlify()\"."
- );
+ public static PyString __doc__b2a_hex =
+ new PyString("b2a_hex(data) -> s; Hexadecimal representation of binary data.\n" + "\n"
+ + "This function is also available as \"hexlify()\".");
- public static PyString b2a_hex(PyObject bp) {
+ public static PyString b2a_hex(PyObject data) {
- try (PyBuffer argbuf = getTextBuffer(bp)) {
+ try (PyBuffer dataBuf = getByteBuffer(data)) {
- int arglen = argbuf.getLen();
- StringBuilder retbuf = new StringBuilder(arglen * 2);
+ int dataLen = dataBuf.getLen();
+ StringBuilder retbuf = new StringBuilder(dataLen * 2);
- /* make hex version of string, taken from shamodule.c */
- for (int i = 0; i < arglen; i++) {
- char ch = (char) argbuf.intAt(i);
+ // make hex version of string, taken from shamodule.c
+ for (int i = 0; i < dataLen; i++) {
+ int ch = dataBuf.intAt(i);
retbuf.append(hexdigit[(ch >>> 4) & 0xF]);
retbuf.append(hexdigit[ch & 0xF]);
}
@@ -921,7 +828,7 @@
return new PyString(retbuf.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("b2a_hex", bp);
+ throw argMustBeBytes("b2a_hex", data);
}
}
@@ -929,32 +836,29 @@
return b2a_hex(argbuf);
}
+ public static PyString a2b_hex$doc =
+ new PyString("a2b_hex(hexstr) -> s; Binary data of hexadecimal representation.\n" + "\n"
+ + "hexstr must contain an even number of hex digits "
+ + "(upper or lower case).\n"
+ + "This function is also available as \"unhexlify()\"");
- public static PyString a2b_hex$doc = new PyString(
- "a2b_hex(hexstr) -> s; Binary data of hexadecimal representation.\n" +
- "\n" +
- "hexstr must contain an even number of hex digits "+
- "(upper or lower case).\n"+
- "This function is also available as \"unhexlify()\""
- );
+ public static PyString a2b_hex(PyObject hexstr) {
- public static PyString a2b_hex(PyObject bp) {
+ try (PyBuffer buf = getByteBuffer(hexstr)) {
- try (PyBuffer argbuf = getTextBuffer(bp)) {
-
- int arglen = argbuf.getLen();
- StringBuilder retbuf = new StringBuilder(arglen / 2);
+ int bufLen = buf.getLen();
+ StringBuilder retbuf = new StringBuilder(bufLen / 2);
/*
* XXX What should we do about strings with an odd length? Should we add an implicit
* leading zero, or a trailing zero? For now, raise an exception.
*/
- if (arglen % 2 != 0) {
+ if (bufLen % 2 != 0) {
throw Py.TypeError("Odd-length string");
}
- for (int i = 0; i < arglen; i += 2) {
- int top = Character.digit(argbuf.intAt(i), 16);
- int bot = Character.digit(argbuf.intAt(i + 1), 16);
+ for (int i = 0; i < bufLen; i += 2) {
+ int top = Character.digit(buf.intAt(i), 16);
+ int bot = Character.digit(buf.intAt(i + 1), 16);
if (top == -1 || bot == -1) {
throw Py.TypeError("Non-hexadecimal digit found");
}
@@ -964,7 +868,7 @@
return new PyString(retbuf.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("a2b_hex", bp);
+ throw argMustBeBytes("a2b_hex", hexstr);
}
}
@@ -974,33 +878,28 @@
final private static char[] upper_hexdigit = "0123456789ABCDEF".toCharArray();
- private static StringBuilder qpEscape(StringBuilder sb, char c)
- {
- sb.append('=');
+ private static StringBuilder qpEscape(StringBuilder sb, char c) {
+ sb.append('=');
sb.append(upper_hexdigit[(c >>> 4) & 0xF]);
sb.append(upper_hexdigit[c & 0xF]);
return sb;
}
- final private static Pattern UNDERSCORE = Pattern.compile("_");
-
final public static PyString __doc__a2b_qp = new PyString("Decode a string of qp-encoded data");
- public static boolean getIntFlagAsBool(ArgParser ap, int index, int dflt, String errMsg) {
- boolean val;
+ private static boolean getIntFlagAsBool(ArgParser ap, int index, int dflt, String errMsg) {
try {
- val = ap.getInt(index, dflt) != 0;
+ boolean val = ap.getInt(index, dflt) != 0;
+ return val;
} catch (PyException e) {
- if (e.match(Py.AttributeError) || e.match(Py.ValueError)) {
+ if (e.match(Py.AttributeError) || e.match(Py.ValueError)) {
throw Py.TypeError(errMsg);
}
- throw e;
+ throw e;
}
- return val;
}
- public static PyString a2b_qp(PyObject[] arg, String[] kws)
- {
+ public static PyString a2b_qp(PyObject[] arg, String[] kws) {
ArgParser ap = new ArgParser("a2b_qp", arg, kws, new String[] {"s", "header"});
PyObject bp = ap.getPyObject(0);
@@ -1008,66 +907,66 @@
StringBuilder sb = new StringBuilder();
boolean header = getIntFlagAsBool(ap, 1, 0, "an integer is required");
- try (PyBuffer ascii_data = getTextBuffer((PyObject)bp)) {
- for (int i=0, m=ascii_data.getLen(); i<m;) {
- char c = (char) ascii_data.intAt(i++);
- if (header && c == '_') {
- sb.append(' ');
- } else if (c == '=') {
- if (i < m) {
- c = (char) ascii_data.intAt(i++);
- if (c == '=') {
- sb.append(c);
- } else if (c == ' ') {
- sb.append("= ");
- } else if ((c >= '0' && c <= '9' || c >= 'A' && c <= 'F') && i < m) {
- char nc = (char) ascii_data.intAt(i++);
- if ((nc >= '0' && nc <= '9' || nc >= 'A' && nc <= 'F')) {
- sb.append((char)(Character.digit(c, 16) << 4 | Character.digit(nc, 16)));
- } else {
- sb.append('=').append(c).append(nc);
- }
- } else if (c != '\n') {
- sb.append('=').append(c);
- }
+ try (PyBuffer ascii_data = getByteBuffer((PyObject) bp)) {
+ for (int i = 0, m = ascii_data.getLen(); i < m;) {
+ char c = (char) ascii_data.intAt(i++);
+ if (header && c == '_') {
+ sb.append(' ');
+ } else if (c == '=') {
+ if (i < m) {
+ c = (char) ascii_data.intAt(i++);
+ if (c == '=') {
+ sb.append(c);
+ } else if (c == ' ') {
+ sb.append("= ");
+ } else if ((c >= '0' && c <= '9' || c >= 'A' && c <= 'F') && i < m) {
+ char nc = (char) ascii_data.intAt(i++);
+ if ((nc >= '0' && nc <= '9' || nc >= 'A' && nc <= 'F')) {
+ sb.append((char) (Character.digit(c, 16) << 4
+ | Character.digit(nc, 16)));
+ } else {
+ sb.append('=').append(c).append(nc);
}
- } else {
- sb.append(c);
+ } else if (c != '\n') {
+ sb.append('=').append(c);
+ }
}
+ } else {
+ sb.append(c);
+ }
}
- return new PyString(sb.toString());
+ return new PyString(sb.toString());
} catch (ClassCastException e) {
throw argMustBeBytes("a2b_qp", bp);
}
}
- final private static Pattern RN_TO_N = Pattern.compile("\r\n");
- final private static Pattern N_TO_RN = Pattern.compile("(?<!\r)\n");
-
- final public static PyString __doc__b2a_qp = new PyString("b2a_qp(data, quotetabs=0, istext=1, header=0) -> s;\n"
- + "Encode a string using quoted-printable encoding.\n\n"
- + "On encoding, when istext is set, newlines are not encoded, and white\n"
- + "space at end of lines is. When istext is not set, \r and \n (CR/LF) are\n"
- + "both encoded. When quotetabs is set, space and tabs are encoded.");
+ final public static PyString __doc__b2a_qp =
+ new PyString("b2a_qp(data, quotetabs=0, istext=1, header=0) -> s;\n"
+ + "Encode a string using quoted-printable encoding.\n\n"
+ + "On encoding, when istext is set, newlines are not encoded, and white\n"
+ + "space at end of lines is. When istext is not set, \r and \n (CR/LF) are\n"
+ + "both encoded. When quotetabs is set, space and tabs are encoded.");
public static PyString b2a_qp(PyObject[] arg, String[] kws) {
- ArgParser ap = new ArgParser("b2a_qp", arg, kws, new String[] {"s", "quotetabs", "istext", "header"});
+ ArgParser ap = new ArgParser("b2a_qp", arg, kws,
+ new String[] {"s", "quotetabs", "istext", "header"});
boolean quotetabs = getIntFlagAsBool(ap, 1, 0, "an integer is required");
boolean istext = getIntFlagAsBool(ap, 2, 1, "an integer is required");
boolean header = getIntFlagAsBool(ap, 3, 0, "an integer is required");
- PyObject bp = ap.getPyObject(0);
+ PyObject data = ap.getPyObject(0);
- try (PyBuffer bin_data = getTextBuffer(bp)) {
+ try (PyBuffer dataBuf = getByteBuffer(data)) {
- int datalen = bin_data.getLen();
- StringBuilder sb = new StringBuilder(datalen);
+ int dataLen = dataBuf.getLen();
+ StringBuilder sb = new StringBuilder(dataLen);
String lineEnd = "\n";
// Work out if line endings should be crlf.
- for (int i = 0, m = bin_data.getLen(); i < m; i++) {
- if ('\n' == bin_data.intAt(i)) {
- if (i > 0 && '\r' == bin_data.intAt(i-1)) {
+ for (int i = 0, m = dataBuf.getLen(); i < m; i++) {
+ if ('\n' == dataBuf.intAt(i)) {
+ if (i > 0 && '\r' == dataBuf.intAt(i - 1)) {
lineEnd = "\r\n";
}
break;
@@ -1078,21 +977,17 @@
int MAXLINESIZE = 76;
int in = 0;
- while (in < datalen) {
- char ch = (char) bin_data.intAt(in);
- if ((ch > 126) ||
- (ch == '=') ||
- (header && ch == '_') ||
- ((ch == '.') && (count == 0) &&
- ((in+1 == datalen) || (char) bin_data.intAt(in+1) == '\n' || (char) bin_data.intAt(in+1) == '\r')) ||
- (!istext && ((ch == '\r') || (ch == '\n'))) ||
- ((ch == '\t' || ch == ' ') && (in + 1 == datalen)) ||
- ((ch < 33) &&
- (ch != '\r') && (ch != '\n') &&
- (quotetabs ||
- (!quotetabs && ((ch != '\t') && (ch != ' '))))))
- {
- if ((count + 3 )>= MAXLINESIZE) {
+ while (in < dataLen) {
+ char ch = (char) dataBuf.intAt(in);
+ if ((ch > 126) || (ch == '=') || (header && ch == '_')
+ || ((ch == '.') && (count == 0)
+ && ((in + 1 == dataLen) || (char) dataBuf.intAt(in + 1) == '\n'
+ || (char) dataBuf.intAt(in + 1) == '\r'))
+ || (!istext && ((ch == '\r') || (ch == '\n')))
+ || ((ch == '\t' || ch == ' ') && (in + 1 == dataLen))
+ || ((ch < 33) && (ch != '\r') && (ch != '\n')
+ && (quotetabs || (!quotetabs && ((ch != '\t') && (ch != ' ')))))) {
+ if ((count + 3) >= MAXLINESIZE) {
sb.append('=');
sb.append(lineEnd);
count = 0;
@@ -1100,43 +995,37 @@
qpEscape(sb, ch);
in++;
count += 3;
- }
- else {
- if (istext &&
- ((ch == '\n') ||
- ((in+1 < datalen) && (ch == '\r') &&
- (bin_data.intAt(in+1) == '\n'))))
- {
+ } else {
+ if (istext && ((ch == '\n') || ((in + 1 < dataLen) && (ch == '\r')
+ && (dataBuf.intAt(in + 1) == '\n')))) {
count = 0;
- /* Protect against whitespace on end of line */
+ // Protect against whitespace on end of line
int out = sb.length();
- if (out > 0 && ((sb.charAt(out-1) == ' ') || (sb.charAt(out-1) == '\t'))) {
- ch = sb.charAt(out-1);
- sb.setLength(out-1);
- qpEscape(sb, ch);
- }
+ if (out > 0
+ && ((sb.charAt(out - 1) == ' ') || (sb.charAt(out - 1) == '\t'))) {
+ ch = sb.charAt(out - 1);
+ sb.setLength(out - 1);
+ qpEscape(sb, ch);
+ }
- sb.append(lineEnd);
- if (ch == '\r') {
- in+=2;
- } else {
- in++;
- }
- }
- else {
- if ((in + 1 != datalen) &&
- ((char) bin_data.intAt(in+1) != '\n') &&
- (count + 1) >= MAXLINESIZE) {
+ sb.append(lineEnd);
+ if (ch == '\r') {
+ in += 2;
+ } else {
+ in++;
+ }
+ } else {
+ if ((in + 1 != dataLen) && ((char) dataBuf.intAt(in + 1) != '\n')
+ && (count + 1) >= MAXLINESIZE) {
sb.append('=');
sb.append(lineEnd);
count = 0;
- }
+ }
count++;
if (header && ch == ' ') {
sb.append('_');
in++;
- }
- else {
+ } else {
sb.append(ch);
in++;
}
@@ -1147,7 +1036,7 @@
return new PyString(sb.toString());
} catch (ClassCastException e) {
- throw argMustBeBytes("b2a_qp", bp);
+ throw argMustBeBytes("b2a_qp", data);
}
}
@@ -1162,7 +1051,7 @@
* @return a byte-buffer view of argument (or default decoding if {@code unicode})
* @throws ClassCastException where the text object does not implement the buffer protocol
*/
- private static PyBuffer getTextBuffer(PyObject text) throws ClassCastException {
+ private static PyBuffer getByteBuffer(PyObject text) throws ClassCastException {
if (text instanceof PyUnicode) {
String s = ((PyUnicode) text).encode();
return new SimpleStringBuffer(PyBUF.SIMPLE, null, s);
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list