Menu
▾
▴
[Jython-checkins] CVS: jython/org/python/core ArgParser.java,1.6,1.7 FileUtil.java,2.1,2.2 Options.java,2.12,2.13 PyDictionary.java,2.23,2.24 PyEnumerate.java,2.1,2.2 PyList.java,2.28,2.29 PyLong.java,2.20,2.21 PyString.java,2.63,2.64 PyTuple.java,2.11,2.12 PyXRange.java,2.5,2.6 SyspathJavaLoader.java,2.6,2.7 __builtin__.java,2.59,2.60 Makefile,2.0,NONE
|
From: brian z. <bz...@us...> - 2005-02-23 04:27:02
|
Update of /cvsroot/jython/jython/org/python/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18519/org/python/core Modified Files: ArgParser.java FileUtil.java Options.java PyDictionary.java PyEnumerate.java PyList.java PyLong.java PyString.java PyTuple.java PyXRange.java SyspathJavaLoader.java __builtin__.java Removed Files: Makefile Log Message: for the sake of better javadocs, fixed all warnings and updated ant build.xml; removed all tabs; removed Makefiles Index: ArgParser.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/ArgParser.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ArgParser.java 22 Feb 2005 04:19:30 -0000 1.6 --- ArgParser.java 23 Feb 2005 04:26:21 -0000 1.7 *************** *** 32,37 **** private static Object required = new Object(); private static String[] emptyKws = new String[0]; ! ! private PyBuiltinFunction.Info info; private ArgParser(String funcname, PyObject[] args, String[] kws) { --- 32,37 ---- private static Object required = new Object(); private static String[] emptyKws = new String[0]; ! ! //private PyBuiltinFunction.Info info; private ArgParser(String funcname, PyObject[] args, String[] kws) { *************** *** 47,51 **** * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param args The actual keyword names supplied in the call. * @param p0 The expected argument in the method definition. */ --- 47,51 ---- * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param kws The actual keyword names supplied in the call. * @param p0 The expected argument in the method definition. */ *************** *** 61,65 **** * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param args The actual keyword names supplied in the call. * @param p0 The first expected argument in the method definition. --- 61,65 ---- * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param kws The actual keyword names supplied in the call. * @param p0 The first expected argument in the method definition. *************** *** 78,82 **** * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param args The actual keyword names supplied in the call. * @param p0 The first expected argument in the method definition. --- 78,82 ---- * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param kws The actual keyword names supplied in the call. * @param p0 The first expected argument in the method definition. *************** *** 97,101 **** * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param args The actual keyword names supplied in the call. * @param paramnames The list of expected argument in the method definition. --- 97,101 ---- * @param funcname Name of the method. Used in error messages. * @param args The actual call arguments supplied in the call. ! * @param kws The actual keyword names supplied in the call. * @param paramnames The list of expected argument in the method definition. Index: FileUtil.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/FileUtil.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** FileUtil.java 3 Jan 2003 00:49:34 -0000 2.1 --- FileUtil.java 23 Feb 2005 04:26:21 -0000 2.2 *************** *** 9,37 **** * Utility methods for Java file handling. */ ! public class FileUtil ! { /** * Read all bytes from the input stream. ! * * Note that using this method to read very large streams could * cause out-of-memory exceptions and/or block for large periods * of time. */ ! public static byte[] readBytes( InputStream in ) ! throws IOException ! { ! final int bufsize = 8192; // nice buffer size used in JDK ! byte[] buf = new byte[ bufsize ]; ! ByteArrayOutputStream out = ! new ByteArrayOutputStream( bufsize ); ! int count; ! while( true ) ! { ! count = in.read( buf, 0, bufsize ); ! if ( count < 0 ) ! break; ! out.write( buf, 0, count ); ! } ! return out.toByteArray(); } } --- 9,35 ---- * Utility methods for Java file handling. */ ! public class FileUtil { /** * Read all bytes from the input stream. ! * <p/> * Note that using this method to read very large streams could * cause out-of-memory exceptions and/or block for large periods * of time. */ ! public static byte[] readBytes(InputStream in) ! throws IOException { ! final int bufsize = 8192; // nice buffer size used in JDK ! byte[] buf = new byte[bufsize]; ! ByteArrayOutputStream out = ! new ByteArrayOutputStream(bufsize); ! int count; ! while (true) { ! count = in.read(buf, 0, bufsize); ! if (count < 0) { ! break; ! } ! out.write(buf, 0, count); ! } ! return out.toByteArray(); } } Index: Options.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/Options.java,v retrieving revision 2.12 retrieving revision 2.13 diff -C2 -d -r2.12 -r2.13 *** Options.java 13 Jan 2002 18:13:28 -0000 2.12 --- Options.java 23 Feb 2005 04:26:21 -0000 2.13 *************** *** 84,88 **** /** * If true, enable truedivision for the '/' operator. ! */ public static boolean Qnew = false; --- 84,88 ---- /** * If true, enable truedivision for the '/' operator. ! */ public static boolean Qnew = false; *************** *** 100,104 **** // ####### END OF OPTIONS // ! private Options() { ; } --- 100,104 ---- // ####### END OF OPTIONS // ! private Options() { ; } Index: PyDictionary.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyDictionary.java,v retrieving revision 2.23 retrieving revision 2.24 diff -C2 -d -r2.23 -r2.24 *** PyDictionary.java 22 Feb 2005 22:38:33 -0000 2.23 --- PyDictionary.java 23 Feb 2005 04:26:21 -0000 2.24 *************** *** 4,8 **** import java.util.Hashtable; import java.util.Enumeration; ! /** * A builtin python dictionary. --- 4,8 ---- import java.util.Hashtable; import java.util.Enumeration; ! /** * A builtin python dictionary. Index: PyEnumerate.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyEnumerate.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** PyEnumerate.java 21 Feb 2005 04:34:23 -0000 2.1 --- PyEnumerate.java 23 Feb 2005 04:26:21 -0000 2.2 *************** *** 4,9 **** private long en_index; /* current index of enumeration */ ! private PyObject en_sit; /* secondary iterator of enumeration */ ! private PyTuple en_result; /* result tuple */ protected static PyObject __methods__; --- 4,9 ---- private long en_index; /* current index of enumeration */ ! private PyObject en_sit; /* secondary iterator of enumeration */ ! private PyTuple en_result; /* result tuple */ protected static PyObject __methods__; Index: PyList.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyList.java,v retrieving revision 2.28 retrieving revision 2.29 diff -C2 -d -r2.28 -r2.29 *** PyList.java 22 Feb 2005 04:19:31 -0000 2.28 --- PyList.java 23 Feb 2005 04:26:21 -0000 2.29 *************** *** 724,728 **** protected void resize(int n) { if (list.length < n) { ! PyObject[] newList = new PyObject[(int)(n*1.5)]; System.arraycopy(list, 0, newList, 0, length); list = newList; --- 724,736 ---- protected void resize(int n) { if (list.length < n) { ! PyObject[] newList = new PyObject[(int public void append(PyObject o) { ! list_append(o); ! } ! ! final void list_append(PyObject o) { ! resize(length+1); ! list[length-1] = o; ! } ! )(n*1.5)]; System.arraycopy(list, 0, newList, 0, length); list = newList; *************** *** 736,747 **** * @param o the element to add. */ - public void append(PyObject o) { - list_append(o); - } - - final void list_append(PyObject o) { - resize(length+1); - list[length-1] = o; - } /** --- 744,747 ---- Index: PyLong.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyLong.java,v retrieving revision 2.20 retrieving revision 2.21 diff -C2 -d -r2.20 -r2.21 *** PyLong.java 22 Feb 2005 04:19:31 -0000 2.20 --- PyLong.java 23 Feb 2005 04:26:21 -0000 2.21 *************** *** 16,21 **** private static final BigInteger maxLong = BigInteger.valueOf(Long.MAX_VALUE); ! public static final BigInteger maxULong = ! BigInteger.valueOf(1).shiftLeft(64).subtract(BigInteger.valueOf(1)); private static final BigInteger minDouble = --- 16,21 ---- private static final BigInteger maxLong = BigInteger.valueOf(Long.MAX_VALUE); ! public static final BigInteger maxULong = ! BigInteger.valueOf(1).shiftLeft(64).subtract(BigInteger.valueOf(1)); private static final BigInteger minDouble = *************** *** 59,83 **** return v; } ! private static final double scaledDoubleValue(BigInteger val, int[] exp){ double x = 0; int signum = val.signum(); byte[] digits; ! if (signum >= 0) { digits = val.toByteArray(); } else { ! digits = val.negate().toByteArray(); } ! int count = 8; int i = 0; ! if (digits[0] == 0) { i++; ! count++; } count = count <= digits.length?count:digits.length; ! while (i < count) { x = x * 256 + (digits[i] & 0xff); --- 59,83 ---- return v; } ! private static final double scaledDoubleValue(BigInteger val, int[] exp){ double x = 0; int signum = val.signum(); byte[] digits; ! if (signum >= 0) { digits = val.toByteArray(); } else { ! digits = val.negate().toByteArray(); } ! int count = 8; int i = 0; ! if (digits[0] == 0) { i++; ! count++; } count = count <= digits.length?count:digits.length; ! while (i < count) { x = x * 256 + (digits[i] & 0xff); *************** *** 87,98 **** return signum*x; } ! ! ! public double scaledDoubleValue(int[] exp){ return scaledDoubleValue(value,exp); } ! ! private long getLong(long min, long max) { if (value.compareTo(maxLong) <= 0 && value.compareTo(minLong) >= 0) { --- 87,98 ---- return signum*x; } ! ! ! public double scaledDoubleValue(int[] exp){ return scaledDoubleValue(value,exp); } ! ! private long getLong(long min, long max) { if (value.compareTo(maxLong) <= 0 && value.compareTo(minLong) >= 0) { *************** *** 257,269 **** int[] be = new int[1]; double ad,bd; ! ad = scaledDoubleValue(a,ae); bd = scaledDoubleValue(b,be); ! if (bd == 0 ) throw Py.ZeroDivisionError("long division or modulo"); ! ad /= bd; int aexp = ae[0]-be[0]; ! if (aexp > Integer.MAX_VALUE/8) { throw Py.OverflowError("long/long too large for a float"); --- 257,269 ---- int[] be = new int[1]; double ad,bd; ! ad = scaledDoubleValue(a,ae); bd = scaledDoubleValue(b,be); ! if (bd == 0 ) throw Py.ZeroDivisionError("long division or modulo"); ! ad /= bd; int aexp = ae[0]-be[0]; ! if (aexp > Integer.MAX_VALUE/8) { throw Py.OverflowError("long/long too large for a float"); *************** *** 271,282 **** return new PyFloat(0.0); } ! ad = ad * Math.pow(2.0, aexp*8); ! if (Double.isInfinite(ad)) { throw Py.OverflowError("long/long too large for a float"); } ! ! return new PyFloat(ad); } --- 271,282 ---- return new PyFloat(0.0); } ! ad = ad * Math.pow(2.0, aexp*8); ! if (Double.isInfinite(ad)) { throw Py.OverflowError("long/long too large for a float"); } ! ! return new PyFloat(ad); } Index: PyString.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v retrieving revision 2.63 retrieving revision 2.64 diff -C2 -d -r2.63 -r2.64 *** PyString.java 22 Feb 2005 04:19:32 -0000 2.63 --- PyString.java 23 Feb 2005 04:26:21 -0000 2.64 *************** *** 228,234 **** } - - - /** * A builtin python string. --- 228,231 ---- Index: PyTuple.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyTuple.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -d -r2.11 -r2.12 *** PyTuple.java 28 Oct 2001 17:13:43 -0000 2.11 --- PyTuple.java 23 Feb 2005 04:26:21 -0000 2.12 *************** *** 2,7 **** package org.python.core; - - class TupleFunctions extends PyBuiltinFunctionSet { --- 2,5 ---- *************** *** 31,36 **** } - - /** * A builtin python tuple. --- 29,32 ---- Index: PyXRange.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyXRange.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -d -r2.5 -r2.6 *** PyXRange.java 5 Nov 2002 17:05:54 -0000 2.5 --- PyXRange.java 23 Feb 2005 04:26:21 -0000 2.6 *************** *** 50,54 **** protected PyObject getslice(int start, int stop, int step) { Py.DeprecationWarning("xrange object slicing is deprecated; " + ! "convert to list instead"); if (copies != 1) { throw Py.TypeError("cannot slice a replicated range"); --- 50,54 ---- protected PyObject getslice(int start, int stop, int step) { Py.DeprecationWarning("xrange object slicing is deprecated; " + ! "convert to list instead"); if (copies != 1) { throw Py.TypeError("cannot slice a replicated range"); *************** *** 64,68 **** protected PyObject repeat(int howmany) { Py.DeprecationWarning("xrange object multiplication is deprecated; " + ! "convert to list instead"); PyXRange x = new PyXRange(start, stop, step); x.copies = copies*howmany; --- 64,68 ---- protected PyObject repeat(int howmany) { Py.DeprecationWarning("xrange object multiplication is deprecated; " + ! "convert to list instead"); PyXRange x = new PyXRange(start, stop, step); x.copies = copies*howmany; *************** *** 76,80 **** public PyObject __findattr__(String name) { String msg = "xrange object's 'start', 'stop' and 'step' " + ! "attributes are deprecated"; if (name == "start") { Py.DeprecationWarning(msg); --- 76,80 ---- public PyObject __findattr__(String name) { String msg = "xrange object's 'start', 'stop' and 'step' " + ! "attributes are deprecated"; if (name == "start") { Py.DeprecationWarning(msg); Index: SyspathJavaLoader.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/SyspathJavaLoader.java,v retrieving revision 2.6 retrieving revision 2.7 diff -C2 -d -r2.6 -r2.7 *** SyspathJavaLoader.java 3 Jan 2003 00:49:34 -0000 2.6 --- SyspathJavaLoader.java 23 Feb 2005 04:26:21 -0000 2.7 *************** *** 3,10 **** package org.python.core; ! import java.io.*; import java.util.StringTokenizer; ! import java.util.Hashtable; ! import java.util.zip.*; public class SyspathJavaLoader extends ClassLoader --- 3,14 ---- package org.python.core; ! import java.io.BufferedInputStream; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileNotFoundException; ! import java.io.IOException; ! import java.io.InputStream; import java.util.StringTokenizer; ! import java.util.zip.ZipEntry; public class SyspathJavaLoader extends ClassLoader *************** *** 108,112 **** } try { ! byte[] buffer = FileUtil.readBytes( fis ); fis.close(); return loadClassFromBytes(name, buffer); --- 112,116 ---- } try { ! byte[] buffer = FileUtil.readBytes( fis ); fis.close(); return loadClassFromBytes(name, buffer); Index: __builtin__.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v retrieving revision 2.59 retrieving revision 2.60 diff -C2 -d -r2.59 -r2.60 *** __builtin__.java 22 Feb 2005 04:19:33 -0000 2.59 --- __builtin__.java 23 Feb 2005 04:26:21 -0000 2.60 *************** *** 5,9 **** import java.math.BigInteger; - class BuiltinFunctions extends PyBuiltinFunctionSet { --- 5,8 ---- *************** *** 101,106 **** } - - /** * The builtin module. All builtin functions are defined here --- 100,103 ---- --- Makefile DELETED --- |