Jython

Revision: 4822
          http://jython.svn.sourceforge.net/jython/?rev=4822&view=rev
Author:   zyasoft
Date:     2008-06-30 00:41:08 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Fixed cStringIO to support ops for cPickle

Modified Paths:
--------------
    branches/asm/src/org/python/modules/cStringIO.java

Modified: branches/asm/src/org/python/modules/cStringIO.java
===================================================================
--- branches/asm/src/org/python/modules/cStringIO.java	2008-06-30 07:06:55 UTC (rev 4821)
+++ branches/asm/src/org/python/modules/cStringIO.java	2008-06-30 07:41:08 UTC (rev 4822)
@@ -233,7 +233,7 @@
 
 
         /**
-         * Read and return a line without the trailing newling.
+         * Read and return a line without the trailing newline.
          * Usind by cPickle as an optimization.
          */
         public String readlineNoNl() {
@@ -303,24 +303,25 @@
          * @param s     The data to write.
          */
         public void write(PyObject obj) {
+            write(obj.toString());
+        }
+
+        public void write(String s) {
             _complain_ifclosed();
-            
-            String s = obj.toString();
             buf.setLength(pos);
             int newpos = pos + s.length();
             buf.replace(pos, newpos, s);
             pos = newpos;
         }
 
-
         /**
          * Write a char to the file. Used by cPickle as an optimization.
          * @param ch    The data to write.
          */
         public void writeChar(char ch) {
             int len = buf.length();
-            if (len < pos)
-                buf.setLength(pos);
+            if (len <= pos)
+                buf.setLength(pos + 1);
             buf.setCharAt(pos++, ch);
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4825
          http://jython.svn.sourceforge.net/jython/?rev=4825&view=rev
Author:   zyasoft
Date:     2008-06-30 09:14:30 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Change cStringIO to use StringBuilder semantics. Use via thread confinement, or with external locking. Keep it simple, keep it lightweight.

Modified Paths:
--------------
    branches/asm/src/org/python/modules/cStringIO.java

Modified: branches/asm/src/org/python/modules/cStringIO.java
===================================================================
--- branches/asm/src/org/python/modules/cStringIO.java	2008-06-30 08:59:43 UTC (rev 4824)
+++ branches/asm/src/org/python/modules/cStringIO.java	2008-06-30 16:14:30 UTC (rev 4825)
@@ -6,8 +6,8 @@
  * The Netherlands.
  */
 
-// we probably should use StringBuffer instead of StringBuilder, since StringIO
-// most likely means not thread-confined, so we want those locking semantics.
+// cStringIO with StringBuilder semantics - don't use without using external
+// synchronization. Java does provide other alternatives.
 
 package org.python.modules;
 
@@ -62,15 +62,15 @@
         public boolean closed = false;
         public int pos = 0;
 
-        private final StringBuffer buf;
+        private final StringBuilder buf;
 
         StringIO() {
-            buf = new StringBuffer();
+            buf = new StringBuilder();
         }
 
 
         StringIO(String buffer) {
-            buf = new StringBuffer(buffer);
+            buf = new StringBuilder(buffer);
         }
 
         private void _complain_ifclosed() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4826
          http://jython.svn.sourceforge.net/jython/?rev=4826&view=rev
Author:   zyasoft
Date:     2008-06-30 11:08:37 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Restored cStringIO.getString

Modified Paths:
--------------
    branches/asm/src/org/python/modules/cStringIO.java

Modified: branches/asm/src/org/python/modules/cStringIO.java
===================================================================
--- branches/asm/src/org/python/modules/cStringIO.java	2008-06-30 16:14:30 UTC (rev 4825)
+++ branches/asm/src/org/python/modules/cStringIO.java	2008-06-30 18:08:37 UTC (rev 4826)
@@ -354,5 +354,20 @@
         }
 
     }
+    
+    private static String[] strings = new String[256];
+    static String getString(char ch) {
+        if (ch > 255) {
+            return new String(new char[] { ch });
+        }
 
+      String s = strings[ch];
+
+      if (s == null) {
+          s = new String(new char[] { ch });
+          strings[ch] = s;
+      }
+      return s;
+   }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.